Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5449e65b547
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7757dd115c4d
Choose a head ref
1 contributor

Commits on Oct 8, 2019

  1. epiphany: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    44beea9 View commit details

  2. gnome3.geary: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    99f1616 View commit details

  3. gnome3.accerciser: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    c390e86 View commit details

  4. gnome3.gnome-calendar: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    8f2f12e View commit details

  5. gnome3.gnome-control-center: 3.34.0.1 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    86dd9b7 View commit details

  6. gnome3.gnome-initial-setup: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    59f44d7 View commit details

  7. libdazzle: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    5ff8945 View commit details

  8. simple-scan: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    4c675e6 View commit details

  9. gnome3.totem: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    ee27c71 View commit details

  10. vino: disable broken updateScript 

    We're pulling in a custom src here, so gnome3.updateScript crashes.
    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    a22500d View commit details

  11. libsecret: use plain update policy

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    dcd2746 View commit details

  12. evolution-data-server: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    ae35a34 View commit details

  13. gnome3.evolution: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    51e612d View commit details

  14. gnome3.gdm: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    a1a8383 View commit details

  15. gnome3.gjs: 1.58.0 → 1.58.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    96e9af3 View commit details

  16. gnome3.gnome-calculator: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    c1ec32c View commit details

  17. gnome3.gnome-session: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    934a1ab View commit details

  18. gvfs: 1.42.0 → 1.42.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    04d5ccc View commit details

  19. gnome-builder: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    fedc363 View commit details

  20. gnome3.nautilus: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    bce4a8b View commit details

  21. gnome3.quadrapassel: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    2a6bacd View commit details

  22. gnome3.gnome-boxes: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    ca64e56 View commit details

  23. gnomeExtensions.dash-to-dock: 20190921 -> 67 

    Actual release for gnome 3.34
    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    3e3575d View commit details

  24. gnome3.gnome-software: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    502da33 View commit details

  25. gnome3.four-in-a-row: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    2d81086 View commit details

  26. gnome3.gnome-panel: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    a272186 View commit details

  27. gnome3.gnome-tetravex: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    1d62ae0 View commit details

  28. gnome3.gnome-taquin: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    4427ec8 View commit details

  29. gnome3.iagno: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    e3e250e View commit details

  30. gnome3.metacity: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    c32ab62 View commit details

  31. gnome3.dconf-editor: 3.34.1 → 3.34.2

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    30b3903 View commit details

  32. gnome3.eog: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    853fb6a View commit details

  33. evince: 3.34.0 → 3.34.1 

    - meson files are now distributed
    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    ab6b4c7 View commit details

  34. gnome3.gnome-desktop: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    b1f4570 View commit details

  35. gnome3.gnome-maps: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    810de2c View commit details

  36. gnome3.gnome-nibbles: 3.34.0 → 3.34.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    c039946 View commit details

  37. gnome3.gnome-terminal: 3.34.0 → 3.34.1 

    - fixes gio-unix include
    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    c909680 View commit details

  38. vte: 0.58.0 → 0.58.1

    @hedning
    hedning committed Oct 8, 2019
    Copy the full SHA
    6b8241b View commit details

  39. Merge pull request #70705 from hedning/gnome-3.34.1 

    Gnome 3.34.1
    @hedning
    hedning authored Oct 8, 2019
    Copy the full SHA
    7757dd1 View commit details
