docs, tests: revert to fetchTarball for nmd and nmt

Turns out pulling nmt and nmd from Nixpkgs causes an IFD, even when
the packages are fixed-output derivations.

Thus, since Sourcehut is up and well, we can revert to simply fetching
nmd and nmt directly.

See discussion in <https://github.com/nix-community/home-manager/pull/4884>.
This commit is contained in:
Robert Helgesson 2024-01-18 23:05:35 +01:00
parent b84191db12
commit d6185e83d8
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
2 changed files with 10 additions and 2 deletions

View file

@ -7,7 +7,10 @@
let let
nmdSrc = pkgs.nix-lib-nmd; nmdSrc = fetchTarball {
url = "https://git.sr.ht/~rycee/nmd/archive/v0.5.0.tar.gz";
sha256 = "0hnd86jd19zb5j3hmpwmdmdiasg65lgahqv7n8frl9p1vdqz6z67";
};
nmd = import nmdSrc { nmd = import nmdSrc {
inherit lib; inherit lib;

View file

@ -4,6 +4,11 @@ let
lib = import ../modules/lib/stdlib-extended.nix pkgs.lib; lib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
nmtSrc = fetchTarball {
url = "https://git.sr.ht/~rycee/nmt/archive/v0.5.1.tar.gz";
sha256 = "0qhn7nnwdwzh910ss78ga2d00v42b0lspfd7ybl61mpfgz3lmdcj";
};
modules = import ../modules/modules.nix { modules = import ../modules/modules.nix {
inherit lib pkgs; inherit lib pkgs;
check = false; check = false;
@ -33,7 +38,7 @@ let
isDarwin = pkgs.stdenv.hostPlatform.isDarwin; isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
isLinux = pkgs.stdenv.hostPlatform.isLinux; isLinux = pkgs.stdenv.hostPlatform.isLinux;
in import pkgs.nix-lib-nmt { in import nmtSrc {
inherit lib pkgs modules; inherit lib pkgs modules;
testedAttrPath = [ "home" "activationPackage" ]; testedAttrPath = [ "home" "activationPackage" ];
tests = builtins.foldl' (a: b: a // (import b)) { } ([ tests = builtins.foldl' (a: b: a // (import b)) { } ([