mirror of
https://github.com/justinwoo/easy-dhall-nix.git
synced 2024-12-23 10:19:44 +01:00
Switch to using fetchzip instead of fetchurl
GitHub's source tarballs are created in a non-deterministic way and the order the entries are added is not stable. In nixpkgs, there is fetchFromGitHub which works around this issue by being a wrapper around fetchzip and since we're already using the full URL to the corresponding GitHub archives, I switched to fetchzip instead to keep the changes minimal. Signed-off-by: aszlig <aszlig@nix.build>
This commit is contained in:
aszlig
parent
288ee825c3
commit
65a30e2c0c
8 changed files with 27 additions and 25 deletions
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-bash-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-bash-darwin.url;
|
||||
sha256 = release.dhall-bash-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-bash-linux.url;
|
||||
sha256 = release.dhall-bash-linux.hash;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-json-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-json-darwin.url;
|
||||
sha256 = release.dhall-json-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-json-linux.url;
|
||||
sha256 = release.dhall-json-linux.hash;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-lsp-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-lsp-server-darwin.url;
|
||||
sha256 = release.dhall-lsp-server-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-lsp-server-linux.url;
|
||||
sha256 = release.dhall-lsp-server-linux.hash;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-nix-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-nix-darwin.url;
|
||||
sha256 = release.dhall-nix-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-nix-linux.url;
|
||||
sha256 = release.dhall-nix-linux.hash;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-darwin.url;
|
||||
sha256 = release.dhall-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-linux.url;
|
||||
sha256 = release.dhall-linux.hash;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ pkgs.stdenv.mkDerivation rec {
|
|||
name = "dhall-yaml-simple";
|
||||
|
||||
src = if pkgs.stdenv.isDarwin
|
||||
then pkgs.fetchurl {
|
||||
then pkgs.fetchzip {
|
||||
url = release.dhall-yaml-darwin.url;
|
||||
sha256 = release.dhall-yaml-darwin.hash;
|
||||
}
|
||||
else pkgs.fetchurl {
|
||||
else pkgs.fetchzip {
|
||||
url = release.dhall-yaml-linux.url;
|
||||
sha256 = release.dhall-yaml-linux.hash;
|
||||
};
|
||||
|
|
|
|||
4
fetch.py
4
fetch.py
|
|
@ -17,7 +17,9 @@ def prefetch_binaries(release):
|
|||
for a in release['assets']:
|
||||
if "linux" in a['name'] or "macos" in a['name']:
|
||||
print(a['name'], file=sys.stderr)
|
||||
hash = sub.check_output(["nix-prefetch-url", a['browser_download_url']]).strip().decode()
|
||||
hash = sub.check_output([
|
||||
"nix-prefetch-url", '--unpack', a['browser_download_url']
|
||||
]).strip().decode()
|
||||
res += [{
|
||||
'name': a['name'],
|
||||
'url': a['browser_download_url'],
|
||||
|
|
|
|||
24
release.json
24
release.json
|
|
@ -2,61 +2,61 @@
|
|||
"dhall-linux": {
|
||||
"name": "dhall-1.33.1-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-1.33.1-x86_64-linux.tar.bz2",
|
||||
"hash": "02gnhkphsjk0qzr8k0lqjxcn7lqkrp27gybi7mkg1s92zgj7643f"
|
||||
"hash": "1790lxfnqh0wisqksvmfxxcm3yfzd04qhdbyvzlcpwwn2mzdn6bp"
|
||||
},
|
||||
"dhall-darwin": {
|
||||
"name": "dhall-1.33.1-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-1.33.1-x86_64-macos.tar.bz2",
|
||||
"hash": "07gkfx0fb9975m6x6pvw63llxqpk7nblnvvaph7adyj1vlvmsbza"
|
||||
"hash": "0z3mi9mqnnj4r4rfcqs8r3v9sd3wmk37f23ff6iyznv16303s61g"
|
||||
},
|
||||
"dhall-bash-linux": {
|
||||
"name": "dhall-bash-1.0.31-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-bash-1.0.31-x86_64-linux.tar.bz2",
|
||||
"hash": "0hhx7948ljg39qxzrgicx5r6ba20ir22s5gjxdc85irbllrvx2j6"
|
||||
"hash": "1l0ry39vvmn0ync0zfwk951wdinrg82fl7r0c8cyv2c7w1z2skzz"
|
||||
},
|
||||
"dhall-bash-darwin": {
|
||||
"name": "dhall-bash-1.0.31-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-bash-1.0.31-x86_64-macos.tar.bz2",
|
||||
"hash": "14nbphx9rw95c8s4b198y8s0fyky27y3rfanyhnsx8rlw9s3fd9n"
|
||||
"hash": "1f8557hl3nadx5wbm07ba7x3a95dfl5py5dipvpm93lp4nxm6icm"
|
||||
},
|
||||
"dhall-json-linux": {
|
||||
"name": "dhall-json-1.7.0-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-json-1.7.0-x86_64-linux.tar.bz2",
|
||||
"hash": "1v2ss7fz3prmm4riv9fdcwpphgk56nj8kdc3c6ca6d9d947cg7yc"
|
||||
"hash": "1rahjjkpih3qhhqcwdd632p2vd9h53lihpcw62sy26i71scy8iih"
|
||||
},
|
||||
"dhall-json-darwin": {
|
||||
"name": "dhall-json-1.7.0-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-json-1.7.0-x86_64-macos.tar.bz2",
|
||||
"hash": "0z684x9gaz2k5sl87r8xw9l7hm0hif4yn44mca8a6fb28sgf5f48"
|
||||
"hash": "1gd6lpjwk1by25v282gm5x3srvqw2hk6zflfgp4g288chrvnisqv"
|
||||
},
|
||||
"dhall-lsp-server-linux": {
|
||||
"name": "dhall-lsp-server-1.0.8-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-lsp-server-1.0.8-x86_64-linux.tar.bz2",
|
||||
"hash": "0pnsf811cpy74s147i0ww7d3b8k03q83ims6q7ii1nam3cigk089"
|
||||
"hash": "04ipl3n7azrz3cngk1hfpkcgrk3djlwyypds7pnld4b4f66kjxbw"
|
||||
},
|
||||
"dhall-lsp-server-darwin": {
|
||||
"name": "dhall-lsp-server-1.0.8-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-lsp-server-1.0.8-x86_64-macos.tar.bz2",
|
||||
"hash": "1fnhz2f3r17qf8lahk3isc9g094simjviigwcm1dmkxmb14lk0ac"
|
||||
"hash": "14s6bpfji3bcz1m708zpiscmrlj4zzxmd3h0ighk9q90ka93v2ws"
|
||||
},
|
||||
"dhall-nix-linux": {
|
||||
"name": "dhall-nix-1.1.15-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-nix-1.1.15-x86_64-linux.tar.bz2",
|
||||
"hash": "1klfh2hvz62sfdhaxhb5k8qwb6rs64gd3hch2mjz9hjbnza23bk2"
|
||||
"hash": "0r0q30ppgypgzc9a32zr65ql3q0a6i6889h4p2vgm6ra04h78qx1"
|
||||
},
|
||||
"dhall-nix-darwin": {
|
||||
"name": "dhall-nix-1.1.15-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-nix-1.1.15-x86_64-macos.tar.bz2",
|
||||
"hash": "0q1lq78cscdwg9in173z7yqkdk1zslhygj02z2yyfqypad59a1rh"
|
||||
"hash": "1hyjcy2p3zwlnb4jdsg6cpp1p5p6510zhpaf87dq6by0s5hs5rbz"
|
||||
},
|
||||
"dhall-yaml-linux": {
|
||||
"name": "dhall-yaml-1.2.0-x86_64-linux.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-yaml-1.2.0-x86_64-linux.tar.bz2",
|
||||
"hash": "0mnqn6by839v1n2ccb33qxdh7jga0x5xq3kkwdsnic6q7fgcsds6"
|
||||
"hash": "0y5qqv6hw9akv0lqyw3cax7jf2mmwkqr1kasxwcnsimqn7a5m5ib"
|
||||
},
|
||||
"dhall-yaml-darwin": {
|
||||
"name": "dhall-yaml-1.2.0-x86_64-macos.tar.bz2",
|
||||
"url": "https://github.com/dhall-lang/dhall-haskell/releases/download/1.33.1/dhall-yaml-1.2.0-x86_64-macos.tar.bz2",
|
||||
"hash": "0sv2024rjlycnp2kjfb8y72h6ilfsb475q2pf387aq6y314mlj5w"
|
||||
"hash": "1m2dq17xclr61hl5d0laqwqwjqwcwql9ga6q5xpl9kv2bx5cm8pm"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue