summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/installer.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-09-24 13:15:50 +0200
committerzimbatm <zimbatm@zimbatm.com>2017-09-24 12:15:50 +0100
commit69698ec11cc0619d84b14764fa9e708fe7e7223c (patch)
tree9d9f602554b497a3265caf5e2ef4821e12736686 /pkgs/desktops/gnome-3/installer.nix
parent23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff)
downloadnixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.gz
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.bz2
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.lz
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.xz
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.zst
nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.zip
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set

GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources
to update a single version of GNOME. Maintaining multiple versions just does not make sense.
Additionally, it makes viewing history using most Git tools bothersome.

This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes
the config variable for choosing packageset (`environment.gnome3.packageSet`), updates
the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`.

Closes: #29329

* maintainers/scripts/gnome: Use fixed GNOME 3 directory

Since we now allow only a single GNOME 3 package set, specifying
the working directory is not necessary.

This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'pkgs/desktops/gnome-3/installer.nix')
-rw-r--r--pkgs/desktops/gnome-3/installer.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/installer.nix b/pkgs/desktops/gnome-3/installer.nix
new file mode 100644
index 00000000000..4999e1f3343
--- /dev/null
+++ b/pkgs/desktops/gnome-3/installer.nix
@@ -0,0 +1,15 @@
+{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem
+, extraModules ? [] }:
+
+let
+
+  module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
+
+  config = (import ../../../../nixos/lib/eval-config.nix {
+    inherit system;
+    modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
+  }).config;
+
+in
+  config.system.build.isoImage
+