aboutsummaryrefslogtreecommitdiffstats
path: root/pkgs/by-name/ta
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/by-name/ta')
-rw-r--r--pkgs/by-name/ta/tails-iso/files.json6
-rw-r--r--pkgs/by-name/ta/tails-iso/package.nix24
-rwxr-xr-xpkgs/by-name/ta/tails-iso/update.sh16
3 files changed, 25 insertions, 21 deletions
diff --git a/pkgs/by-name/ta/tails-iso/files.json b/pkgs/by-name/ta/tails-iso/files.json
index 0e42badf..4ef33c7b 100644
--- a/pkgs/by-name/ta/tails-iso/files.json
+++ b/pkgs/by-name/ta/tails-iso/files.json
@@ -1,7 +1,7 @@
{
- "version": "7.8.1",
+ "version": "7.10.1",
"files": {
- "iso.sig": "sha256-DQm+EHe0KllmzLQzGU61cqaRDNjhU3KUCtDzHKDwWck=",
- "iso": "sha256-Y4Sch1ZgWUODi9rxcXimVrFvicXPCN6SgLvINvJGcvw="
+ "iso.sig": "sha256-h+6L/pT3EssW+BkVnBubqsKst/6zKMo4XVPfbLH2W7c=",
+ "iso": "sha256-CmvJU/hwurBi1zjCop7IycAUPjshHC0YKvz5sogFPHE="
}
}
diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix
index 87bfd0b2..3325f178 100644
--- a/pkgs/by-name/ta/tails-iso/package.nix
+++ b/pkgs/by-name/ta/tails-iso/package.nix
@@ -30,7 +30,7 @@
})
(fetchurl {
url = "https://tails.net/tails-signing.key";
- hash = "sha256-OwdqyM7o7K6F5Km0U1RU3hzsnaT+Yw0sjQk/thMeq1k=";
+ hash = "sha256-LhWSTlgT9FJnd6RQZA3avLzhHKgfanRZkiipMjL1ZP8=";
})
];
@@ -40,20 +40,16 @@
sequoia-sq
];
- buildPhase =
- /*
- bash
- */
- ''
- for src in $srcs; do
- cp --recursive "$src" "$(stripHash "$src")"
- done
+ buildPhase = ''
+ for src in $srcs; do
+ cp --recursive "$src" "$(stripHash "$src")"
+ done
- sq verify \
- --signer-file=tails-signing.key \
- --signature-file=tails-${finalAttrs.version}.iso.sig \
- tails-${finalAttrs.version}.iso
- '';
+ sq verify \
+ --signer-file=tails-signing.key \
+ --signature-file=tails-${finalAttrs.version}.iso.sig \
+ tails-${finalAttrs.version}.iso
+ '';
installPhase = ''
cp tails-${finalAttrs.version}.iso "$out";
diff --git a/pkgs/by-name/ta/tails-iso/update.sh b/pkgs/by-name/ta/tails-iso/update.sh
index 10336449..363df8c5 100755
--- a/pkgs/by-name/ta/tails-iso/update.sh
+++ b/pkgs/by-name/ta/tails-iso/update.sh
@@ -2,6 +2,10 @@
set -e
+root="$(git rev-parse --show-toplevel)"
+
+cd "$root/pkgs/by-name/ta/tails-iso/"
+
tmpHomePath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-url-XXXXXXXXXX")"
cleanup() {
chmod -R u+w "$tmpHomePath"
@@ -43,12 +47,16 @@ get_sha256() {
echo "$hash"
}
-old_version="$(jq .version --raw-output <./files.json)"
new_version="$(curl --follow https://download.tails.net/tails/stable/ 2>/dev/null | html2text -links | grep --regexp='\s*[0-9]\. tails-amd64-' | sed 's/\s*[0-9]\. tails-amd64-\(.*\)\//\1/')"
-if [ "$old_version" = "$new_version" ]; then
- # No need to update.
- exit 0
+# The `files.json` file might not be present, if a previous update failed.
+if test -f ./files.json; then
+ old_version="$(jq .version --raw-output <./files.json)"
+
+ if [ "$old_version" = "$new_version" ]; then
+ # No need to update.
+ exit 0
+ fi
fi
final_version="amd64-$new_version"