Draupnir: init at 2.0.0-beta.6 #274052
Draupnir: init at 2.0.0-beta.6 #274052
Conversation
github-actions
bot
added
6.topic: nixos
ofborg
bot
added
8.has: package (new)
|
Result of 2 packages blacklisted:
1 package built:
|
h7x4
added
8.has: documentation
8.has: module (new)
There was a problem hiding this comment.
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
ofborg
bot
added
the
2.status: merge conflict
|
Time for the almighty rebase on nixos:master... Please don't close the PR again... |
TheArcaneBrony
force-pushed
the
master
branch
from
28ee30d
to
a0c9de0
Compare
|
🎊 It didn't close as merged! |
TheArcaneBrony
force-pushed
the
master
branch
from
a0c9de0
to
cd3ce15
Compare
|
(Renamed the package init commit) |
ofborg
bot
removed
the
2.status: merge conflict
TheArcaneBrony
force-pushed
the
master
branch
from
cd3ce15
to
38a2e8f
Compare
|
(^ master rebase) |
teutat3s
added
the
12.approvals: 1
|
This now looks good to go for me. A |
pkgs/by-name/dr/draupnir/package.nix
Outdated
| 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/ |
There was a problem hiding this comment.
This could probably just be a symlink.
| { | ||
| 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" | ||
| ]; | ||
| }; | ||
| }; | ||
| } |
There was a problem hiding this comment.
Make sure to format this with nixfmt-rfc-style.
There was a problem hiding this comment.
can nixfmt-rfc-style handle markdown files, or should i extract this nix excerpt into a separate file to process?
|
^ just renamed the maintainers commit and added the co author to the tests pr :) |
pkgs/by-name/dr/draupnir/package.nix
Outdated
| tests = { | ||
| inherit (nixosTests) draupnir; | ||
| }; | ||
| updateScript = ./update.sh; |
There was a problem hiding this comment.
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.
| updateScript = ./update.sh; | |
| updateScript = nix-update-script { }; |
There was a problem hiding this comment.
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.
wegank
removed
the
12.approvals: 1
pkgs/by-name/dr/draupnir/package.nix
Outdated
| mkdir -p deps/draupnir/ | ||
| echo "${version}-nix" > deps/draupnir/version.txt | ||
|
|
||
| sed -i 's/corepack //g' deps/draupnir/package.json |
There was a problem hiding this comment.
(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.
There was a problem hiding this comment.
@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
changed the title
wegank
added
the
2.status: merge conflict
ofborg
bot
removed
the
2.status: merge conflict
wegank
added
the
2.status: merge conflict
TheArcaneBrony
force-pushed
the
master
branch
from
eb031b1
to
0e12515
Compare
|
(^ squashed in order to rebase) |
TheArcaneBrony
force-pushed
the
master
branch
from
0e12515
to
4551059
Compare
Co-authored-by: teutat3s <[email protected]>
TheArcaneBrony
force-pushed
the
master
branch
from
3d0ec28
to
3667c8c
Compare
ofborg
bot
removed
the
2.status: merge conflict
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
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.