1 files changed, 39 insertions, 30 deletions

diff --git a/modules/by-name/bo/boot/tails_iso.nix b/pkgs/by-name/ta/tails-iso/package.nix
index ec2b740b..3325f178 100644
--- a/modules/by-name/bo/boot/tails_iso.nix
+++ b/pkgs/by-name/ta/tails-iso/package.nix
@@ -7,61 +7,65 @@
 #
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{pkgs ? (builtins.getFlake "nixpkgs").legacyPackages."x86_64-linux"}: let
-  checked_iso = pkgs.stdenv.mkDerivation (finalAttrs: {
-    pname = "tails-iso";
-    version = "amd64-7.8";
+{
+  stdenv,
+  fetchurl,
+  sequoia-sq,
+  libarchive, # for bsdtar
+}: let
+  files = builtins.fromJSON (builtins.readFile (./files.json));
+
+  checked_iso = stdenv.mkDerivation (finalAttrs: {
+    pname = "raw-tails-iso";
+    version = "amd64-${files.version}";
 
     srcs = [
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig";
-        hash = "sha256-58vDQdXQYYqeVUHzupmDPtVVpSrxtT25+gwHe2OfvkA=";
+        hash = files.files."iso.sig";
       })
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso";
-        hash = "sha256-ewLHQ+3iI3aHgvKdBgysQ9QAudQ7AM83WP+VdYFmxt0=";
+        hash = files.files."iso";
       })
-      (pkgs.fetchurl {
+      (fetchurl {
         url = "https://tails.net/tails-signing.key";
-        hash = "sha256-OwdqyM7o7K6F5Km0U1RU3hzsnaT+Yw0sjQk/thMeq1k=";
+        hash = "sha256-LhWSTlgT9FJnd6RQZA3avLzhHKgfanRZkiipMjL1ZP8=";
       })
     ];
 
     dontUnpack = true;
 
     nativeBuildInputs = [
-      pkgs.sequoia-sq
+      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";
     '';
   });
 in
-  pkgs.stdenv.mkDerivation {
-    name = "live_iso_boot_entry";
+  stdenv.mkDerivation {
+    pname = "tails-iso-package";
+    inherit (checked_iso) version;
 
     src = checked_iso;
 
     dontUnpack = true;
 
-    nativeBuildInputs = with pkgs; [
-      libarchive # for bsdtar
+    nativeBuildInputs = [
+      libarchive
     ];
 
     buildPhase = ''
@@ -69,10 +73,15 @@ in
       bsdtar -xf "$src" -C iso
     '';
 
+    passthru = {
+      inherit (files) version;
+    };
+
     installPhase = ''
-      install -D ./iso/live/initrd.img "$out/live/initramfs-linux.img"
+      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 "$src" "$out/tails.iso"
+      chmod --recursive -x $out/tails.iso $out/live/*
     '';
   }