Showing with 83 additions and 118 deletions.
  1. +2 −2 pkgs/applications/editors/gnome-builder/default.nix
  2. +2 −2 pkgs/desktops/gnome-3/apps/accerciser/default.nix
  3. +2 −2 pkgs/desktops/gnome-3/apps/evolution/default.nix
  4. +2 −2 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
  5. +2 −2 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
  6. +2 −2 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  7. +2 −2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix
  8. +2 −2 pkgs/desktops/gnome-3/core/eog/default.nix
  9. +2 −2 pkgs/desktops/gnome-3/core/epiphany/default.nix
  10. +5 −10 pkgs/desktops/gnome-3/core/evince/default.nix
  11. +2 −2 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
  12. +2 −14 pkgs/desktops/gnome-3/core/gdm/default.nix
  13. +2 −2 pkgs/desktops/gnome-3/core/gjs/default.nix
  14. +2 −2 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
  15. +2 −2 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
  16. +2 −2 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  17. +2 −8 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
  18. +3 −14 pkgs/desktops/gnome-3/core/gnome-session/default.nix
  19. +2 −2 pkgs/desktops/gnome-3/core/gnome-software/default.nix
  20. +2 −4 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
  21. +2 −2 pkgs/desktops/gnome-3/core/nautilus/default.nix
  22. +2 −2 pkgs/desktops/gnome-3/core/simple-scan/default.nix
  23. +2 −2 pkgs/desktops/gnome-3/core/totem/default.nix
  24. +4 −4 pkgs/desktops/gnome-3/core/vino/default.nix
  25. +3 −4 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
  26. +2 −2 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
  27. +2 −2 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
  28. +2 −2 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
  29. +2 −2 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
  30. +2 −2 pkgs/desktops/gnome-3/games/iagno/default.nix
  31. +2 −2 pkgs/desktops/gnome-3/games/quadrapassel/default.nix
  32. +2 −2 pkgs/desktops/gnome-3/misc/geary/default.nix
  33. +2 −2 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
  34. +2 −2 pkgs/desktops/gnome-3/misc/metacity/default.nix
  35. +2 −2 pkgs/development/libraries/gvfs/default.nix
  36. +2 −2 pkgs/development/libraries/libdazzle/default.nix
  37. +2 −0 pkgs/development/libraries/libsecret/default.nix
  38. +2 −2 pkgs/development/libraries/vte/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/gnome-builder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,11 +39,11 @@

stdenv.mkDerivation rec {
pname = "gnome-builder";
version = "3.34.0";
version = "3.34.1";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/accerciser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@

python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
version = "3.34.0";
version = "3.34.1";

format = "other";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/evolution/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,11 +43,11 @@

stdenv.mkDerivation rec {
pname = "evolution";
version = "3.34.0";
version = "3.34.1";

src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r";
sha256 = "0hmxz3b9paqlpfjpqn379a8c01z3gb8lz0jgxxpgn6iygzfr4sk5";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,14 @@
}:

let
version = "3.34.0";
version = "3.34.1";
in stdenv.mkDerivation rec {
pname = "gnome-boxes";
inherit version;

src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd";
sha256 = "1758k5b79kyywdg67b4byqhva9045i13lzg5r62my950c4c2p0pc";
};

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "gnome-calendar";
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 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b";
sha256 = "1qlh7vx5v4mys3rhpaczngpg0zp8apachnz2j9h3ab7ywcippm7y";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

let
pname = "gnome-maps";
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 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr";
sha256 = "03nswj60lqznr2j3ld2lgjzr4j9x2gblqx2ip4l2yxnm9kgbm14s";
};

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

let
pname = "dconf-editor";
version = "3.34.1";
version = "3.34.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/eog/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "eog";
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 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594";
sha256 = "0b7ld4azs9xbdjsk9b91ywhdzvxgajhndiwiivxjzbr0hjgp7c7x";
};

nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,11 +34,11 @@

stdenv.mkDerivation rec {
pname = "epiphany";
version = "3.34.0";
version = "3.34.1";

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

# Tests need an X display
15 changes: 5 additions & 10 deletions pkgs/desktops/gnome-3/core/evince/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv
, fetchFromGitLab
, fetchurl
, meson
, ninja
, pkgconfig
@@ -43,18 +43,13 @@

stdenv.mkDerivation rec {
pname = "evince";
version = "3.34.0";
version = "3.34.1";

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

# meson.build not distributed
# See: https://gitlab.gnome.org/GNOME/evince/issues/1270
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr";
src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45";
};

postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "evolution-data-server";
version = "3.34.0";
version = "3.34.1";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv";
sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg";
};

patches = [
16 changes: 2 additions & 14 deletions pkgs/desktops/gnome-3/core/gdm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,11 +19,11 @@ in

stdenv.mkDerivation rec {
pname = "gdm";
version = "3.34.0";
version = "3.34.1";

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

# Only needed to make it build
@@ -51,18 +51,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

patches = [
# See: https://gitlab.gnome.org/GNOME/gdm/issues/515
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/commit/0e05e2fd3c2a3b28ed4db0e51e4646aa6af67a5f.patch";
sha256 = "10kbjn0kis0xf95dfzq4w6xazyfbcz8yj9lrixg5jb3srrnp0hhf";
})

# https://gitlab.gnome.org/GNOME/gdm/merge_requests/84
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gdm/commit/2136c3baab81b6ec2115180f67ada91727e948f7.patch";
sha256 = "1ispxh4p6hdh3bx9x86497gzlwpgj32x2ymmv60wafg76vmrlcc2";
})

# Change hardcoded paths to nix store paths.
(substituteAll {
src = ./fix-paths.patch;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gjs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "gjs";
version = "1.58.0";
version = "1.58.1";

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

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "gnome-calculator";
version = "3.34.0";
version = "3.34.1";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
@@ -67,11 +67,11 @@

stdenv.mkDerivation rec {
pname = "gnome-control-center";
version = "3.34.0.1";
version = "3.34.1";

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

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "gnome-desktop";
version = "3.34.0";
version = "3.34.1";

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

src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd";
sha256 = "0nnwc837k244gjsmx8wff5sfvm8xnhm8xr39qxk73lnscrbfpny1";
};

nativeBuildInputs = [
10 changes: 2 additions & 8 deletions pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
, fetchpatch
, substituteAll
, gettext
, meson
@@ -37,11 +36,11 @@

stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "3.34.0";
version = "3.34.1";

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

nativeBuildInputs = [
@@ -78,11 +77,6 @@ stdenv.mkDerivation rec {
];

patches = [
# Disable g-i-s service in GDM
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-initial-setup/commit/b67b5cc48c418415eb3233f78ab089bc447b1952.patch";
sha256 = "050zc6cnil71bf7ijav6w6bkr33lqwglipcg7anw9jcn7mcakhlq";
})
(substituteAll {
src = ./fix-paths.patch;
inherit tzdata libgnomekbd;
17 changes: 3 additions & 14 deletions pkgs/desktops/gnome-3/core/gnome-session/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }:
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }:

stdenv.mkDerivation rec {
pname = "gnome-session";
version = "3.34.0";
version = "3.34.1";

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

patches = [
# Fix debug spam when using systemd session
# https://gitlab.gnome.org/GNOME/gnome-session/issues/31
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/adfdf7f64f08fc07325f9332e9eba46974cc30ee.patch";
sha256 = "0vjg77gpj3k63a5ffhsvv5m30lbj6cab35lhl4gpqxg4j2j3yy7y";
})
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-session/commit/b7b24627485c520f873db4e918e217a76ededd8c.patch";
sha256 = "1d8pw8q423wvv0cd32p0yf52vlfj7w1if2gljqvarcm2n1m0pdxj";
})

(substituteAll {
src = ./fix-paths.patch;
gsettings = "${glib.bin}/bin/gsettings";
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/gnome-software/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ in

stdenv.mkDerivation rec {
pname = "gnome-software";
version = "3.34.0";
version = "3.34.1";

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

patches = [
6 changes: 2 additions & 4 deletions pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "gnome-terminal";
version = "3.34.0";
version = "3.34.1";

src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5";
sha256 = "06fqgyfzjqj5k3cr9ig6xa85ml7ifgwfj4gi9z5f0pyc62lwvzlg";
};

buildInputs = [
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
hicolor-icon-theme # for setup-hook
];

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

# Silly ./configure, it looks for dbus file from gnome-shell in the
# installation tree of the package it is configuring.
postPatch = ''
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/core/nautilus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,11 +32,11 @@

stdenv.mkDerivation rec {
pname = "nautilus";
version = "3.34.0";
version = "3.34.1";

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

nativeBuildInputs = [
Loading