aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/by-name/bo/boot/module.nix2
-rw-r--r--modules/by-name/bo/boot/tails_iso.nix82
2 files changed, 1 insertions, 83 deletions
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix
index ebf58a97..b8c90d89 100644
--- a/modules/by-name/bo/boot/module.nix
+++ b/modules/by-name/bo/boot/module.nix
@@ -20,7 +20,7 @@
cfg = config.soispha.boot;
tailsPrefix = "EFI/tails";
- iso = import ./tails_iso.nix {inherit pkgs;};
+ iso = pkgs.tails-iso;
iso_options = [
"initrd=/${tailsPrefix}/initrd.img"
diff --git a/modules/by-name/bo/boot/tails_iso.nix b/modules/by-name/bo/boot/tails_iso.nix
deleted file mode 100644
index 03f97577..00000000
--- a/modules/by-name/bo/boot/tails_iso.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-# nixos-config - My current NixOS configuration
-#
-# Copyright (C) 2025 Benedikt Peetz <benedikt.peetz@b-peetz.de>
-# 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 <https://www.gnu.org/licenses/gpl-3.0.txt>.
-{pkgs ? (builtins.getFlake "nixpkgs").legacyPackages."x86_64-linux"}: let
- version = "7.8";
- checked_iso = pkgs.stdenv.mkDerivation (finalAttrs: {
- pname = "tails-iso";
- version = "amd64-${version}";
-
- srcs = [
- (pkgs.fetchurl {
- url = "https://tails.net/torrents/files/tails-${finalAttrs.version}.iso.sig";
- hash = "sha256-58vDQdXQYYqeVUHzupmDPtVVpSrxtT25+gwHe2OfvkA=";
- })
- (pkgs.fetchurl {
- url = "https://download.tails.net/tails/stable/tails-${finalAttrs.version}/tails-${finalAttrs.version}.iso";
- hash = "sha256-ewLHQ+3iI3aHgvKdBgysQ9QAudQ7AM83WP+VdYFmxt0=";
- })
- (pkgs.fetchurl {
- url = "https://tails.net/tails-signing.key";
- hash = "sha256-OwdqyM7o7K6F5Km0U1RU3hzsnaT+Yw0sjQk/thMeq1k=";
- })
- ];
-
- dontUnpack = true;
-
- nativeBuildInputs = [
- pkgs.sequoia-sq
- ];
-
- buildPhase =
- /*
- bash
- */
- ''
- 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
- pkgs.stdenv.mkDerivation {
- name = "live_iso_boot_entry";
-
- src = checked_iso;
-
- dontUnpack = true;
-
- nativeBuildInputs = with pkgs; [
- libarchive # for bsdtar
- ];
-
- buildPhase = ''
- mkdir iso
- bsdtar -xf "$src" -C iso
- '';
-
- passthru = {
- inherit version;
- };
-
- installPhase = ''
- 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"
- '';
- }