qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swiftpm2nix: use nurl instead of nix-prefetch-git (#358546)

Browse Source
This commit is contained in:
Emily 2024-11-23 20:15:33 +00:00 committed by GitHub
commit c9e243b7ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/swift/swiftpm2nix/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }:
{ lib, stdenv, callPackage, makeWrapper, jq, nurl }:
stdenv.mkDerivation {
name = "swiftpm2nix";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
installPhase = ''
install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix
wrapProgram $out/bin/$name \
--prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \
--prefix PATH : ${lib.makeBinPath [ jq nurl ]} \
'';
preferLocalBuild = true;

6
pkgs/development/compilers/swift/swiftpm2nix/swiftpm2nix.sh
View File

@ -23,9 +23,9 @@ hashes=""
jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \
| while read -r name url rev; do
echo >&2 "-- Fetching $name"
sha256="$(nix-prefetch-git --fetch-submodules $url $rev | jq -r .sha256)"
hashes+="
\"$name\" = \"$sha256\";"
hash="$(nurl "$url" "$rev" --json --submodules=true --fetcher=fetchgit | jq -r .args.hash)"
hashes+="
\"$name\" = \"$hash\";"
echo >&2
done
hashes+=$'\n'" "