diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-05-10 14:05:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 14:05:02 -0400 |
| commit | 79752e2310336be9d16813578f3b061fd0c14d79 (patch) | |
| tree | 19611cf40f2fe6b454ec03e2141a22063946e4bc /nixos | |
| parent | f1b821a338ffdc1bc3baab672254054599a05cbf (diff) | |
| parent | 6cb46a389741f7916d2c5746d655c76f9333b148 (diff) | |
| download | nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar.gz nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar.bz2 nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar.lz nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar.xz nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.tar.zst nixpkgs-79752e2310336be9d16813578f3b061fd0c14d79.zip | |
Merge pull request #121834 from samueldr/feature/raspberrypi4-image-cleanup
sd_image_raspberrypi4: Remove, as planned initially
Diffstat (limited to 'nixos')
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 2ca3150e680..2367e79e4ad 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: |