tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
Change default from gnome 3.10 to gnome 3.12
Luca Bruno
11 years ago
e4e39f26
152ae27a
+10
-9
5 changed files
expand all
collapse all
unified
split
nixos
modules
services
x11
desktop-managers
gnome3.nix
tests
gnome3_10.nix
pkgs
applications
audio
gtkpod
default.nix
desktops
gnome-3
3.10
default.nix
top-level
all-packages.nix
+1
-1
nixos/modules/services/x11/desktop-managers/gnome3.nix
···
45
45
46
46
environment.gnome3.packageSet = mkOption {
47
47
default = pkgs.gnome3;
48
48
-
example = literalExample "pkgs.gnome3_12";
48
48
+
example = literalExample "pkgs.gnome3_10";
49
49
description = "Which Gnome 3 package set to use.";
50
50
};
51
51
+2
-2
nixos/tests/gnome3_12.nix
nixos/tests/gnome3_10.nix
···
1
1
import ./make-test.nix {
2
2
-
name = "gnome3_12";
2
2
+
name = "gnome3";
3
3
4
4
machine =
5
5
{ config, pkgs, ... }:
···
11
11
services.xserver.displayManager.auto.enable = true;
12
12
services.xserver.displayManager.auto.user = "alice";
13
13
services.xserver.desktopManager.gnome3.enable = true;
14
14
-
environment.gnome3.packageSet = pkgs.gnome3_12;
14
14
+
environment.gnome3.packageSet = pkgs.gnome3_10;
15
15
};
16
16
17
17
testScript =
+2
-5
pkgs/applications/audio/gtkpod/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac,
2
2
-
gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag,
2
2
+
gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag,
3
3
libvorbis, hicolor_icon_theme, gdk_pixbuf }:
4
4
5
5
-
let
6
6
-
gnome = gnome3_12;
7
7
-
8
8
-
in stdenv.mkDerivation rec {
5
5
+
stdenv.mkDerivation rec {
9
6
version = "2.1.4";
10
7
name = "gtkpod-${version}";
11
8
+1
pkgs/desktops/gnome-3/3.10/default.nix
···
2
2
3
3
rec {
4
4
inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking;
5
5
+
gnome3 = pkgs.gnome3_10 // { recurseForDerivations = false; };
5
6
gtk = gtk3; # just to be sure
6
7
libcanberra = pkgs.libcanberra_gtk3; # just to be sure
7
8
inherit (pkgs.gnome2) ORBit2;
+4
-1
pkgs/top-level/all-packages.nix
···
9069
9069
};
9070
9070
9071
9071
gtkpod = callPackage ../applications/audio/gtkpod {
9072
9072
+
gnome = gnome3;
9072
9073
inherit (gnome) libglade;
9073
9074
};
9074
9075
···
10827
10828
inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
10828
10829
};
10829
10830
10830
10830
-
gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
10831
10831
+
gnome3_10 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
10831
10832
callPackage = pkgs.newScope pkgs.gnome3;
10832
10833
self = pkgs.gnome3;
10833
10834
});
···
10835
10836
gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
10836
10837
callPackage = pkgs.newScope pkgs.gnome3_12;
10837
10838
});
10839
10839
+
10840
10840
+
gnome3 = gnome3_12;
10838
10841
10839
10842
gnome = recurseIntoAttrs gnome2;
10840
10843