From 69698ec11cc0619d84b14764fa9e708fe7e7223c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Sep 2017 13:15:50 +0200 Subject: 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`. --- maintainers/scripts/gnome.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'maintainers') diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index e5a8d606f1a3..f77dc5a9e64c 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -9,17 +9,15 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources NO_GNOME_MAJOR="ghex gtkhtml gdm" usage() { - echo "Usage: $0 gnome_dir || [major.minor]" >&2 - echo "gnome_dir is for example pkgs/desktops/gnome-3/3.18" >&2 + echo "Usage: $0 || [major.minor]" >&2 exit 0 } -if [ "$#" -lt 2 ]; then +if [ "$#" -lt 1 ]; then usage fi -GNOME_TOP=$1 -shift +GNOME_TOP=pkgs/desktops/gnome-3 action=$1 -- cgit 1.4.1