summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-07 19:53:47 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-01-27 16:34:37 -0500
commit0f2536f15b6c8ec841ea6b9c761602612f6cf75f (patch)
treeb2ca702133f7a613bd0faaea3b388855a7d7015c
parent5e46d5a7b59d69e7b86239195f58d26277ae0370 (diff)
downloadnixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar.gz
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar.bz2
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar.lz
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar.xz
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.tar.zst
nixpkgs-0f2536f15b6c8ec841ea6b9c761602612f6cf75f.zip
nixos/release: rename iso_graphical to iso_plasma5
And all the other things and paths to match it
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix (renamed from nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix)2
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix (renamed from nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix)0
-rw-r--r--nixos/release-combined.nix2
-rw-r--r--nixos/release.nix6
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
index 3336d512cfd..d98325a99ac 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5-new-kernel.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-graphical-kde.nix ];
+  imports = [ ./installation-cd-graphical-plasma5.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
index e00d3f7535b..e00d3f7535b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ca9c6f9a7f9..b46731863ca 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -54,7 +54,7 @@ in rec {
         (all nixos.dummy)
         (all nixos.manual)
 
-        nixos.iso_graphical.x86_64-linux or []
+        nixos.iso_plasma5.x86_64-linux or []
         nixos.iso_minimal.aarch64-linux or []
         nixos.iso_minimal.i686-linux or []
         nixos.iso_minimal.x86_64-linux or []
diff --git a/nixos/release.nix b/nixos/release.nix
index 9109f5751eb..512ba714397 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -149,9 +149,9 @@ in rec {
     inherit system;
   });
 
-  iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
-    type = "graphical";
+  iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
+    module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;
+    type = "plasma5";
     inherit system;
   });