summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2021-05-05 15:06:20 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2021-05-05 16:19:13 -0400
commit6cb46a389741f7916d2c5746d655c76f9333b148 (patch)
tree40c34683a8914781df44d6d23895b4531322562b
parentcaba0b6a233503262879e62de7911b8549dce795 (diff)
downloadnixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar.gz
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar.bz2
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar.lz
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar.xz
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.tar.zst
nixpkgs-6cb46a389741f7916d2c5746d655c76f9333b148.zip
sd_image_raspberrypi4: Remove, as planned initially
The replacement is the generic AArch64 image.

From there, you can customize an image that works better for your
needs, if need be.
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix14
-rw-r--r--nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix10
-rw-r--r--nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix8
-rw-r--r--nixos/release.nix5
4 files changed, 0 insertions, 37 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
deleted file mode 100644
index 79db1fa29bc..00000000000
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, ... }:
-{
-  imports = [
-    ../sd-card/sd-image-raspberrypi4-installer.nix
-  ];
-  config = {
-    warnings = [
-      ''
-      .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed.
-      Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead.
-      ''
-    ];
-  };
-}
diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix
deleted file mode 100644
index 59423e40b64..00000000000
--- a/nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  imports = [
-    ../../profiles/installation-device.nix
-    ./sd-image-raspberrypi4.nix
-  ];
-
-  # the installation media is also the installation target,
-  # so we don't want to provide the installation configuration.nix.
-  installer.cloneConfig = false;
-}
diff --git a/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix b/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
deleted file mode 100644
index 35a12c5382f..00000000000
--- a/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# To build, use:
-# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [ ./sd-image-aarch64.nix ];
-  boot.kernelPackages = pkgs.linuxPackages_rpi4;
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index 327a259de7f..510cd8f82a1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -186,11 +186,6 @@ in rec {
     inherit system;
   });
 
-  sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
-    module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix;
-    inherit system;
-  });
-
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = forMatchingSystems [ "x86_64-linux" ] (system: