Draupnir: init at 2.0.0-beta.6 #274052

TheArcaneBrony · 2023-12-13T20:07:07Z

Description of changes

NOTE: This PR is a successor of #222939. The previous PR was closed by accident during a rebase operation.

Original description:

Draupnir is a hardfork of Mjolnir. Mjolnir package has been unmaintained due to upstream bugs. This package is mostly a drop-in replacement. This package also uses newer methods of handling dependencies.

Repository can be found at:
https://github.com/the-draupnir-project/Draupnir

Note on testing: package and module were (and still are) tested in our production environment, works fine as far as it's been used.
Note on replacing Mjolnir: Not sure whether this is appropriate, due to general usage of the bot changing. You can however fully automatically migrate from mjolnir to draupnir.

Things done

Add a 👍 reaction to pull requests you find important.

gaykitty · 2023-12-25T02:26:54Z

Result of nixpkgs-review pr 274052 run on x86_64-linux 1

2 packages blacklisted:

nixos-install-tools
tests.nixos-functions.nixos-test

1 package built:

draupnir

mweinelt

I see a lot of potential to improve the module and to bring it in line with today's standards.

I can see that it is a copy of the mjolnir module, but I'm not willing to accept a new module of similar quality, because it is hard to maintain.

This is especially relevant with RFC42 (settings & formatters) in mind

pkgs/servers/draupnir/default.nix

nixos/modules/services/matrix/draupnir.nix

TheArcaneBrony · 2024-01-20T18:53:02Z

Time for the almighty rebase on nixos:master... Please don't close the PR again...

TheArcaneBrony · 2024-01-20T19:01:44Z

🎊 It didn't close as merged!

TheArcaneBrony · 2024-01-20T19:02:42Z

(Renamed the package init commit)

TheArcaneBrony · 2024-01-27T07:52:34Z

(^ master rebase)

teutat3s · 2024-07-21T21:03:23Z

This now looks good to go for me. A co-authored-by on the test commit would be nice, but is not a requirement for me. Thanks for continuing to push this forward.

mweinelt

Went over everything except the test.

maintainers/maintainer-list.nix

mweinelt · 2024-07-21T16:09:52Z

pkgs/by-name/dr/draupnir/package.nix

