From 6464d8f4af68f51d42aeb70e43692ef3940345cd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:35:32 -0400 Subject: [PATCH 1/2] nixos/release: add GNOME ISO --- nixos/release-combined.nix | 1 + nixos/release.nix | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f4f99e71a90c..08059ba75954 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -50,6 +50,7 @@ in rec { (onFullSupported "nixos.dummy") (onAllSupported "nixos.iso_minimal") (onSystems ["x86_64-linux"] "nixos.iso_plasma5") + (onSystems ["x86_64-linux"] "nixos.iso_gnome") (onFullSupported "nixos.manual") (onSystems ["x86_64-linux"] "nixos.ova") (onSystems ["aarch64-linux"] "nixos.sd_image") diff --git a/nixos/release.nix b/nixos/release.nix index 6107f3529715..d31fbd11e5cf 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -155,6 +155,12 @@ in rec { inherit system; }); + iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + type = "gnome"; + inherit system; + }); + # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { From 873f20f63e4ae008aa27ad9068bbeab98617177d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:46:20 -0400 Subject: [PATCH 2/2] rl-2009: GNOME ISO --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c800cbc75a5a..e886091d53b0 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,11 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + We now distribute a GNOME ISO. + + PHP now defaults to PHP 7.4, updated from 7.3.