From 10cd9c53115061aa6a0a90aad0b0dde6a999cdb9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 18 Jan 2024 23:05:35 +0100 Subject: [PATCH] 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 . (cherry picked from commit d6185e83d864a4a73d5e6655ab7410c074c0657c) --- docs/default.nix | 5 ++++- tests/default.nix | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/default.nix b/docs/default.nix index 7846d987f..b6dae7092 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -7,7 +7,10 @@ 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 { inherit lib; diff --git a/tests/default.nix b/tests/default.nix index 803d12c72..c337fa10e 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -4,6 +4,11 @@ let 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 { inherit lib pkgs; check = false; @@ -35,7 +40,7 @@ let isDarwin = pkgs.stdenv.hostPlatform.isDarwin; isLinux = pkgs.stdenv.hostPlatform.isLinux; -in import pkgs.nix-lib-nmt { +in import nmtSrc { inherit lib pkgs modules; testedAttrPath = [ "home" "activationPackage" ]; tests = builtins.foldl' (a: b: a // (import b)) { } ([