diff options
Diffstat (limited to '')
| -rw-r--r-- | pkgs/by-name/ta/tails-iso/files.json | 6 | ||||
| -rw-r--r-- | pkgs/by-name/ta/tails-iso/package.nix | 11 | ||||
| -rwxr-xr-x | pkgs/by-name/ta/tails-iso/update.sh | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/by-name/ta/tails-iso/files.json b/pkgs/by-name/ta/tails-iso/files.json index 0e42badf..717f850c 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.9.1", "files": { - "iso.sig": "sha256-DQm+EHe0KllmzLQzGU61cqaRDNjhU3KUCtDzHKDwWck=", - "iso": "sha256-Y4Sch1ZgWUODi9rxcXimVrFvicXPCN6SgLvINvJGcvw=" + "iso.sig": "sha256-vjlzcCy9oG2FhFsJIPeCG6HU1LPPgb3iEi4jCDl/jrk=", + "iso": "sha256-KvUzGVqMiUAXBglyiLM2kdvX/N0qVwPqcAxbONMAEJo=" } } diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix index b74e4023..87bfd0b2 100644 --- a/pkgs/by-name/ta/tails-iso/package.nix +++ b/pkgs/by-name/ta/tails-iso/package.nix @@ -16,7 +16,7 @@ files = builtins.fromJSON (builtins.readFile (./files.json)); checked_iso = stdenv.mkDerivation (finalAttrs: { - pname = "tails-iso"; + pname = "raw-tails-iso"; version = "amd64-${files.version}"; srcs = [ @@ -61,7 +61,8 @@ }); in stdenv.mkDerivation { - name = "live_iso_boot_entry"; + pname = "tails-iso-package"; + inherit (checked_iso) version; src = checked_iso; @@ -81,8 +82,10 @@ in }; installPhase = '' + install -D "$src" "$out/tails.iso" + install -D ./iso/live/vmlinuz "$out/live/vmlinuz-linux" install -D ./iso/live/initrd.img "$out/live/initrd.img" - install -D ./iso/live/vmlinuz "$out/live/vmlinuz" - install -D ./iso/live/filesystem.squashfs "$out/live/filesystem.squashfs" + + chmod --recursive -x $out/tails.iso $out/live/* ''; } diff --git a/pkgs/by-name/ta/tails-iso/update.sh b/pkgs/by-name/ta/tails-iso/update.sh index 5a2a81cd..10336449 100755 --- a/pkgs/by-name/ta/tails-iso/update.sh +++ b/pkgs/by-name/ta/tails-iso/update.sh @@ -48,7 +48,7 @@ new_version="$(curl --follow https://download.tails.net/tails/stable/ 2>/dev/nul if [ "$old_version" = "$new_version" ]; then # No need to update. - info exit 0 + exit 0 fi final_version="amd64-$new_version" |