raito/portable-binary-cache
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: Use older npins

Browse source
This commit is contained in:
sinavir 2024-07-22 02:00:01 +02:00
parent 0fe57595bb
commit ae1eda3033
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
npins/default.nix
View file

@ -1,7 +1,7 @@
# Generated by npins. Do not modify; will be overwritten regularly # Generated by npins. Do not modify; will be overwritten regularly
let let
data = builtins.fromJSON (builtins.readFile ./sources.json); data = builtins.fromJSON (builtins.readFile ./sources.json);
version = data.version; inherit (data) version;
mkSource = mkSource =
spec: spec:
@ -27,7 +27,6 @@ let
revision, revision,
url ? null, url ? null,
hash, hash,
branch ? null,
... ...
}: }:
assert repository ? type; assert repository ? type;
@ -36,7 +35,7 @@ let
if url != null then if url != null then
(builtins.fetchTarball { (builtins.fetchTarball {
inherit url; inherit url;
sha256 = hash; sha256 = hash; # FIXME: check nix version & use SRI hashes
}) })
else else
assert repository.type == "Git"; assert repository.type == "Git";
@ -54,10 +53,10 @@ let
name = urlToName repository.url revision; name = urlToName repository.url revision;
in in
builtins.fetchGit { builtins.fetchGit {
url = repository.url; inherit (repository) url;
rev = revision; rev = revision;
inherit name; inherit name;
narHash = hash; # hash = hash;
}; };
mkPyPiSource = mkPyPiSource =
@ -74,7 +73,7 @@ let
sha256 = hash; sha256 = hash;
}; };
in in
if version == 4 then if version == 3 then
builtins.mapAttrs (_: mkSource) data.pins builtins.mapAttrs (_: mkSource) data.pins
else else
throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`" throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"

6
npins/sources.json
View file

@ -9,7 +9,7 @@
"branch": "master", "branch": "master",
"revision": "608f8008ebd5e7a535544cbc8df18ea4a64bb66a", "revision": "608f8008ebd5e7a535544cbc8df18ea4a64bb66a",
"url": null, "url": null,
"hash": "sha256-yCA/QwWcwOs9dtVxHaHFCu2LNMOhhyUeZG1XpaZrNFE=" "hash": "0l9ldfkaamvdchg2b1x1qcs8pv8aqnhiswfmfqyyph4w0m1ky868"
}, },
"nixpkgs": { "nixpkgs": {
"type": "Channel", "type": "Channel",
@ -18,5 +18,5 @@
"hash": "08wwq26cd2g7h58bfavgvfmhwp2kh5v3qvf1a35xvd1rp20lzs3d" "hash": "08wwq26cd2g7h58bfavgvfmhwp2kh5v3qvf1a35xvd1rp20lzs3d"
} }
}, },
"version": 4 "version": 3
} }