Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use nmt and nmd from Nixpkgs #4884

Merged
merged 2 commits into from
Jan 14, 2024
Merged

Use nmt and nmd from Nixpkgs #4884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae3bfe
tests: use nmt from Nixpkgs
rycee Jan 12, 2024
846200e
docs: use nmd from Nixpkgs
rycee Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions docs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@

let

nmdSrc = fetchTarball {
url = "https://rycee.net/nmd.tar.gz";
sha256 = "123pvsnwnha0zivk77yzdvqakn96l17n8lwa78s2h1njlgkw0ng2";
};
nmdSrc = pkgs.nix-lib-nmd;

nmd = import nmdSrc {
inherit lib;
Expand Down
8 changes: 1 addition & 7 deletions tests/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ let

lib = import ../modules/lib/stdlib-extended.nix pkgs.lib;

nmt = fetchTarball {
url =
"https://gitlab.com/api/v4/projects/rycee%2Fnmt/repository/archive.tar.gz?sha=4df00c569b1badfedffecd7ccd60f794550486db";
sha256 = "1cyly1zazgj8z6bazml4js7lqaqvpp8lw045aqchlpvp42bl1lp4";
};

modules = import ../modules/modules.nix {
inherit lib pkgs;
check = false;
Expand Down Expand Up @@ -39,7 +33,7 @@ let
isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
isLinux = pkgs.stdenv.hostPlatform.isLinux;

in import nmt {
in import pkgs.nix-lib-nmt {
inherit lib pkgs modules;
testedAttrPath = [ "home" "activationPackage" ];
tests = builtins.foldl' (a: b: a // (import b)) { } ([
Expand Down