lix-project/nixos-module
15
7
Fork 13
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

Show revision of n-e-j better

Browse source
This commit is contained in:
jade 2024-05-27 13:03:12 -06:00
parent 18fa4a89e2
commit 12b457c433
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
overlay.nix
View file

@ -72,14 +72,19 @@ override_2_18 //
nix-eval-jobs = (prev.nix-eval-jobs.override { nix-eval-jobs = (prev.nix-eval-jobs.override {
# lix # lix
nix = final.nixVersions.nix_2_18; nix = final.nixVersions.nix_2_18;
}).overrideAttrs (old: { }).overrideAttrs (old:
# FIXME: should this be patches instead? let src = final.lix-sources.nix-eval-jobs;
src = final.lix-sources.nix-eval-jobs; in {
version = "2.90.0-lix-${builtins.substring 0 7 src.rev}";
mesonBuildType = "debugoptimized"; # FIXME: should this be patches instead?
inherit src;
ninjaFlags = old.ninjaFlags or [ ] ++ [ "-v" ]; mesonBuildType = "debugoptimized";
});
ninjaFlags = old.ninjaFlags or [ ] ++ [ "-v" ];
}
);
# support both having and missing https://github.com/NixOS/nixpkgs/pull/304913 # support both having and missing https://github.com/NixOS/nixpkgs/pull/304913
prefetch-npm-deps = prefetch-npm-deps =

8
pins.nix
View file

@ -14,11 +14,13 @@ let
narHash = args.nar_hash; narHash = args.nar_hash;
} }
else if kind == "tarball" then else if kind == "tarball" then
builtins.fetchTarball args // {
{ outPath = builtins.fetchTarball {
name = "source"; name = "source";
url = args.locked_url; url = args.locked_url;
sha256 = args.nar_hash; sha256 = args.nar_hash;
} else builtins.throw "unsupported input type ${kind}"; };
}
else builtins.throw "unsupported input type ${kind}";
in in
builtins.mapAttrs (_: fetchPin) pins builtins.mapAttrs (_: fetchPin) pins