From 5ca82ffa08af81f36ec998e7f49f53af7496a93a Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 2 Nov 2026 19:53:17 +0100 Subject: pkgs/*: Use a `stable`/`unstable` marker in the filename --- pkgs/by-name/ta/tails-iso/package.nix | 87 -------------------------- pkgs/by-name/ta/tails-iso/package.unstable.nix | 87 ++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 pkgs/by-name/ta/tails-iso/package.nix create mode 100644 pkgs/by-name/ta/tails-iso/package.unstable.nix (limited to 'pkgs/by-name/ta') diff --git a/pkgs/by-name/ta/tails-iso/package.nix b/pkgs/by-name/ta/tails-iso/package.nix deleted file mode 100644 index a29bff54..00000000 --- a/pkgs/by-name/ta/tails-iso/package.nix +++ /dev/null @@ -1,87 +0,0 @@ -# nixos-config - My current NixOS configuration -# -# Copyright (C) 2025 Benedikt Peetz -# SPDX-License-Identifier: GPL-3.0-or-later -# -# This file is part of my nixos-config. -# -# You should have received a copy of the License along with this program. -# If not, see . -{ - 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 = [ - (fetchurl { - url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig"; - hash = files.files."iso.sig"; - }) - (fetchurl { - url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso"; - hash = files.files."iso"; - }) - (fetchurl { - url = "https://tails.net/tails-signing.key"; - hash = "sha256-wfGbXs4S2FYvtAMTotikG7asR96k2U27u8YGq2ahyjc="; - }) - ]; - - dontUnpack = true; - - nativeBuildInputs = [ - sequoia-sq - ]; - - 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 - ''; - - installPhase = '' - cp tails-${finalAttrs.version}.iso "$out"; - ''; - }); -in - stdenv.mkDerivation { - pname = "tails-iso-package"; - inherit (checked_iso) version; - - src = ./.; - - dontUnpack = true; - - nativeBuildInputs = [ - libarchive - ]; - - buildPhase = '' - mkdir iso - ''; - - passthru = { - inherit (files) version; - }; - - installPhase = '' - mkdir --parents "$out/live/" - echo 1 > "$out/tails.iso" - echo 2 > "$out/live/vmlinuz-linux" - echo 3 > "$out/live/initrd.img" - - chmod --recursive -x $out/tails.iso $out/live/* - ''; - } diff --git a/pkgs/by-name/ta/tails-iso/package.unstable.nix b/pkgs/by-name/ta/tails-iso/package.unstable.nix new file mode 100644 index 00000000..a29bff54 --- /dev/null +++ b/pkgs/by-name/ta/tails-iso/package.unstable.nix @@ -0,0 +1,87 @@ +# nixos-config - My current NixOS configuration +# +# Copyright (C) 2025 Benedikt Peetz +# SPDX-License-Identifier: GPL-3.0-or-later +# +# This file is part of my nixos-config. +# +# You should have received a copy of the License along with this program. +# If not, see . +{ + 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 = [ + (fetchurl { + url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig"; + hash = files.files."iso.sig"; + }) + (fetchurl { + url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso"; + hash = files.files."iso"; + }) + (fetchurl { + url = "https://tails.net/tails-signing.key"; + hash = "sha256-wfGbXs4S2FYvtAMTotikG7asR96k2U27u8YGq2ahyjc="; + }) + ]; + + dontUnpack = true; + + nativeBuildInputs = [ + sequoia-sq + ]; + + 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 + ''; + + installPhase = '' + cp tails-${finalAttrs.version}.iso "$out"; + ''; + }); +in + stdenv.mkDerivation { + pname = "tails-iso-package"; + inherit (checked_iso) version; + + src = ./.; + + dontUnpack = true; + + nativeBuildInputs = [ + libarchive + ]; + + buildPhase = '' + mkdir iso + ''; + + passthru = { + inherit (files) version; + }; + + installPhase = '' + mkdir --parents "$out/live/" + echo 1 > "$out/tails.iso" + echo 2 > "$out/live/vmlinuz-linux" + echo 3 > "$out/live/initrd.img" + + chmod --recursive -x $out/tails.iso $out/live/* + ''; + } -- cgit v1.3.1