+    preBuild = ''
+      # copy built modules to package...
+      echo "Copying built matrix-sdk-crypto-nodejs modules to package..."
+      cp -a ${matrix-sdk-crypto-nodejs}/lib/node_modules/* node_modules/


This could probably just be a symlink.

pkgs/by-name/dr/draupnir/package.nix

mweinelt · 2024-07-21T16:20:40Z

nixos/modules/services/matrix/draupnir.md

+{
+  services.draupnir = {
+    enable = true;
+    pantalaimon = {
+       enable = true;
+       username = "draupnir";
+       passwordFile = "/run/secrets/draupnir-password";
+       options = {
+        homeserver = "http://localhost:8008";
+        ssl = false;
+       };
+    };
+    settings = {
+      managementRoom = "!yyy:domain.tld";
+      protectedRooms = [
+        "https://matrix.to/#/!xxx:domain.tld"
+      ];
+    };
+  };
+}


Make sure to format this with nixfmt-rfc-style.

can nixfmt-rfc-style handle markdown files, or should i extract this nix excerpt into a separate file to process?

Extract, format, reinsert.

nixos/modules/services/matrix/draupnir.nix

TheArcaneBrony · 2024-07-22T16:05:14Z

^ just renamed the maintainers commit and added the co author to the tests pr :)

teutat3s

What's the intention behind moving homeserverUrl? This now needs changing in the docs to fix the manual.

nixos/modules/services/matrix/draupnir.md

pkgs/by-name/dr/draupnir/package.nix

Scrumplex · 2024-08-05T09:01:26Z

pkgs/by-name/dr/draupnir/package.nix

+      tests = {
+        inherit (nixosTests) draupnir;
+      };
+      updateScript = ./update.sh;


Is there anything special here, that nix-update-script couldn't handle? It can also deal with updating the Yarn cache hash in the derivation.

Suggested change

updateScript = ./update.sh;

updateScript = nix-update-script { };

Hashes are stored in a separate file, I think the reason was that nix-update-script couldn't handle the Yarn cache hash? I'd have to test this once a new Draupnir version comes out.

pkgs/by-name/dr/draupnir/package.nix

TheArcaneBrony · 2024-09-15T23:07:20Z

pkgs/by-name/dr/draupnir/package.nix

+      mkdir -p deps/draupnir/
+      echo "${version}-nix" > deps/draupnir/version.txt
+
+      sed -i 's/corepack //g' deps/draupnir/package.json


(Copy paste from commit description)
fixup! draupnir: init at 2.0.0-beta.6 - ugly sed hack to drop corepack

Fixes build with corepack upstream introduced by the-draupnir-project/Draupnir#472
Upstream may move to yarn v4, need to investigate options. (the-draupnir-project/Draupnir#475)
Looks like the recommended option is to use a fixed-output derivation?

Sources:

https://www.reddit.com/r/NixOS/comments/1f8tq94/its_2024_has_anyone_figured_out_how_to_build_a/

https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/tilt/assets.nix

Any suggestions? I'm sure this is an ugly, unnecessary hack, but I couldn't find any documentation on the topic.

@TheArcaneBrony This already uses a fixed-output derivation(the offlineCache part), AFAICT if upstream moves to Yarn v4, this package will either need to convert the lockfile to the old version like pgadmin4 or wait until fetchYarnDeps to get v2 lockfile support.

TheArcaneBrony · 2024-11-01T17:44:14Z

(^ squashed in order to rebase)

FliegendeWurst · 2024-12-06T10:17:01Z

Darwin build fails, please mark as broken or fix:

       > gyp ERR! stack at ChildProcess.<anonymous> (/nix/store/m1ymz3alwqc71yrmzl8sas2m8ksqhhsh-nodejs-20.18.0/lib/node_modules/npm/node_modules/node-gyp/lib/build.js:209:23)
       > gyp ERR! System Darwin 22.2.0
       > gyp ERR! command "/nix/store/m1ymz3alwqc71yrmzl8sas2m8ksqhhsh-nodejs-20.18.0/bin/node" "/nix/store/m1ymz3alwqc71yrmzl8sas2m8ksqhhsh-nodejs-20.18.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "rebuild" "--release"
       > gyp ERR! cwd /private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3
       > gyp ERR! node -v v20.18.0
       > gyp ERR! node-gyp -v v10.1.0
       > gyp ERR! not ok

(unfortunately the useful part of the log is gone)

Scrumplex · 2024-12-06T11:21:30Z

gyp info spawn args [ 'BUILDTYPE=Release', '-C', 'build' ]
make: Entering directory '/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build'
  TOUCH ba23eeee118cd63e16015df367567cb043fed872.intermediate
  ACTION deps_sqlite3_gyp_locate_sqlite3_target_copy_builtin_sqlite3 ba23eeee118cd63e16015df367567cb043fed872.intermediate
  TOUCH Release/obj.target/deps/locate_sqlite3.stamp
  CC(target) Release/obj.target/sqlite3/gen/sqlite3/sqlite3.o
  LIBTOOL-STATIC Release/sqlite3.a
Traceback (most recent call last):
  File "/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build/gyp-mac-tool", line 772, in <module>
    sys.exit(main(sys.argv[1:]))
             ^^^^^^^^^^^^^^^^^^
  File "/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build/gyp-mac-tool", line 29, in main
    exit_code = executor.Dispatch(args)
                ^^^^^^^^^^^^^^^^^^^^^^^
  File "/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build/gyp-mac-tool", line 44, in Dispatch
    return getattr(self, method)(*args[1:])
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build/gyp-mac-tool", line 278, in ExecFilterLibtool
    libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env)
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/nix/store/2djmffykchgm4q4j7ylv7xgkg441mp2j-python3-3.12.7/lib/python3.12/subprocess.py", line 1026, in __init__
    self._execute_child(args, executable, preexec_fn, close_fds,
  File "/nix/store/2djmffykchgm4q4j7ylv7xgkg441mp2j-python3-3.12.7/lib/python3.12/subprocess.py", line 1955, in _execute_child
    raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'libtool'
make: *** [deps/sqlite3.target.mk:242: Release/sqlite3.a] Error 1
rm ba23eeee118cd63e16015df367567cb043fed872.intermediate
make: Leaving directory '/private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3/build'
gyp ERR! build error 
gyp ERR! stack Error: `make` failed with exit code: 2
gyp ERR! stack at ChildProcess.<anonymous> (/nix/store/n3yy2py144i01235yqq6ps3ah5dkynx2-nodejs-20.18.0/lib/node_modules/npm/node_modules/node-gyp/lib/build.js:209:23)
gyp ERR! System Darwin 24.0.0
gyp ERR! command "/nix/store/n3yy2py144i01235yqq6ps3ah5dkynx2-nodejs-20.18.0/bin/node" "/nix/store/n3yy2py144i01235yqq6ps3ah5dkynx2-nodejs-20.18.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" "rebuild" "--release"
gyp ERR! cwd /private/tmp/nix-build-draupnir-modules-2.0.0-beta.8.drv-0/node_modules/better-sqlite3
gyp ERR! node -v v20.18.0
gyp ERR! node-gyp -v v10.1.0
gyp ERR! not ok

After adding libtool to nativeBuildInputs of better-sqlite3 it failed with a different error saying that -static is an unrecognized parameter. It seems like -static only exists in Apple's toolchain? nodejs/node#2341

Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>

TheArcaneBrony requested a review from alyssais as a code owner December 13, 2023 20:07

github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: lib The Nixpkgs function library labels Dec 13, 2023

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Dec 13, 2023

h7x4 added 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` labels Dec 26, 2023

mweinelt requested changes Jan 4, 2024

View reviewed changes

TheArcaneBrony requested review from piegamesde and Janik-Haag as code owners January 5, 2024 18:02

github-actions bot removed the 8.has: documentation This PR adds or changes documentation label Jan 5, 2024

Janik-Haag removed request for piegamesde and Janik-Haag January 6, 2024 02:46

ofborg bot removed the 10.rebuild-darwin: 1 label Jan 20, 2024

TheArcaneBrony changed the title ~~Draupnir: init at 1.85.1~~ Draupnir: init at 1.86.0 Jan 20, 2024

github-actions bot removed the 6.topic: lib The Nixpkgs function library label Jan 20, 2024

ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 20, 2024

TheArcaneBrony force-pushed the master branch from 28ee30d to a0c9de0 Compare January 20, 2024 18:56

TheArcaneBrony force-pushed the master branch from a0c9de0 to cd3ce15 Compare January 20, 2024 19:02

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 20, 2024

TheArcaneBrony force-pushed the master branch from cd3ce15 to 38a2e8f Compare January 27, 2024 07:52

mweinelt reviewed Jul 21, 2024

View reviewed changes

TheArcaneBrony force-pushed the master branch from 3b7380e to ee8cbf8 Compare July 22, 2024 16:04

teutat3s reviewed Jul 23, 2024

View reviewed changes

nixos/modules/services/matrix/draupnir.md Outdated Show resolved Hide resolved

Scrumplex reviewed Aug 5, 2024

View reviewed changes

TheArcaneBrony commented Aug 8, 2024

View reviewed changes

pkgs/by-name/dr/draupnir/package.nix Show resolved Hide resolved

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 8, 2024

TheArcaneBrony commented Sep 15, 2024

View reviewed changes

TheArcaneBrony changed the title ~~Draupnir: init at 2.0.0-beta.4~~ Draupnir: init at 2.0.0-beta.6 Sep 15, 2024

TheArcaneBrony mentioned this pull request Sep 16, 2024

Migrate to modern yarn with pnpm linking the-draupnir-project/Draupnir#562

Open

winterqt mentioned this pull request Sep 18, 2024

draupnir: init at 2.0.0-beta.6 #342893

Draft

13 tasks

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024

wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024

TheArcaneBrony force-pushed the master branch from eb031b1 to 0e12515 Compare November 1, 2024 17:37

TheArcaneBrony force-pushed the master branch 2 times, most recently from 3d0ec28 to 3667c8c Compare November 1, 2024 19:35

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 2, 2024

TheArcaneBrony and others added 4 commits December 19, 2024 10:43

maintainers: add RorySys

10d9d04

draupnir: init at 2.0.0-beta.4

16330e3

nixos/draupnir: init

09d8bf5

draupnir: add tests

6470078

Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>

TheArcaneBrony force-pushed the master branch from 3667c8c to 6470078 Compare December 19, 2024 10:52

github-actions bot removed the 10.rebuild-darwin: 1 label Dec 19, 2024

fixup! draupnir: init at 2.0.0-beta.9

6146d47

ofborg bot added the 10.rebuild-darwin: 1 label Dec 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Draupnir: init at 2.0.0-beta.6 #274052

Draupnir: init at 2.0.0-beta.6 #274052

TheArcaneBrony commented Dec 13, 2023

gaykitty commented Dec 25, 2023

mweinelt left a comment

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 27, 2024

teutat3s commented Jul 21, 2024

mweinelt left a comment

mweinelt Jul 21, 2024

mweinelt Jul 21, 2024

TheArcaneBrony Jul 22, 2024

mweinelt Jul 23, 2024 •

edited

Loading

TheArcaneBrony commented Jul 22, 2024

teutat3s left a comment •

edited

Loading

Scrumplex Aug 5, 2024

TheArcaneBrony Aug 6, 2024

TheArcaneBrony Sep 15, 2024

div72 Sep 21, 2024

TheArcaneBrony commented Nov 1, 2024

FliegendeWurst commented Dec 6, 2024

Scrumplex commented Dec 6, 2024

	updateScript = ./update.sh;
	updateScript = nix-update-script { };

Draupnir: init at 2.0.0-beta.6 #274052

Are you sure you want to change the base?

Draupnir: init at 2.0.0-beta.6 #274052

Conversation

TheArcaneBrony commented Dec 13, 2023

Description of changes

Things done

gaykitty commented Dec 25, 2023

mweinelt left a comment

Choose a reason for hiding this comment

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 20, 2024

TheArcaneBrony commented Jan 27, 2024

teutat3s commented Jul 21, 2024

mweinelt left a comment

Choose a reason for hiding this comment

mweinelt Jul 21, 2024

Choose a reason for hiding this comment

mweinelt Jul 21, 2024

Choose a reason for hiding this comment

TheArcaneBrony Jul 22, 2024

Choose a reason for hiding this comment

mweinelt Jul 23, 2024 • edited Loading

Choose a reason for hiding this comment

TheArcaneBrony commented Jul 22, 2024

teutat3s left a comment • edited Loading

Choose a reason for hiding this comment

Scrumplex Aug 5, 2024

Choose a reason for hiding this comment

TheArcaneBrony Aug 6, 2024

Choose a reason for hiding this comment

TheArcaneBrony Sep 15, 2024

Choose a reason for hiding this comment

div72 Sep 21, 2024

Choose a reason for hiding this comment

TheArcaneBrony commented Nov 1, 2024

FliegendeWurst commented Dec 6, 2024

Scrumplex commented Dec 6, 2024

mweinelt Jul 23, 2024 •

edited

Loading

teutat3s left a comment •

edited

Loading