diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-28 21:03:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 21:03:03 +0200 |
| commit | 4426104c8c900fbe048c33a0e6f68a006235ac50 (patch) | |
| tree | 94d1f6fbc4673dfb3c1d9c266dcae49b4019312b | |
| parent | e6f7f84325d01024a696a64af84faefe71c348ce (diff) | |
| parent | 873f20f63e4ae008aa27ad9068bbeab98617177d (diff) | |
| download | nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar.gz nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar.bz2 nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar.lz nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar.xz nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.tar.zst nixlib-4426104c8c900fbe048c33a0e6f68a006235ac50.zip | |
Merge pull request #85711 from worldofpeace/gnome-iso
nixos/release: add GNOME ISO
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 5 | ||||
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 07f11239366b..1cf7c977eeb0 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -28,6 +28,11 @@ </listitem> <listitem> <para> + We now distribute a GNOME ISO. + </para> + </listitem> + <listitem> + <para> PHP now defaults to PHP 7.4, updated from 7.3. </para> </listitem> diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2f5dd28e8bb5..2753fd6d6389 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 { |