element-desktop, element-web: adapt update script to new nix-prefetch-github

+15 -17
+1 -1
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
··· 32 32 owner = "vector-im"; 33 33 repo = "element-desktop"; 34 34 rev = "v${finalAttrs.version}"; 35 - sha256 = desktopSrcHash; 35 + hash = desktopSrcHash; 36 36 }; 37 37 38 38 offlineCache = fetchYarnDeps {
+1 -1
pkgs/applications/networking/instant-messengers/element/element-web.nix
··· 25 25 owner = "vector-im"; 26 26 repo = finalAttrs.pname; 27 27 rev = "v${finalAttrs.version}"; 28 - sha256 = webSrcHash; 28 + hash = webSrcHash; 29 29 }; 30 30 31 31 offlineCache = fetchYarnDeps {
+1 -1
pkgs/applications/networking/instant-messengers/element/keytar/default.nix
··· 12 12 owner = "atom"; 13 13 repo = "node-keytar"; 14 14 rev = "v${version}"; 15 - sha256 = pinData.srcHash; 15 + hash = pinData.srcHash; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+1 -1
pkgs/applications/networking/instant-messengers/element/keytar/pin.json
··· 1 1 { 2 2 "version": "7.9.0", 3 - "srcHash": "Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", 3 + "srcHash": "sha256-Mnl0Im2hZJXJEtyXb5rgMntekkUAnOG2MN1bwfgh0eg=", 4 4 "npmHash": "sha256-ldfRWV+HXBdBYO2ZiGbVFSHV4/bMG43U7w+sJ4kpVUY=" 5 5 }
+2 -2
pkgs/applications/networking/instant-messengers/element/keytar/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps 2 + #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-npm-deps nix-prefetch-github 3 3 4 4 if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then 5 5 echo "Regenerates packaging data for the keytar package." ··· 25 25 npm_hash=$(prefetch-npm-deps package-lock.json) 26 26 rm -rf node_modules package.json package-lock.json 27 27 28 - src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .sha256) 28 + src_hash=$(nix-prefetch-github atom node-keytar --rev v${version} | jq -r .hash) 29 29 30 30 cat > pin.json << EOF 31 31 {
+2 -2
pkgs/applications/networking/instant-messengers/element/pin.nix
··· 1 1 { 2 2 "version" = "1.11.36"; 3 3 "hashes" = { 4 - "desktopSrcHash" = "MMTuyyUXur5Fy24aXPWtZbQLAaXR2R7coEi8ZOJo1YI="; 4 + "desktopSrcHash" = "sha256-MMTuyyUXur5Fy24aXPWtZbQLAaXR2R7coEi8ZOJo1YI="; 5 5 "desktopYarnHash" = "03wmdqnxzjrvdypwrb5z564liiqamwn6qmw2fww1mja8dkdkx5ng"; 6 - "webSrcHash" = "u+Y/iLRlTd5RkczF6qIaer9HKFnm8LUGP8ZnB/WfiGI="; 6 + "webSrcHash" = "sha256-u+Y/iLRlTd5RkczF6qIaer9HKFnm8LUGP8ZnB/WfiGI="; 7 7 "webYarnHash" = "0s9ly1hr9jvb2asgjf6g5n5n5w6qh51wkwyl7ps891c0hv9m28zm"; 8 8 }; 9 9 }
+2 -4
pkgs/applications/networking/instant-messengers/element/seshat/default.nix
··· 5 5 6 6 in rustPlatform.buildRustPackage rec { 7 7 pname = "seshat-node"; 8 - inherit (pinData) version; 8 + inherit (pinData) version cargoHash; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "matrix-org"; 12 12 repo = "seshat"; 13 13 rev = version; 14 - sha256 = pinData.srcHash; 14 + hash = pinData.srcHash; 15 15 }; 16 16 17 17 sourceRoot = "source/seshat-node/native"; ··· 53 53 ''; 54 54 55 55 disallowedReferences = [ stdenv.cc.cc ]; 56 - 57 - cargoSha256 = pinData.cargoHash; 58 56 }
+1 -1
pkgs/applications/networking/instant-messengers/element/seshat/pin.json
··· 1 1 { 2 2 "version": "2.3.3", 3 - "srcHash": "HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", 3 + "srcHash": "sha256-HmKHWFoO8TQ9S/RcJnJ3h85/2uSkqGrgLnX82hkux4Q=", 4 4 "yarnHash": "1cbkv8ap7f8vxl5brzqb86d2dyxg555sz67cldrp0vgnk8sq6ibp", 5 5 "cargoHash": "sha256-WsgTbQ91aZZV5sIuFVjsccdiXivjtAUC1Zs/4uNk1zU=" 6 6 }
+2 -2
pkgs/applications/networking/instant-messengers/element/seshat/update.sh
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch 2 + #!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn nix-prefetch nix-prefetch-github 3 3 4 4 if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then 5 5 echo "Regenerates packaging data for the seshat package." ··· 25 25 yarn_hash=$(prefetch-yarn-deps yarn.lock) 26 26 popd 27 27 28 - src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .sha256) 28 + src_hash=$(nix-prefetch-github matrix-org seshat --rev ${version} | jq -r .hash) 29 29 30 30 cat > pin.json << EOF 31 31 {
+2 -2
pkgs/applications/networking/instant-messengers/element/update.sh
··· 20 20 21 21 # Element Web 22 22 web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" 23 - web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .sha256) 23 + web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) 24 24 25 25 web_tmpdir=$(mktemp -d) 26 26 trap 'rm -rf "$web_tmpdir"' EXIT ··· 32 32 33 33 # Element Desktop 34 34 desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" 35 - desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .sha256) 35 + desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) 36 36 37 37 desktop_tmpdir=$(mktemp -d) 38 38 trap 'rm -rf "$desktop_tmpdir"' EXIT