gnome3: only maintain single GNOME 3 package set #29397
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jtojnar, thanks for your PR! By analyzing the history of the files in this pull request, we identified @lethalman, @bjornfor and @domenkozar to be potential reviewers. |
jtojnar
force-pushed
the
single-gnome
branch
2 times, most recently
from
d48e44b
to
5fe0f50
Compare
FRidh
added
the
6.topic: GNOME
jtojnar
force-pushed
the
single-gnome
branch
from
5fe0f50
to
dce05c7
Compare
GNOME 3 was split into 3.10 and 3.12 in NixOS#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: NixOS#29329
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`.
jtojnar
force-pushed
the
single-gnome
branch
from
dce05c7
to
99b9895
Compare
|
It does not look like a mass rebuild so I will just pointed it back to master. |
|
Can we move this forward? |
|
should this be cherry-picked for 17.09? /cc @globin |
zimbatm
pushed a commit
that referenced
this pull request
Sep 24, 2017
* 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`. (cherry picked from commit 69698ec)
|
It would simplify further cherry-picking of gnome fixes to 17.09, though that might not be easy anyway due to expected update 3.24 -> 3.26. |
|
Yeah we'll see. I pushed it to the 17.09 branch as well in the end. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
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.
Things done
I renamed
pkgs/desktops/gnome-3/3.24topkgs/desktops/gnome-3, removedthe config variable for choosing packageset (
environment.gnome3.packageSet), and removed thegnome3_24derivation fromall-packages.nix. On top of that, I modified the maintainer script not to require the directory path.Closes: #29329
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Follow-ups
cc @teh @vcunat @lethalman