New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gnome 3.12 #2694

Merged
merged 73 commits into from May 20, 2014

Conversation

Projects
None yet
4 participants
@lethalman
Contributor

lethalman commented May 19, 2014

I've updated gnome to 3.12 (in only 24 hours, awesome). I'm probably going to merge tomorrow if you don't see any problem at a first glance.
Noteworthy changes:

  1. Moved gnome-3/* to gnome-3/3.10, and created gnome-3/3.12
  2. New scope pkgs.gnome3_12.
  3. New packages (not updates): cogl_1_18, clutter_1_18, upower_99, appdata-tools, spidermonkey_24.
  4. Allow upower service to specify which upower package to use, gnome 3.12 will enforce upower 0.99.
  5. Updates that should not break: geoclue 2.0.0 -> 2.1.8, json-glib 0.16.0 -> 1.0.0
  6. New environment.gnome3.packageSet nixos option for specifying which gnome3 to use, e.g. pkgs.gnome3_12.
  7. We are enforcing python3Packages = python33Packages due to #2693 and in general because python 3.3 is more stable for now.
  8. Disabled gnome-terminal runtime migration from gconf to dconf, to drop the only gconf dependency.
@bjornfor

This comment has been minimized.

Contributor

bjornfor commented May 19, 2014

Sweet!

@lethalman

This comment has been minimized.

Contributor

lethalman commented May 20, 2014

I have a problem with this branch that seems related to some misunderstanding of newScope and merging of options on my side. Set this in the configuration.nix:

  services.xserver = {
    enable = true;
    displayManager.lightdm.enable = true;
    desktopManager.gnome3.enable = true;
  };

  environment.gnome3.packageSet = pkgs.gnome3_12;

With nixos-rebuild you get:

building the system configuration...
error: Package ‘python3.3-pyspotify-1.11’ in ‘/home/lethal/nixpkgs/pkgs/top-level/python-packages.nix:8920’ has an unfree license, refusing to evaluate. You can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this. If you use Nix standalone, you can add
  { allowUnfree = true; }
to ~/.nixpkgs/config.nix or pass
  --arg config '{ allowUnfree = true; }'
on the command line.
(use `--show-trace' to show detailed location information)

This is related to python3Packages = python33Packages; here: https://github.com/lethalman/nixpkgs/blob/08e46e4669686bf5cb2366b5e7ef1dd998885855/pkgs/desktops/gnome-3/3.12/default.nix#L12

In fact, setting python3Packages = python33Packages; in all-packages.nix does not raise this problem.

Also note that the closure of the drvs in nixos-rebuild dry-run when allowing unfree packages does not contain any reference to spotify.

Also note that nix-build of nixos/tests/gnome3_12.nix does not raise the problem either.

@vcunat

This comment has been minimized.

Member

vcunat commented May 20, 2014

Are you sure your configuration doesn't refer to pyspotify or mopidy?

@lethalman

This comment has been minimized.

Contributor

lethalman commented May 20, 2014

@vcunat my nixos configuration? yes I'm sure. Also with gnome 3.10 there isn't this problem. I fear it must be some package using gnome 3.10 instead of the gnome 3.12 scope, but still I don't see why pyspotify gets evaluated.
Also there's no spotify when running nixos-rebuild dry-run with unfree enabled and printing the closure tree.

However this may clear up something. With this setup it still raises the error:

  • Gnome 3.12 scope has no python override
  • Gnome 3.10 has python3 = pkgs.python33Packages; and python = pkgs.python33;
  • Use pkgs.gnome3_12 as gnome3 package set in nixos configuration.

That is, I've removed python override from gnome-3/3.12/default.nix and still gives the error. But removing it also from gnome-3/3.10 fixes the error.

So basically: the problem is in setting python3Packages = pkgs.python33Packages in gnome-3/3.10, even using gnome 3.10 for the xserver configuration. Gnome 3.12 has nothing to do with that.

Update: the problem arises also by disabling gnome, the xserver and everything in my nixos configuration. I fear it must be something wrong with the usage of the newScope in gnome3 together with python3Packages = python33Packages; .

@lethalman

This comment has been minimized.

Contributor

lethalman commented May 20, 2014

I've removed the python3Packages = python33Packages override, hoping in getting it fixed in all-packages :-)

lethalman added a commit that referenced this pull request May 20, 2014

@lethalman lethalman merged commit 70bf43d into NixOS:master May 20, 2014

@domenkozar

This comment has been minimized.

Member

domenkozar commented May 20, 2014

🍻

@jtojnar jtojnar referenced this pull request Sep 13, 2017

Closed

Single GNOME 3 version #29329

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Sep 14, 2017

gnome3: only maintain single GNOME 3 package set
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

@jtojnar jtojnar referenced this pull request Sep 14, 2017

Merged

gnome3: only maintain single GNOME 3 package set #29397

2 of 8 tasks complete

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Sep 14, 2017

gnome3: only maintain single GNOME 3 package set
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

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Sep 14, 2017

gnome3: only maintain single GNOME 3 package set
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

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Sep 15, 2017

gnome3: only maintain single GNOME 3 package set
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

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Sep 20, 2017

gnome3: only maintain single GNOME 3 package set
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

zimbatm added a commit that referenced this pull request Sep 24, 2017

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`.

zimbatm added a commit that referenced this pull request Sep 24, 2017

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`.

(cherry picked from commit 69698ec)

InfernalKnight added a commit to InfernalKnight/nixpkgs that referenced this pull request Nov 13, 2017

gnome3: only maintain single GNOME 3 package set (NixOS#29397)
* gnome3: only maintain single GNOME 3 package set

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

* 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment