philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #121834 from samueldr/feature/raspberrypi4-image-cleanup

Browse source 
sd_image_raspberrypi4: Remove, as planned initially
This commit is contained in:
Samuel Dionne-Riel 2021-05-10 14:05:02 -04:00 committed by GitHub
parent f1b821a338 6cb46a3897
commit 79752e2310
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix
View file

@ -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.
''
];
};
}

10
nixos/modules/installer/sd-card/sd-image-raspberrypi4-installer.nix
View file

@ -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;
}

8
nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix
View file

@ -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;
}

5
nixos/release.nix
View file

@ -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: