Skip to content

Commit

Permalink
Merge pull request #93114 from NixOS/gnome-20.03
Browse files Browse the repository at this point in the history 
[20.03] Gnome 3.34 updates (the sequel)
  • Loading branch information
@worldofpeace
worldofpeace committed Jul 16, 2020
2 parents 3e24c3e + e78b7aa commit 619d8c0
Show file tree
Hide file tree
Showing 47 changed files with 111 additions and 259 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/gnome-photos/default.nix
View file
Expand Up @@ -35,13 +35,13 @@

stdenv.mkDerivation rec {
pname = "gnome-photos";
version = "3.34.1";
version = "3.34.2";

outputs = [ "out" "installedTests" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp";
sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/shotwell/default.nix
View file
Expand Up @@ -39,11 +39,11 @@

stdenv.mkDerivation rec {
pname = "shotwell";
version = "0.31.0";
version = "0.31.2";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx";
sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/data/documentation/gnome-user-docs/default.nix
View file
Expand Up @@ -9,11 +9,11 @@

stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "3.34.1";
version = "3.34.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2";
sha256 = "1r5ilrvnrmclvzxv3abzd9x2m0akcfv74sby8jzq8m7nn87yal7w";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/accerciser/default.nix
View file
Expand Up @@ -17,13 +17,13 @@

python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
version = "3.34.4";
version = "3.34.6";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1";
sha256 = "0l12893cvrrlx2ldhjsdrc8abjfhzr3h2nllypn0g37nyrvq6b0d";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/file-roller/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "file-roller";
version = "3.32.4";
version = "3.32.5";

src = fetchurl {
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv";
sha256 = "0xj1wmh5k2dyi3mjqfpljmv8fvjmlnl722smgs5iaqaznjs30gfm";
};

LANG = "en_US.UTF-8"; # postinstall.py
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
View file
Expand Up @@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "gnome-getting-started-docs";
version = "3.34.1";
version = "3.34.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00in6yc02pdalyx8g0fncmch0l7nr819587ngjm83ara9qa8z6fa";
sha256 = "0m38ias77y9ks2y2ssn2fvgr9i8zfkrc5nv3lv617444x5iycz3w";
};

passthru = {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View file
Expand Up @@ -29,13 +29,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "3.34.4";
version = "3.34.6";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6";
sha256 = "1ilpz4qqhf6labwxs2f7cbdszkfckkr9bh2x6syfgb8qw8dccglm";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "gnome-weather";
version = "3.34.0";
version = "3.34.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4";
sha256 = "1n7kz5ac77gpp3f2h7062nkb760srybfyrvsn8qbzcxhghbl7bgh";
};

nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/baobab/default.nix
View file
Expand Up @@ -4,13 +4,13 @@

let
pname = "baobab";
version = "3.34.0";
version = "3.34.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6";
sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z";
};

nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
View file
Expand Up @@ -6,14 +6,14 @@ let
pname = "gnome-bluetooth";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.34.0";
version = "3.34.1";

# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8";
sha256 = "11nk8nvz5yrbx7wp75vsiaf4rniv7ik2g3nwmgwx2b42q9v11j9y";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Expand Up @@ -68,11 +68,11 @@

stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "3.34.4";
version = "3.34.6";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
sha256 = "05r2mzs36za7c3vyswj39ny2yzhkiw6whxhl4mrdl01f1dc83zzw";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file
Expand Up @@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.34.4";
version = "3.34.7";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
sha256 = "155yzxzf2b1jxg8gy2vzv09g2hbfn03m8gd53d3v4v9irjlpar8q";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View file
Expand Up @@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "gnome-disk-utility";
version = "3.34.4";
version = "3.34.5";

src = fetchurl {
url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y";
sha256 = "0smh3lsz70fciwaavxcjqacr18crz2923fv1dzsvf8rrajp0dxj4";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View file
Expand Up @@ -36,11 +36,11 @@

stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.34.3";
version = "3.34.6";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dc87mcvr7vdhfx4q0c44q37lf7ls2qvnc34dm66802qssrcxy9k";
sha256 = "0ky4h667dvw3rczxlzsyhd9p81w4dwfsc8lm4mkp0klpxfd764yl";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View file
Expand Up @@ -15,11 +15,11 @@ let

in stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "3.34.4";
version = "3.34.5";

src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779";
sha256 = "0l3mdn7g2c22mdhrqkxvvc1pk2w0v32f2v4a6n1phvaalwcg75nj";
};

LANG = "en_US.UTF-8";
Expand Down
10 changes: 2 additions & 8 deletions pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Expand Up @@ -42,13 +42,13 @@

stdenv.mkDerivation rec {
pname = "mutter";
version = "3.34.5";
version = "3.34.6";

outputs = [ "out" "dev" "man" ];

src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi";
sha256 = "09imi2ain2v6s46cjx6yq7wymwazpcaqkv0whdc1765q6dyyig93";
};

mesonFlags = [
Expand Down Expand Up @@ -111,12 +111,6 @@ stdenv.mkDerivation rec {
sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
})

# gnome-3-34 2020-04-24
(fetchpatch {
url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch";
sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi";
})

# Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
# from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
./drop-inheritable.patch
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/nautilus/default.nix
View file
Expand Up @@ -32,11 +32,11 @@

stdenv.mkDerivation rec {
pname = "nautilus";
version = "3.34.2";
version = "3.34.3";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv";
sha256 = "0vdk3mw32j81n57m006rbgjhsy57q86cgxbblrx4m8zkjjvq9n82";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/rygel/default.nix
View file
Expand Up @@ -28,14 +28,14 @@

stdenv.mkDerivation rec {
pname = "rygel";
version = "0.38.3";
version = "0.38.4";

# TODO: split out lib
outputs = [ "out" "dev" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8";
sha256 = "0rm1m1z8rcvyj9873wqcz5i3qdg8j6gv6k1p01xifk0y9phg7rzc";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/simple-scan/default.nix
View file
Expand Up @@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "simple-scan";
version = "3.34.4";
version = "3.34.7";

src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z";
sha256 = "0j9946db3g4jksmg6mhf87g75053wx3ip8i3ayvnq7viwckkcngi";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/five-or-more/default.nix
View file
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
pname = "five-or-more";
version = "3.32.0";
version = "3.32.2";

src = fetchurl {
url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
View file
Expand Up @@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "gnome-nibbles";
version = "3.34.2";
version = "3.34.3";

src = fetchurl {
url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0sl54ns1b5cff6vrls6716xb73krgd1sp36k94gc2lza5laixyh0";
sha256 = "1rh4c39gbgr2m5gfmfphymmjipywh1pcxr648lgkddfbbp3r4g7a";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/games/iagno/default.nix
View file
Expand Up @@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "iagno";
version = "3.34.5";
version = "3.34.8";

src = fetchurl {
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m";
sha256 = "1kbh9cnsm7x788dd59zga06bq4343ks2jiyxyc15k64n2ririfnh";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/clutter/default.nix
View file
Expand Up @@ -5,14 +5,14 @@

let
pname = "clutter";
version = "1.26.2";
version = "1.26.4";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b";
};

outputs = [ "out" "dev" ];
Expand Down
10 changes: 2 additions & 8 deletions pkgs/development/libraries/cogl/default.nix
View file
Expand Up @@ -7,11 +7,11 @@ let
pname = "cogl";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.22.4";
version = "1.22.8";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj";
sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
};

patches = [
Expand All @@ -29,12 +29,6 @@ in stdenv.mkDerivation rec {
url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
})

# Fix build with libglvnd headers (these headers used to be provided by mesa)
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
})
];

outputs = [ "out" "dev" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/geocode-glib/default.nix
View file
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "geocode-glib";
version = "3.26.1";
version = "3.26.2";

outputs = [ "out" "dev" "devdoc" "installedTests" ];

src = fetchurl {
url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv";
sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
Expand Down

0 comments on commit 619d8c0

Please sign in to comment.