From 0c79a57062a5152198c3ccc720b6c704c28b9ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:43:58 +0000 Subject: [PATCH 001/197] =?UTF-8?q?at-spi2-atk:=202.32.0=20=E2=86=92=202.3?= =?UTF-8?q?4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/at-spi2-atk/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index a805949bf119c..4af9c9ce32b6a 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -10,23 +10,20 @@ , dbus , glib , libxml2 -, fixDarwinDylibNames , gnome3 # To pass updateScript }: stdenv.mkDerivation rec { pname = "at-spi2-atk"; - version = "2.32.0"; + version = "2.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"; + sha256 = "00250s72ii8w6lb6ww61v49y9k4cswfj0hhawqlram7bl6b7x6is"; }; - nativeBuildInputs = [ meson ninja pkgconfig ] - # Fixup rpaths because of meson, remove with meson-0.47 - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; doCheck = false; # fails with "No test data file provided" @@ -40,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; - license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2 + license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; }; From ec16cb4276a2ce2b10fe91b61a6287204b010b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:43:57 +0000 Subject: [PATCH 002/197] =?UTF-8?q?at-spi2-core:=202.32.1=20=E2=86=92=202.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/at-spi2-core/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e7cea235ceb4e..bda809b1a5a91 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -13,25 +13,22 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi -, fixDarwinDylibNames , gnome3 # To pass updateScript }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.32.1"; + version = "2.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"; + sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ] - # Fixup rpaths because of meson, remove with meson-0.47 - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ]; buildInputs = [ dbus glib libX11 libXtst libXi ]; doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" @@ -58,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; - license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2 + license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; }; From 0e341a35e508515b98e59718f7ec5c71b0a692b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 17:33:50 +0000 Subject: [PATCH 003/197] =?UTF-8?q?atk:=202.32.0=20=E2=86=92=202.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix .pc file requires gobject: https://gitlab.gnome.org/GNOME/atk/merge_requests/30 --- pkgs/development/libraries/atk/default.nix | 10 ++++++++-- pkgs/development/libraries/atk/fix_pc.patch | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/atk/fix_pc.patch diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 0a076442b42c2..9e80d4fc6ca67 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.32.0"; + version = "2.34.1"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"; + sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"; }; outputs = [ "out" "dev" ]; @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { glib ]; + patches = [ + # meson builds an incorrect .pc file + # glib should be Requires not Requires.private + ./fix_pc.patch + ]; + doCheck = true; passthru = { diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch new file mode 100644 index 0000000000000..3d19d9862cbdf --- /dev/null +++ b/pkgs/development/libraries/atk/fix_pc.patch @@ -0,0 +1,9 @@ +--- a/atk/meson.build ++++ b/atk/meson.build +@@ -162,5 +162,6 @@ pkgconfig.generate(libatk, + name: 'Atk', + description: 'Accessibility Toolkit', + subdirs: atk_api_name, ++ requires: glib_dep, + filebase: 'atk', + ) From 0a826ed11629f397013414f65605e5e880b19228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 19:33:30 +0000 Subject: [PATCH 004/197] =?UTF-8?q?baobab:=203.32.0=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 4734a0e96b8ce..5817d8ff942a0 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r"; + sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; From 8c5486aa82002ccd386fd124d37fed5ffbe2d268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 11 Sep 2019 08:14:50 +0200 Subject: [PATCH 005/197] dee: fix build with glib-2.62 --- pkgs/development/libraries/dee/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 093cc2bdf058e..1318d9453b3e4 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { dbus-glib ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + configureFlags = [ "--disable-gtk-doc" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" From 91fed91d8b6fccbcd041b024e61c0806e9618237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:03 +0000 Subject: [PATCH 006/197] =?UTF-8?q?evolution-data-server:=203.32.4=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 0048b02581a77..63e1ec9ae291a 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.32.4"; + version = "3.34.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; + sha256 = "1kw6wkrr33bxv95z06dr31qvmp7c7x88xkw27k3fq0df4jlb17gv"; }; patches = [ From a1eda8138190e081e8a4fd6c1d269df641d02cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:03 +0000 Subject: [PATCH 007/197] =?UTF-8?q?folks:=200.12.1=20=E2=86=92=200.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 84ab5fedebcd2..38e4d2c6884a0 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.12.1"; + version = "0.13.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xfl6rnzhdbmw1q26xiq34cdiy7a9karpi2r7wyplnnz1zaz5a9w"; + sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x"; }; mesonFlags = [ From 343dec46362df3d542d6d3765d010d61f9a03201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:05 +0000 Subject: [PATCH 008/197] =?UTF-8?q?gcr:=203.28.1=20=E2=86=92=203.33.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gcr/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index dcb4df1419ecb..18b568b0f6c6c 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib , libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk , gobject-introspection, makeWrapper, libxslt, vala, gnome3 -, python2 }: +, python3 }: stdenv.mkDerivation rec { pname = "gcr"; - version = "3.28.1"; + version = "3.33.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m"; + sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm"; }; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool gobject-introspection libxslt makeWrapper vala ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ]; buildInputs = let gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gtk3 p11-kit ]; - checkInputs = [ python2 ]; + checkInputs = [ python3 ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon #enableParallelBuilding = true; issues on hydra From 9baa018e2370dbd71e4dafc9d1393b9b0bb17fcb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 20:36:20 -0400 Subject: [PATCH 009/197] =?UTF-8?q?gdk-pixbuf:=202.38.1=20=E2=86=92=202.38?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 59e7808057f48..86d89d6eef51b 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -4,13 +4,13 @@ let pname = "gdk-pixbuf"; - version = "2.38.1"; + version = "2.38.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"; + sha256 = "10875lywkabh6nm2rgf0vxqn39h34b72kcbh63fp77fqq0g6bykk"; }; patches = [ From a3ef0bfeb87227bb3632488c1277edc0310c77f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 8 Sep 2019 18:17:22 +0000 Subject: [PATCH 010/197] =?UTF-8?q?gdl:=203.28.0=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index 45a29e15ede8d..c4baaa3fae981 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdl"; - version = "3.28.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; + sha256 = "00ldva6wg6s4wlxmisiqzyz8ihsprra7sninx2rlqk6frpq312w5"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 1644d1cd678ff2afd49f7c279489543560de8d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:26:58 +0000 Subject: [PATCH 011/197] =?UTF-8?q?glib-networking:=202.60.3=20=E2=86=92?= =?UTF-8?q?=202.62.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index ae386f46bffc8..ad3b77c1bc67a 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.60.3"; + version = "2.62.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm"; + sha256 = "1p7vgav0g03r00qiafhrdiad2gh1w6wsd1a7nnn79psng5gnh8ck"; }; patches = [ From 1e3e7822a64fefb5ef98878047025efa6ae34b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 17:53:03 +0200 Subject: [PATCH 012/197] glib: 2.60.7 -> 2.62.0 Co-authored-by: Jan Tojnar --- pkgs/development/libraries/glib/default.nix | 57 ++++--- .../libraries/glib/split-dev-programs.patch | 154 ++++++++++++++++++ 2 files changed, 190 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/libraries/glib/split-dev-programs.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index de7505e6cde1f..204aa03e06fff 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -44,17 +44,15 @@ let done ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - - binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; in stdenv.mkDerivation rec { pname = "glib"; - version = "2.60.7"; + version = "2.62.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0433m0na8nc4cf0gidf4gfzz8k5d3dsssmh541qkpzcsaspw04lb"; + sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -66,10 +64,33 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch + + # GLib contains many binaries used for different purposes; + # we will install them to different outputs: + # 1. Tools for desktop environment ($bin) + # * gapplication (non-darwin) + # * gdbus + # * gio + # * gio-launch-desktop (symlink to $out) + # * gsettings + # 2. Development/build tools ($dev) + # * gdbus-codegen + # * gio-querymodules + # * glib-compile-resources + # * glib-compile-schemas + # * glib-genmarshal + # * glib-gettextize + # * glib-mkenums + # * gobject-query + # * gresource + # * gtester + # * gtester-report + # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) + # * gio-launch-desktop + ./split-dev-programs.patch ]; outputs = [ "bin" "out" "dev" "devdoc" ]; - outputBin = "dev"; setupHook = ./setup-hook.sh; @@ -84,7 +105,7 @@ stdenv.mkDerivation rec { ]); nativeBuildInputs = [ - meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales + meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -94,10 +115,9 @@ stdenv.mkDerivation rec { # Instead we just copy them over from the native output. "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" "-Dnls=enabled" + "-Ddevbindir=${placeholder ''dev''}/bin" ]; - LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = [ "-Wno-error=nonnull" # Default for release buildtype but passed manually because @@ -111,6 +131,8 @@ stdenv.mkDerivation rec { chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py + chmod +x docs/reference/gio/concat-files-helper.py + patchShebangs docs/reference/gio/concat-files-helper.py patchShebangs glib/gen-unicode-tables.pl patchShebangs tests/gen-casefold-txt.py patchShebangs tests/gen-casemap-txt.py @@ -122,18 +144,6 @@ stdenv.mkDerivation rec { DETERMINISTIC_BUILD = 1; postInstall = '' - mkdir -p $bin/bin - for app in ${concatStringsSep " " binPrograms}; do - mv "$dev/bin/$app" "$bin/bin" - done - - '' + optionalString (!stdenv.isDarwin) '' - # Add gio-launch-desktop to $out so we can refer to it from $dev - mkdir $out/bin - mv "$dev/bin/gio-launch-desktop" "$out/bin/" - ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" - - '' + '' moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" @@ -141,6 +151,11 @@ stdenv.mkDerivation rec { # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c + '' + optionalString (!stdenv.isDarwin) '' + # Add gio-launch-desktop to $out so we can refer to it from $lib + mkdir $out/bin + mv "$bin/bin/gio-launch-desktop" "$out/bin/" + ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc ''; diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch new file mode 100644 index 0000000000000..9d3989a30a546 --- /dev/null +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -0,0 +1,154 @@ +diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build +index 121e9e6bb..b76fa0188 100644 +--- a/gio/gdbus-2.0/codegen/meson.build ++++ b/gio/gdbus-2.0/codegen/meson.build +@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) + # Install gdbus-codegen executable + gdbus_codegen = configure_file(input : 'gdbus-codegen.in', + output : 'gdbus-codegen', +- install_dir : get_option('bindir'), ++ install_dir : get_option('devbindir'), + configuration : gdbus_codegen_conf + ) + # Provide tools for others when we're a subproject and they use the Meson GNOME module +diff --git a/gio/meson.build b/gio/meson.build +index 9a9e621b3..12e1d146a 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -830,14 +830,15 @@ pkg.generate(libgio, + variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), + 'schemasdir=' + join_paths('${datadir}', schemas_subdir), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), ++ 'devbindir=' + get_option('devbindir'), + 'giomoduledir=' + giomodulesdir, + 'gio=' + join_paths('${bindir}', 'gio'), +- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), +- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), ++ 'gio_querymodules=' + join_paths('${devbindir}', 'gio-querymodules'), ++ 'glib_compile_schemas=' + join_paths('${devbindir}', 'glib-compile-schemas'), ++ 'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'), + 'gdbus=' + join_paths('${bindir}', 'gdbus'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), +- 'gresource=' + join_paths('${bindir}', 'gresource'), ++ 'gdbus_codegen=' + join_paths('${devbindir}', 'gdbus-codegen'), ++ 'gresource=' + join_paths('${devbindir}', 'gresource'), + 'gsettings=' + join_paths('${bindir}', 'gsettings')], + version : glib_version, + install_dir : glib_pkgconfigreldir, +@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources, + + executable('gresource', 'gresource-tool.c', + install : true, ++ install_dir : get_option('devbindir'), + # intl.lib is not compatible with SAFESEH + link_args : noseh_link_args, + dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) + + gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', + install : true, ++ install_dir : get_option('devbindir'), + c_args : gio_c_args, + # intl.lib is not compatible with SAFESEH + link_args : noseh_link_args, +@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu + glib_compile_schemas = executable('glib-compile-schemas', + [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'], + install : true, ++ install_dir : get_option('devbindir'), + # intl.lib is not compatible with SAFESEH + link_args : noseh_link_args, + dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) +@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas', + glib_compile_resources = executable('glib-compile-resources', + [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'], + install : true, ++ install_dir : get_option('devbindir'), + c_args : gio_c_args, + # intl.lib is not compatible with SAFESEH + link_args : noseh_link_args, +diff --git a/glib/meson.build b/glib/meson.build +index 91a48f194..80472a06b 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -375,9 +375,10 @@ pkg.generate(libglib, + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], ++ 'devbindir=' + get_option('devbindir'), ++ 'glib_genmarshal=' + join_paths('${devbindir}', 'glib-genmarshal'), ++ 'gobject_query=' + join_paths('${devbindir}', 'gobject-query'), ++ 'glib_mkenums=' + join_paths('${devbindir}', 'glib-mkenums')], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'glib-2.0', +@@ -413,6 +414,7 @@ if host_system == 'windows' + else + gtester = executable('gtester', 'gtester.c', + install : true, ++ install_dir : get_option('devbindir'), + c_args : ['-UG_DISABLE_ASSERT'], + include_directories : configinc, + dependencies : [libglib_dep]) +@@ -424,7 +426,7 @@ report_conf.set('PYTHON', python_name) + configure_file( + input: 'gtester-report.in', + output: 'gtester-report', +- install_dir: get_option('bindir'), ++ install_dir: get_option('devbindir'), + configuration: report_conf, + install_mode: 'rwxr-xr-x' + ) +diff --git a/gobject/meson.build b/gobject/meson.build +index c7805c556..22ec629a4 100644 +--- a/gobject/meson.build ++++ b/gobject/meson.build +@@ -75,7 +75,7 @@ foreach tool: python_tools + input : tool + '.in', + output : tool, + configuration : python_tools_conf, +- install_dir : glib_bindir, ++ install_dir : get_option('devbindir'), + ) + + # Set variables for later use +@@ -145,6 +145,7 @@ libgobject_dep = declare_dependency(link_with : libgobject, + + executable('gobject-query', 'gobject-query.c', + install : true, ++ install_dir : get_option('devbindir'), + dependencies : [libglib_dep, libgobject_dep]) + + install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) +diff --git a/meson.build b/meson.build +index 717d1bccb..fb0bee8a1 100644 +--- a/meson.build ++++ b/meson.build +@@ -2118,7 +2118,7 @@ if have_sh + gettextize_conf.set('datarootdir', glib_datadir) + gettextize_conf.set('datadir', glib_datadir) + configure_file(input : 'glib-gettextize.in', +- install_dir : glib_bindir, ++ install_dir : get_option('devbindir'), + output : 'glib-gettextize', + configuration : gettextize_conf) + endif +diff --git a/meson_options.txt b/meson_options.txt +index 2c831e37e..5d8928577 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,6 +3,11 @@ option('runtime_libdir', + value : '', + description : 'install runtime libraries relative to libdir') + ++option('devbindir', ++ type : 'string', ++ value : '', ++ description : 'bindir for development tools') ++ + option('iconv', + type : 'combo', + choices : ['auto', 'libc', 'external'], From 5a5f149e1054a26b05c43ae23f35499e358af7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:11 +0000 Subject: [PATCH 013/197] =?UTF-8?q?gnome-builder:=203.32.4=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add pcre2 * don't override stdenv Co-authored-by: worldofpeace --- .../editors/gnome-builder/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 740d65838c3f2..a14487642452c 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,4 +1,4 @@ -{ gcc8Stdenv +{ stdenv , ctags , appstream-glib , desktop-file-utils @@ -23,6 +23,7 @@ , ninja , ostree , pcre +, pcre2 , pkgconfig , python3 , sysprof @@ -33,20 +34,16 @@ , wrapGAppsHook , dbus , xvfb_run +, glib }: -let - # Does not build with GCC 7 - # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868 - stdenv = gcc8Stdenv; -in stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.32.4"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; + sha256 = "19i2ipgw48fpd50wacwyhj35hajlg7qcyxpj8rsqk4g21ijfykrg"; }; nativeBuildInputs = [ @@ -82,6 +79,7 @@ stdenv.mkDerivation rec { libxml2 ostree pcre + pcre2 python3 sysprof template-glib @@ -100,6 +98,8 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" From 506c899d4475390f86ed5cc64130a966e32f8521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:10 +0000 Subject: [PATCH 014/197] =?UTF-8?q?gnome-photos:=203.32.1=20=E2=86=92=203.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/gnome-photos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index ea4cf986f3997..0eb4f21e53cad 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.32.1"; + version = "3.34.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn"; + sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m"; }; patches = [ From 42b796ae8d8f64ec6d8480e950a4cb5c94403d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:12 +0000 Subject: [PATCH 015/197] =?UTF-8?q?gnome-usage:=203.32.0=20=E2=86=92=203.3?= =?UTF-8?q?3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gnome-usage/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index eecf9bbd88f77..7484998ab2053 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -13,15 +13,16 @@ , libgtop , libdazzle , gnome3 +, tracker }: stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.32.0"; + version = "3.33.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih"; + sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4"; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { gtk3 libdazzle libgtop + tracker ]; postPatch = '' From 78e19b6b0d7c27c5ab540a24cd7763a28d0158e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:16 +0000 Subject: [PATCH 016/197] =?UTF-8?q?gnome3.accerciser:=203.32.3=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 9a70319952cfc..a2556492bb6a6 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.32.3"; + version = "3.34.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ark4qkfvdggz2mbksq12iq55izdsjnkjqkvfnnkf4k5vfpa95y5"; + sha256 = "1npl1pxqrij9dsmp70ralcfbjbw503jsz2pqm3qjwyba5cf6kcbm"; }; nativeBuildInputs = [ From da0935c299da035abe4baeffdfc05553f3707e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 6 Sep 2019 13:35:07 +0000 Subject: [PATCH 017/197] =?UTF-8?q?gnome3.adwaita-icon-theme:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index a7f4a637b1785..d2f161f23b4f9 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; + sha256 = "0zvwikj3a07i3g3rir4cc63b14822lrzzgprs1j2nmb3h8gykds0"; }; # For convenience, we can specify adwaita-icon-theme only in packages From f2c3ced2abb26c8caeed4fa6e240ad657bb86547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 10 Sep 2019 02:30:32 +0000 Subject: [PATCH 018/197] =?UTF-8?q?gnome3.aisleriot:=203.22.8=20=E2=86=92?= =?UTF-8?q?=203.22.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 3e274c35cdd99..474c49fb58411 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.8"; + version = "3.22.9"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"; + sha256 = "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji"; }; configureFlags = [ From dc9098bf91261b76df18b6792657880bf47bdc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 18:05:43 +0000 Subject: [PATCH 019/197] =?UTF-8?q?gnome3.anjuta:=203.28.0=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 573259b7e7d09..4df3ed10a6934 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "anjuta"; - version = "3.28.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; + sha256 = "13ql7axw6zz387s7pa1m7wmh7qps3x7fk53h9832vq1yxlq33aa2"; }; passthru = { From 28c62559b7dafb6fef56a66101d3d19bf96a8d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:26:23 +0000 Subject: [PATCH 020/197] =?UTF-8?q?gnome3.atomix:=203.32.1=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/atomix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index c9395166c521d..ec9895b3bf556 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -3,13 +3,13 @@ let pname = "atomix"; - version = "3.32.1"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19wpm7mn6r7x6jz1r0kkqg3xa69iycvgb7g7i8wi0d3cx0rsgjkl"; + sha256 = "0h909a4mccf160hi0aimyicqhq2b0gk1dmqp7qwf87qghfrw6m00"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ]; From 7a414f8e0b4278455a439f51c1e3146f05f348a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:19 +0000 Subject: [PATCH 021/197] =?UTF-8?q?gnome3.cheese:=203.32.1=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/cheese/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index b18e58f6f56ff..b3bb1e1093c9c 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,39 +1,41 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 +{ stdenv, gettext, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra-gtk3 , pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib +, libgudev, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib , libxslt, yelp-tools, gnome-common, gtk-doc -, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }: +, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 +, meson, ninja, dbus, python3 }: stdenv.mkDerivation rec { pname = "cheese"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; + sha256 = "0wvyc9wb0avrprvm529m42y5fkv3lirdphqydc9jw0c8mh05d1ni"; }; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; }; nativeBuildInputs = [ - pkgconfig intltool itstool vala wrapGAppsHook libxml2 appstream-glib + meson ninja pkgconfig gettext itstool vala wrapGAppsHook libxml2 appstream-glib libxslt docbook_xml_dtd_43 docbook_xsl - autoreconfHook gtk-doc yelp-tools gnome-common + gtk-doc yelp-tools gnome-common python3 ]; buildInputs = [ gtk3 glib gnome-video-effects gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop gst_all_1.gst-plugins-bad clutter-gtk clutter-gst - libcanberra-gtk3 libgudev ]; + libcanberra-gtk3 libgudev dbus ]; outputs = [ "out" "man" "devdoc" ]; - patches = [ - gtk-doc.respect_xml_catalog_files_var_patch - ]; - preFixup = '' gappsWrapperArgs+=( # Effects From 4a25ab2d51b51fb78462c5e7a99af730c7b82095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:21 +0000 Subject: [PATCH 022/197] =?UTF-8?q?gnome3.dconf-editor:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 7f4f84fa5fe14..4f7b64ca065a7 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.32.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 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi"; + sha256 = "0dgkgzrk4q8753j3lvz4ykyfs7pv1fvdmi516ryv3q20k24kxb9j"; }; nativeBuildInputs = [ From ff8958a8bbff4fcafa36c347dd76bb94aec780b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:44:46 +0200 Subject: [PATCH 023/197] gnome3.dconf: 0.32.0 -> 0.34.0 --- pkgs/desktops/gnome-3/core/dconf/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix index 43f8dd08dbffe..7ce498da9f30c 100644 --- a/pkgs/desktops/gnome-3/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf/default.nix @@ -6,20 +6,14 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.32.0"; + version = "0.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38"; + sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll"; }; patches = [ - # Fix the build on Darwin - # Issue: https://gitlab.gnome.org/GNOME/dconf/issues/47 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf/commit/49f4d916e1151af3975df52c522c69de98ed2fbb.patch"; - sha256 = "00klkr1jzli9ap0aj6399m1bj2bxxz48pmcj4r16dsy6dfdl6325"; - }) ]; postPatch = '' From 55c95460bf068cc5e92144185da568adf0ca3327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 18:05:49 +0000 Subject: [PATCH 024/197] =?UTF-8?q?gnome3.devhelp:=203.32.0=20=E2=86=92=20?= =?UTF-8?q?3.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 23a58011e0276..8d731d829b217 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; + sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; From a2febc6166f05dd2af972c9a910c6bf030938596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:21 +0000 Subject: [PATCH 025/197] =?UTF-8?q?gnome3.eog:=203.32.2=20=E2=86=92=203.34?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 8bb727a6fc536..fa4de8583da77 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.32.2"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy"; + sha256 = "1vjrlgc82ij8ijkgc1ssssig4bp23nd6a31wx44m7k1pwy64z594"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; From 484cc3737c3d601d58998b6501301981e364a646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:28 +0000 Subject: [PATCH 026/197] =?UTF-8?q?gnome3.evolution:=203.32.4=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 2061fc26607e8..71bec86038482 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -10,7 +10,7 @@ , gtk3 , glib , libnotify -, gtkspell3 +, gspell , evolution-data-server , adwaita-icon-theme , gnome-desktop @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.32.4"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00hmmg4hfns8rq9rcilmy0gi1xkksld27lfbd9zmw2xw37wjmbqh"; + sha256 = "136jim297ac7ig0ax7ll6x4dc3vhd7l5prh3fvb4mmskv5klbl6r"; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gstreamer gtk3 - gtkspell3 + gspell highlight icu libcanberra-gtk3 From 968127565e9e17d7676b9c641993aaf17b54ed18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 19:33:39 +0000 Subject: [PATCH 027/197] =?UTF-8?q?gnome3.file-roller:=203.32.1=20?= =?UTF-8?q?=E2=86=92=203.32.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 267a7f2f7d203..36b89a3105228 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; + sha256 = "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6"; }; LANG = "en_US.UTF-8"; # postinstall.py From 7642faec42e363ac96a036340f3b2df1cd7467e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:25 +0000 Subject: [PATCH 028/197] =?UTF-8?q?gnome3.four-in-a-row:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 5b233c48385d6..356df76a0610d 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala +, gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; + sha256 = "1wf0545lhmqf2hfi7wc8bqs7b9g43rm0df0ssza6517xzc4lx7jl"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py From 0e598c206db1acd4237102dd5781d43f6ad680d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:26 +0000 Subject: [PATCH 029/197] =?UTF-8?q?gnome3.gdm:=203.32.0=20=E2=86=92=203.34?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - disable custom initial vt as it's buggy --- pkgs/desktops/gnome-3/core/gdm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index a4d2fd2be5a51..8659efe2c3229 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gdm"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; + sha256 = "0pnh0nj4kk8n48kgj77bb5r4z5jnb7kxnvpnddk6b9n96g0qwklv"; }; # Only needed to make it build @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-plymouth=yes" "--enable-gdm-xsession" - "--with-initial-vt=7" + # "--with-initial-vt=7" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-udevdir=$(out)/lib/udev" ]; From 7dc02aa1852db3530ba22113f0383627f8bb32a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:27 +0000 Subject: [PATCH 030/197] gnome3.geary: 3.32.2 -> 3.34.0 --- pkgs/desktops/gnome-3/misc/geary/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 8babe77e4121a..870ff56e57053 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme -, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext +, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking }: +, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking +, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }: stdenv.mkDerivation rec { pname = "geary"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sg53zq81v28hdqiy5d048skwfgsa8ck0z7ywsagdh7iaqin68gq"; + sha256 = "1cxpyjgfrai423vwqc6jv4aqadxkd3ghh2had71drilyywy5bx64"; }; nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja - pkgconfig vala wrapGAppsHook python3 + pkgconfig vala wrapGAppsHook python3 appstream-glib + gobject-introspection ]; buildInputs = [ adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 - libgee libnotify libsecret sqlite webkitgtk glib-networking - libunwind libunity folks + libgee libsecret sqlite webkitgtk glib-networking + libunwind libunity folks gspell libytnef libhandy ]; checkInputs = [ xvfb_run dbus ]; @@ -32,8 +34,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py + chmod +x build-aux/post_install.py build-aux/git_version.py + patchShebangs build-aux/post_install.py build-aux/git_version.py chmod +x desktop/geary-attach ''; From 86c879f4618951689f54d8903b4642a757a10e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:31 +0000 Subject: [PATCH 031/197] =?UTF-8?q?gnome3.gedit:=203.32.2=20=E2=86=92=203.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 35d97a87a86f1..5115c2d8fb4f4 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; + sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y"; }; nativeBuildInputs = [ From d1cf35e1841f588f608de8c9325c450ab1e7f80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:31 +0000 Subject: [PATCH 032/197] =?UTF-8?q?gnome3.gjs:=201.56.2=20=E2=86=92=201.58?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - No longer links to gkt3 --- pkgs/desktops/gnome-3/core/gjs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 303377b8631a6..a7b8e18d73a69 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gjs"; - version = "1.56.2"; + version = "1.58.0"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; + sha256 = "1wvywpng27y0264pq9anxdi1xy280x6mcnbgiggn804pql4nml8y"; }; passthru = { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "installedTests" ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ libxml2 gobject-introspection gtk3 glib pango readline dbus ]; + buildInputs = [ libxml2 gobject-introspection glib pango readline dbus ]; propagatedBuildInputs = [ spidermonkey_60 ]; From 1fbeb1d4d7f4c6911302275215b3e8bb20a0fa3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 6 Sep 2019 13:35:31 +0000 Subject: [PATCH 033/197] =?UTF-8?q?gnome3.gnome-applets:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GSD no longer required since modem-lights applet was removed. --- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 25e1347f1c928..fff328c608d6f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -18,7 +18,6 @@ , adwaita-icon-theme , libgweather , gucharmap -, gnome-settings-daemon , tracker , polkit , gnome3 @@ -26,13 +25,13 @@ let pname = "gnome-applets"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10kd19ymxl2z65121g90mx96m6vcn2a8a50g6a56prrdjsgbgia1"; + sha256 = "1mbhykqwzq18zpvfkdcdkbb4zhijmxqa2i6502an78yap87vq74i"; }; nativeBuildInputs = [ @@ -56,7 +55,6 @@ in stdenv.mkDerivation rec { adwaita-icon-theme libgweather gucharmap - gnome-settings-daemon tracker polkit wirelesstools From 21976dd1fb24946fa51f5cf69a2170bb99bb95df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:34 +0000 Subject: [PATCH 034/197] =?UTF-8?q?gnome3.gnome-bluetooth:=203.32.1=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 817c8324c6b2c..b52161f90ae10 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -6,14 +6,14 @@ let pname = "gnome-bluetooth"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.32.1"; + version = "3.34.0"; # 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 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4"; + sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8"; }; nativeBuildInputs = [ From c09404c3593d3bf53d7e4f1dc0f1a3b5cb77b084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:36 +0000 Subject: [PATCH 035/197] =?UTF-8?q?gnome3.gnome-books:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 25ee957224c78..628442c307531 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnome-books"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4"; + sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; }; nativeBuildInputs = [ From b59b97637a62d6bd9564811c69486e070006f141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:27:03 +0000 Subject: [PATCH 036/197] =?UTF-8?q?gnome3.gnome-boxes:=203.32.1=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit oVirt support was dropped --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2f0a21896e90d..ba0d0bd891bba 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -6,17 +6,15 @@ , libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte }: -# TODO: ovirt (optional) - let - version = "3.32.1"; + version = "3.34.0"; 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 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; + sha256 = "07qjrb1qgfznvm0l2jm99d212dvw3iaw76czq5q1msnghpdw67qd"; }; doCheck = true; @@ -40,10 +38,6 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ mtools cdrkit libcdio ]}") ''; - mesonFlags = [ - "-Dovirt=false" - ]; - postPatch = '' chmod +x build-aux/post_install.py # patchShebangs requires executable file patchShebangs build-aux/post_install.py From 108b0e567aeb42862cd1a186c9541bcc3eb60be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:36 +0000 Subject: [PATCH 037/197] =?UTF-8?q?gnome3.gnome-calculator:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index df43371a49718..f743e8fead675 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,14 +1,14 @@ { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: +, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41"; + sha256 = "0gzjdddby3pi22srlcw6q2dv9dxwak75jbplpvflhq4w82qx543b"; }; nativeBuildInputs = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview4 mpfr gmp - gnome3.adwaita-icon-theme + gnome3.adwaita-icon-theme libgee gsettings-desktop-schemas libsoup libmpc ]; From 36f752d83ce2e28b9477265ddf9c96f94942ad58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:37 +0000 Subject: [PATCH 038/197] =?UTF-8?q?gnome3.gnome-calendar:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 03619f38c9ba8..ec09b856f30e3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.32.2"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "07p73cvzj8idr80npja5yiv9pjfyi6qqfhaz5jwcgqspqbnhnl7k"; + sha256 = "0gbiqsx3pny2blgfwazy82fbrnn17yilm3rvv1aq8k5w0xd9147b"; }; passthru = { From b44b63a5b93ef7c7fb6a707a89e449ef881b8607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:41 +0000 Subject: [PATCH 039/197] =?UTF-8?q?gnome3.gnome-chess:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index d7001e1c52791..72c4bdf1d297a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; + sha256 = "1n1vjg6xhwppmddrmqmkk6b3jkgphshp06rjbv5h3270k520a135"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; From e321bba430e959582353a267861730ef3d0d0477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:40 +0000 Subject: [PATCH 040/197] =?UTF-8?q?gnome3.gnome-clocks:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 38182f1f994f9..a99e775b26b5d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; + sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1"; }; passthru = { From be2cfc45e46f1fd70375e11c6e0e3c3605ee59b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:42 +0000 Subject: [PATCH 041/197] =?UTF-8?q?gnome3.gnome-contacts:=203.32.1=20?= =?UTF-8?q?=E2=86=92=203.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gnome-contacts/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 75a15a41f97b1..01127853a86f0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,14 +5,14 @@ , vala, meson, ninja, libhandy, gsettings-desktop-schemas }: let - version = "3.32.1"; + version = "3.34"; in stdenv.mkDerivation rec { pname = "gnome-contacts"; inherit version; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"; + sha256 = "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -33,15 +33,6 @@ in stdenv.mkDerivation rec { ]; patches = [ - # Fixes build with libhandy >= 0.0.10 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch"; - sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch"; - sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg"; - }) ]; postPatch = '' From e344e027fed1f2f3969af41931791580867a5383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:43 +0000 Subject: [PATCH 042/197] =?UTF-8?q?gnome3.gnome-control-center:=203.32.2?= =?UTF-8?q?=20=E2=86=92=203.34.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 04730f2370f5c..b87980f6b6592 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.32.2"; + version = "3.34.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs"; + sha256 = "1jr3bbpycdzk26b83fsxw1my0aldi86v0733k42y4x45vacaanqa"; }; nativeBuildInputs = [ From e0ee3d745a5c7895caf60478df7875360fbdb446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:44 +0000 Subject: [PATCH 043/197] =?UTF-8?q?gnome3.gnome-desktop:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 9d798c2811bda..cf76caf9f48b5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.32.2"; + version = "3.34.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; + sha256 = "09i4nv3fn8vlx7f1rzqid9qgd3srlz3hfajnjwmnpmf1apk1wcwd"; }; nativeBuildInputs = [ From cd0a6e75c7c5f0495a609ea983fe5169537ecdb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:49 +0000 Subject: [PATCH 044/197] =?UTF-8?q?gnome3.gnome-disk-utility:=203.32.1=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index d6d9f92725286..86739bb0f45a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,15 +1,15 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2, gsettings-desktop-schemas -, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: +, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; + sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.adwaita-icon-theme + udisks2 gnome3.adwaita-icon-theme systemd gnome3.gnome-settings-daemon gsettings-desktop-schemas ]; From 1415bf1b867763a2d38d430e870f7c54dcf5e91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:49 +0000 Subject: [PATCH 045/197] =?UTF-8?q?gnome3.gnome-documents:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.33.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 1301381e5aaf0..3a7e1473332c4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-documents"; - version = "3.32.0"; + version = "3.33.90"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; + sha256 = "0l9g10i380bnjp1y3pslsy8ph1hd5x1d57dadvq70p5ki4r3qjaw"; }; doCheck = true; From e702f9eb104075910c7c1873b44615ddfb39c1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:48 +0000 Subject: [PATCH 046/197] =?UTF-8?q?gnome3.gnome-flashback:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now longer has a gnome-flashback-init component. --- .../gnome-3/misc/gnome-flashback/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 3cade7ccdf8b7..e809cc7f44f8f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -26,24 +26,20 @@ let pname = "gnome-flashback"; - version = "3.32.0"; - requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback-init;gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; + version = "3.34.0"; + requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; gnome-flashback = stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0jfzr7vdmnxpxqqa38ni1p3c508xhlnxqpmmqshk3rvrf0afqn62"; + sha256 = "1ryr28psrjr3kp0in99a12y4vy6kvi2mvhp174dli2a56ds16mgj"; }; # make .desktop Execs absolute postPatch = '' patch -p0 < Date: Mon, 2 Sep 2019 16:44:49 +0000 Subject: [PATCH 047/197] =?UTF-8?q?gnome3.gnome-font-viewer:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 976829acd4c63..0589dfe728540 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; + sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; }; doCheck = true; From 2308486549de969efc935bb5a8c546739d07a46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:10 +0000 Subject: [PATCH 048/197] =?UTF-8?q?gnome3.gnome-getting-started-docs:=203.?= =?UTF-8?q?32.2=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/apps/gnome-getting-started-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 655e9e9fe34d7..bb4e18208073b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq"; + sha256 = "1nq3dvvjr6vzl87p0y2ggv8bxap3hdbwhbn9ycan4y5d4g5f437p"; }; passthru = { From 28788db24b020840c3d2006e0cd2d994dedf28b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:56 +0000 Subject: [PATCH 049/197] =?UTF-8?q?gnome3.gnome-klotski:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 904edd7e51a70..137357e0a399b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72"; + sha256 = "0sbx0bzy32lh2c9jp8v7gz788wn9y1la8mr5a7gf7370szsl4d4f"; }; nativeBuildInputs = [ From 0c456c362f7c40623a961817612fc376f625eddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:54 +0000 Subject: [PATCH 050/197] =?UTF-8?q?gnome3.gnome-logs:=203.32.1=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 8681a3c866ce9..c80238740e543 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils +{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; + sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; }; mesonFlags = [ - "-Dtests=true" "-Dman=true" ]; nativeBuildInputs = [ python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils + meson ninja pkgconfig wrapGAppsHook gettext itstool libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; From 3c229475063380aee90837b8bb4d12664017ce44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:56 +0000 Subject: [PATCH 051/197] =?UTF-8?q?gnome3.gnome-mahjongg:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 9d173945cdd8c..aa7824a031798 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; + sha256 = "0qyi3jkg112jysrsy5p330b7b92sl09mr8zsimq06q68kj1wzkz5"; }; passthru = { From eb2076aa03adecdfe96aecf1e944605ecd1b6d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:59 +0000 Subject: [PATCH 052/197] =?UTF-8?q?gnome3.gnome-maps:=203.32.2.1=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 6011092c0e0e6..fd659b3e4057b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.32.2.1"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1m191iq1gjaqz79ci3dkbmwrkxp7pzknngimlf5bqib5x8yairlb"; + sha256 = "0vsi21zzk5mvf6rv86r6ahzxd93ciyhjrdqsn3pncnk0yy67y2wr"; }; doCheck = true; From 16544a60f7c2b3b2c7aeecfdbee61aeb9b2b8bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:00 +0000 Subject: [PATCH 053/197] =?UTF-8?q?gnome3.gnome-mines:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 1ac7e51357eb4..8c620fdd0d153 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; + sha256 = "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54"; }; # gobject-introspection for finding vapi files From 5bb4b8cd0ab16a17b1385c2865f24bbe4c1d7339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:02 +0000 Subject: [PATCH 054/197] =?UTF-8?q?gnome3.gnome-music:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 9b8c96729ad78..204d0a8982e2c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.32.2"; + version = "3.34.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cn7l1d3ayima1w3bxpshijabd7ibhnvqxv2mpvffzizk04ln6hk"; + sha256 = "1a566ifx08clfm22qzdh1i6w8cr2kv7avqzkk6zgc5adba0vmzx4"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From a36a47ad963457f4fb192c98f97b254905a344a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:04 +0000 Subject: [PATCH 055/197] =?UTF-8?q?gnome3.gnome-nibbles:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/games/gnome-nibbles/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 7b06992216968..803661b015321 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,19 +1,24 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool -, libxml2, libgee, libgnome-games-support }: +, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 +, libxml2, libgee, libgnome-games-support, meson, ninja +, desktop-file-utils, hicolor-icon-theme}: stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p"; + sha256 = "0al0znl26y3xcdq6ilv78g54pz0fcw5lr9rhhf9g9rkyigd5056n"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; + nativeBuildInputs = [ + meson ninja vala python3 + pkgconfig wrapGAppsHook gettext itstool libxml2 + desktop-file-utils hicolor-icon-theme + ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.adwaita-icon-theme + gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme libgee libgnome-games-support ]; From fcf160d383a412a91f5ca9e68e887b585f397180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:26:22 +0000 Subject: [PATCH 056/197] =?UTF-8?q?gnome3.gnome-notes:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 920343a60241c..a6bc54fd86b1b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -5,14 +5,14 @@ , gnome3, libxml2, gsettings-desktop-schemas, tracker }: let - version = "3.32.2"; + version = "3.34.0"; in stdenv.mkDerivation { pname = "gnome-notes"; inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "0chm2fks7cpx3mycxzddpj6v9by203c3m1y6zns5ra43bspwafy2"; + sha256 = "0wrnsspcg4s0vdfc23cc84xy02k3b19yim9s4k0vv23b69n37n1l"; }; doCheck = true; From 1dce1e58f746152ca224497e91f70aa41487c0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:10 +0000 Subject: [PATCH 057/197] =?UTF-8?q?gnome3.gnome-online-accounts:=203.32.0?= =?UTF-8?q?=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 9ae4a572d93ba..f97a49e26b866 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -6,13 +6,13 @@ let pname = "gnome-online-accounts"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; + sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From 40aa2930c7b22b622fdaab58bf5ae9b0c9adc39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:27:18 +0000 Subject: [PATCH 058/197] =?UTF-8?q?gnome3.gnome-online-miners:=203.30.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index 93da1f8abec92..b21e3f6f68a7c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-online-miners"; - version = "3.30.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; + sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From be73d2077d8bd10a5b4f167c0094837987ca49f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:10 +0000 Subject: [PATCH 059/197] =?UTF-8?q?gnome3.gnome-panel:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index 3031b2c1d78f1..6cb7249b64ea4 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -23,7 +23,7 @@ let pname = "gnome-panel"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0a9zi1jb0b42zd6wx3251cnns9v1w0cbwasmrx9hsj1dsb9pjq3a"; + sha256 = "11qsmpv0nyrkqc5b9a1532i82jmbxww1nlzdzysid283l9zyy2dn"; }; # make .desktop Exec absolute From e70325ad720af6a48c669187ffd2478397c26689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:09 +0000 Subject: [PATCH 060/197] =?UTF-8?q?gnome3.gnome-robots:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-robots/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 46723867f8ad3..09aaae8e1e91a 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support +, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "gnome-robots"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; + sha256 = "18vnx5096d3mc2i7w4ma9hflsqfnvahl29aifjnvhdm5ji8qi0mb"; }; passthru = { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hicolor-icon-theme # For setup-hook ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme + gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme ]; postPatch = '' From f6c19ee5272cec4e92a969b56d15442919c9dcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:10 +0000 Subject: [PATCH 061/197] =?UTF-8?q?gnome3.gnome-screenshot:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.33.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 33acfd245cf55..bf57fb809c61f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "3.32.0"; + version = "3.33.90"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b"; + sha256 = "0bki99lkp20jvp1yjymy8y56k378vivpvqvfwfx9dwl8r3qal7i2"; }; doCheck = true; From 6e9c75ed046d3c86b16b30464ac259cfe5896c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:13 +0000 Subject: [PATCH 062/197] =?UTF-8?q?gnome3.gnome-session:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adds systemd sessions --- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index f13ad9f47aa6d..127aa5bf79b98 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; + sha256 = "0qkdwvj6w33h8csq9mhjbf10f0v5g0sgabyfg1bgp75z0br76si0"; }; patches = [ From b373422223823b23b8ea2daeaa34b2bf6e8c6761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:14 +0000 Subject: [PATCH 063/197] =?UTF-8?q?gnome3.gnome-settings-daemon:=203.32.1?= =?UTF-8?q?=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixup build --- .../gnome-3/core/gnome-settings-daemon/default.nix | 8 ++++++-- .../core/gnome-settings-daemon/fix-paths.patch | 11 ----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index b9f33ce73a8aa..aa8a42ceb21bc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -27,6 +27,7 @@ , libwacom , libxslt , libxml2 +, modemmanager , networkmanager , gnome-desktop , geocode-glib @@ -35,15 +36,16 @@ , python3 , tzdata , nss +, gcr }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks"; + sha256 = "0dvkq6pwrvqsm30wa965q0wf15v7nmnv6xfb9sli2sc62yc9gr3w"; }; patches = [ @@ -71,6 +73,7 @@ stdenv.mkDerivation rec { gtk3 glib gsettings-desktop-schemas + modemmanager networkmanager libnotify libgnomekbd # for org.gnome.libgnomekbd.keyboard schema @@ -89,6 +92,7 @@ stdenv.mkDerivation rec { systemd libgudev libwacom + gcr ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch index 272656fae78c3..2229302cab7c0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch @@ -13,14 +13,3 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; ---- a/plugins/mouse/gsd-mouse-manager.c -+++ b/plugins/mouse/gsd-mouse-manager.c -@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager, - gboolean run_daemon = dwell_click_enabled || secondary_click_enabled; - - if (run_daemon || manager->priv->mousetweaks_daemon_running) -- comm = g_strdup_printf ("mousetweaks %s", -+ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s", - run_daemon ? "" : "-s"); - else - return; From 4845bd046be6a8886513d94171e79546ce93797d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:15 +0000 Subject: [PATCH 064/197] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.32.1?= =?UTF-8?q?=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/gnome-shell-extensions/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 3d37040828c5d..dd88d4feea118 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_52, glib +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2"; + sha256 = "1ayb48l2p3lji7b226027293jfclgcjmdb5dd6xfn67rhxm8zgzm"; }; passthru = { updateScript = gnome3.updateScript { - packageName = "gnome-shell-extensions"; - attrPath = "gnome3.gnome-shell-extensions"; + packageName = pname; + attrPath = "gnome3.${pname}"; }; }; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; doCheck = true; - # 52 is required for tests - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.30.1/meson.build#L25 - checkInputs = [ spidermonkey_52 ]; + # 60 is required for tests + # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 + checkInputs = [ spidermonkey_60 ]; nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; From ca97caee7e5bf5457db976d9d07d28c959e0f544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:46:15 +0200 Subject: [PATCH 065/197] gnome3.gnome-shell: 3.32.2 -> 3.34.0 --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 6 ++++-- pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index a1d8f2c599a8d..92578ef2798f6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; + sha256 = "0vdx4mfj46cpvzn6mhxc1ivg138437f5m4n3k4vb54pk45w4s00x"; }; LANG = "en_US.UTF-8"; @@ -49,6 +49,8 @@ in stdenv.mkDerivation rec { caribou ]; + mesonFlags = [ "-Dextensions_tool=false" ]; + patches = [ (fetchpatch { name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index 3207af110885a..9cb9655b72e55 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -11,10 +11,9 @@ null); --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button { - let description = xkbLayout; +@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { if (xkbVariant.length > 0) - description = description + '\t' + xkbVariant; + description = `${description}\t${xkbVariant}`; - Util.spawn(['gkbd-keyboard-display', '-l', description]); + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); From 860f1042354c5ab6ae5055ebf27db2c653c5ed44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 18:06:34 +0000 Subject: [PATCH 066/197] =?UTF-8?q?gnome3.gnome-software:=203.32.4=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 12081bbae5b0f..8c5e0fad41ef0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.32.4"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; + sha256 = "1mr03s6f38pbgvgpb1p91csqms369f1lzqyk5nfam5jqyl273nzk"; }; patches = [ From 9917cd06944bdc24ecf6dbc50f6b167ff05a0791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:18 +0000 Subject: [PATCH 067/197] =?UTF-8?q?gnome3.gnome-sudoku:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index a555ee31cf378..de00368df2e14 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; + sha256 = "1bwy9w4jkdlsc6iz7lwy0nm4vqa11kgcw24qf4w2g0qyldcvhc3y"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; From 97aa29806d2275b298e191d8986b485067a82bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:21 +0000 Subject: [PATCH 068/197] =?UTF-8?q?gnome3.gnome-taquin:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index b6c60362265d0..889991d210fe1 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra-gtk3, gettext, itstool, libxml2 +, librsvg, gsound, gettext, itstool, libxml2 , meson, ninja, vala, python3, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; + sha256 = "0jhfryqim98m9i84k18r4xb83q2g2198mn4igmr05sr974f0j578"; }; passthru = { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 vala desktop-file-utils ]; buildInputs = [ - gtk3 librsvg libcanberra-gtk3 + gtk3 librsvg gsound gnome3.adwaita-icon-theme ]; From 7b50a0e9d0bf50d364b813f37d439534a5bf503d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:21 +0000 Subject: [PATCH 069/197] =?UTF-8?q?gnome3.gnome-terminal:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add pcre2 Co-authored-by: worldofpeace --- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 75d4b117e7784..1ca58c8f77734 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }: +, desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme, glib, pcre2 }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; + sha256 = "0wcavripfsr691qkcjb71vccffz0wx2q5qh4clwnk1hi8j1hz9l5"; }; buildInputs = [ @@ -19,10 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool which libxml2 - vala desktop-file-utils wrapGAppsHook + vala desktop-file-utils wrapGAppsHook pcre2 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 = '' From 4353f36298045275d23f31b6b5ea836af9f437f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:21 +0000 Subject: [PATCH 070/197] =?UTF-8?q?gnome3.gnome-tetravex:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 2914153021166..774f066d06b73 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; + sha256 = "0wyhiiyi9zhvj250nwsc9h38dnhw3z8aml3yk6b7i1wfg7f54nwa"; }; passthru = { From 23228d7ac3b1ba2cc18cc3d52bdd1ac4a61e872a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:25 +0000 Subject: [PATCH 071/197] =?UTF-8?q?gnome3.gnome-tweaks:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index 7a54114d2dbcc..f40911577c118 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,17 +1,17 @@ { stdenv, meson, ninja, gettext, fetchurl , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas -, itstool, libxml2, python3Packages +, itstool, libxml2, python3Packages, libhandy , gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: let pname = "gnome-tweaks"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55"; + sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus gnome3.mutter gnome3.gnome-desktop gobject-introspection - gnome3.nautilus + gnome3.nautilus libhandy # Makes it possible to select user themes through the `user-theme` extension gnome3.gnome-shell-extensions ]; From 08cbcdb6e93fed78f45a716fed565d2db71a9891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:28 +0000 Subject: [PATCH 072/197] =?UTF-8?q?gnome3.gnome-user-docs:=203.32.3=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 7915e71a73c00..cb0c1494b9467 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.32.3"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; + sha256 = "1v94mz8zwzx67db2avbi9p2klw36cz45qr6fbskpvygz2pzhg6cg"; }; passthru = { From 50babe1202f2fbcc1e732273fa86745d9918561f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:26 +0000 Subject: [PATCH 073/197] =?UTF-8?q?gnome3.gnome-user-share:=203.32.0.1=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gnome-user-share/default.nix | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 2a425acb067d1..6207dd42a61a6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -1,6 +1,9 @@ { stdenv , gettext +, meson +, ninja , fetchurl +, fetchpatch , apacheHttpd , nautilus , pkgconfig @@ -14,36 +17,55 @@ , mod_dnssd , gnome3 , libcanberra-gtk3 +, python3 }: stdenv.mkDerivation rec { pname = "gnome-user-share"; - version = "3.32.0.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945"; + sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; }; + patches = [ + # fix gio-unix-2.0 lookup + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch; + sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; + }) + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ -i data/dav_user_2.4.conf ''; - configureFlags = [ - "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" - "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" - "--with-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" + mesonFlags = [ + "-Dhttpd=${apacheHttpd.out}/bin/httpd" + "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" + # In 3.34.0 it defaults to false but it is silently ignored and always installed. + # Let’s add it anyway in case they decide to make build respect the option in the future. + "-Dnautilus_extension=true" ]; nativeBuildInputs = [ pkgconfig + meson + ninja gettext itstool libxml2 wrapGAppsHook + python3 ]; buildInputs = [ From d5f1b96844d532fb8caaa0ac63a70c87e8a5e529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:29 +0000 Subject: [PATCH 074/197] =?UTF-8?q?gnome3.gnome-weather:=203.32.2=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 1e5a641f08fd3..c71baa146d1a4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s"; + sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; From 40f2a2c2e20652a85554e1199a0f60ed6bda2710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:34 +0000 Subject: [PATCH 075/197] =?UTF-8?q?gnome3.hitori:=203.32.0=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/hitori/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index 8e53a937a5e91..cf83527432f5e 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15s20db2fq4cy031sw20pmf53hxiak44fgyjy5njqnp2h2sg3806"; + sha256 = "1612hq6d2mnggppy949dkb8lz9886n0rlg68z7qmjjizz1l41lb5"; }; nativeBuildInputs = [ From 02bef3c21b6b8aabbb6bfa62225f29eea1156f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:35 +0000 Subject: [PATCH 076/197] =?UTF-8?q?gnome3.iagno:=203.32.0=20=E2=86=92=203.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/iagno/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 114551ed4ee1a..bee939fd1298c 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook -, itstool, libcanberra-gtk3, libxml2 +, itstool, gsound, libxml2 , meson, ninja, python3, vala, desktop-file-utils }: stdenv.mkDerivation rec { pname = "iagno"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; + sha256 = "15zan1h63hm9z0bf3y5h7rqd935jjw672qh88waqzwp6mlv1y321"; }; nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils pkgconfig wrapGAppsHook itstool libxml2 ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg libcanberra-gtk3 ]; + buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg gsound ]; enableParallelBuilding = true; From 0df8cd88879102f5881ccae4996205f39111a27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:27:48 +0000 Subject: [PATCH 077/197] =?UTF-8?q?gnome3.libgnome-games-support:=201.4.3?= =?UTF-8?q?=20=E2=86=92=201.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/misc/libgnome-games-support/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 3776a9adbf2cf..d591fb6033d07 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3 +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, gnome3 , libintl }: let pname = "libgnome-games-support"; - version = "1.4.3"; + version = "1.4.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0g6a1vvhrbs0pfnzjfg3lgqvppwkydn6j3dn713zhrjhma9pljkh"; + sha256 = "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig gettext ]; buildInputs = [ libintl ]; propagatedBuildInputs = [ # Required by libgnome-games-support-1.pc From 2803a9c708b252f15b4676de1038b37488a9a97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:28:00 +0000 Subject: [PATCH 078/197] =?UTF-8?q?gnome3.lightsoff:=203.32.0=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 9c582f037a25e..0a236d0425a0f 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lightsoff"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; + sha256 = "1yyq0962fv16rab3alq5saf4gpii9xvcfy5vbq85hhhgjpbqrfns"; }; nativeBuildInputs = [ From 894df0c2bb27f0a049dd53b7f9bbfd1597a8f580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 6 Sep 2019 13:36:40 +0000 Subject: [PATCH 079/197] =?UTF-8?q?gnome3.metacity:=203.32.0=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 8b1d2b05df11c..0c32b4448d74f 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -16,13 +16,13 @@ let pname = "metacity"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "177dmb1smizfgkddk49n2kr90graj9r6xw5hg3aq0y2qqg6v4rcg"; + sha256 = "0ih95lmw56z6pha7p035ahqpvpw9sxfam3cxm7fambib5qrky192"; }; patches = [ From f01d9db50424fcdecdc031f558942302c2295e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:47:10 +0200 Subject: [PATCH 080/197] gnome3.mutter: 3.32.2 -> 3.34.0 --- pkgs/desktops/gnome-3/core/mutter/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index eab0b131ea936..8022a0b110c8a 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -7,22 +7,25 @@ , xorgserver , python3 , wrapGAppsHook +, sysprof +, desktop-file-utils }: stdenv.mkDerivation rec { pname = "mutter"; - version = "3.32.2"; + version = "3.34.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h577i2ap7dpfy1jg101jvc6nzccc0csgvd55ahydlr8f94frcva"; + sha256 = "0qdpw0fya8kr5737jf635455qb714wvhszkk82rlw48fqj8nk8ss"; }; mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dinstalled_tests=false" # TODO: enable these + "-Dprofiler=false" ]; propagatedBuildInputs = [ @@ -39,6 +42,7 @@ stdenv.mkDerivation rec { # for cvt command xorgserver wrapGAppsHook + desktop-file-utils ]; buildInputs = [ @@ -47,21 +51,19 @@ stdenv.mkDerivation rec { geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire xwayland - gnome-settings-daemon + gnome-settings-daemon # sysprof ]; patches = [ + (fetchpatch { + name = "ensure-emit-x11-display-opened.patch"; + url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch"; + sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf"; + }) (substituteAll { src = ./fix-paths.patch; inherit zenity; }) - # Fix a segmentation fault in dri_flush_front_buffer() upon - # suspend/resume. This change should be removed when Mutter - # is updated to 3.34. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/8307c0f7ab60760de53f764e6636893733543be8.diff"; - sha256 = "1hzfva71xdqvvnx5smjsrjlgyrmc7dj94mpylkak0gwda5si0h2n"; - }) ]; postPatch = '' From f011fc9c789aa70e1a8290e89bac0789cb15f169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:54 +0000 Subject: [PATCH 081/197] =?UTF-8?q?gnome3.nautilus:=203.32.3=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add gobject-introspection for gir Co-authored-by: worldofpeace --- .../core/nautilus/bubblewrap-paths.patch | 15 ---- .../gnome-3/core/nautilus/default.nix | 83 ++++++++++++++----- 2 files changed, 60 insertions(+), 38 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch b/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch deleted file mode 100644 index 37358c8432c53..0000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, - g_return_val_if_fail (script->s_infile != NULL, FALSE); - - add_args (array, -- "bwrap", -- "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "@bubblewrap_bin@", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", - NULL); - - /* These directories might be symlinks into /usr/... */ diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 14551fb7d0c3e..b68415b32a2fb 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -1,33 +1,77 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2 -, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar -, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi -, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf -, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, libxml2 +, desktop-file-utils +, python3 +, wrapGAppsHook +, gtk3 +, gnome3 +, gnome-autoar +, glib-networking +, shared-mime-info +, libnotify +, libexif +, libseccomp +, exempi +, librsvg +, tracker +, tracker-miners +, gexiv2 +, libselinux +, gdk-pixbuf +, substituteAll +, gnome-desktop +, gst_all_1 +, gsettings-desktop-schemas +, gobject-introspection }: -let +stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.32.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1x9crzbj6rrrf8w5dkcx0c14j40byr4ijpzkwd5dcrbfvvdy1r01"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1ncs5hmaxjb9p2yzj81m7dz2x27vzmvppir3058dk236jzn98r36"; }; nativeBuildInputs = [ - meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils + gettext + gobject-introspection + libxml2 + meson + ninja + pkgconfig + python3 + wrapGAppsHook ]; buildInputs = [ - glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux - tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base - gnome3.adwaita-icon-theme gsettings-desktop-schemas + exempi + gexiv2 + glib-networking + gnome-desktop + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gtk3 + libexif + libnotify + libseccomp + libselinux + shared-mime-info + tracker + tracker-miners ]; - propagatedBuildInputs = [ gnome-autoar ]; + propagatedBuildInputs = [ + gnome-autoar + ]; preFixup = '' gappsWrapperArgs+=( @@ -44,13 +88,6 @@ in stdenv.mkDerivation rec { patches = [ ./extension_dir.patch - # 3.30 now generates it's own thummbnails, - # and no longer depends on `gnome-desktop` - (substituteAll { - src = ./bubblewrap-paths.patch; - bubblewrap_bin = "${bubblewrap}/bin/bwrap"; - inherit (builtins) storeDir; - }) ]; passthru = { From 76f634b5cdea391ff5faf1366aff322d437b360f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:54 +0000 Subject: [PATCH 082/197] =?UTF-8?q?gnome3.polari:=203.32.2=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 51fea63b7142c..0202821f7d554 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.32.2"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0h0w9j3y067l911gpj446b3a2w1i2vzr1w2a7cz7i5rhn6qkf2sp"; + sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; From 324c7055d6c64d84ad347c7aec63f9867620568a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:55 +0000 Subject: [PATCH 083/197] =?UTF-8?q?gnome3.quadrapassel:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/games/quadrapassel/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 78ed0d9fa68aa..0f89d8c3a7467 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf -, librsvg, libcanberra-gtk3, libmanette +, librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils }: -let +stdenv.mkDerivation rec { pname = "quadrapassel"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { - url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy"; + url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1na5j1mf09rdj0kp7fwfdnc1p7mfclpv58is2cs2ldfik4y1p2if"; }; nativeBuildInputs = [ @@ -22,11 +20,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libmanette - libcanberra-gtk3 clutter libxml2 clutter-gtk + gsound clutter libxml2 clutter-gtk ]; - enableParallelBuilding = true; - passthru = { updateScript = gnome3.updateScript { packageName = pname; From 202ce61c81e344c4f527cbf9e769733209fbf2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:59 +0000 Subject: [PATCH 084/197] =?UTF-8?q?gnome3.sushi:=203.32.1=20=E2=86=92=203.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/sushi/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 86675f21f06a9..fc4034acf6607 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib -, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs +, clutter-gtk, clutter-gst, gnome3, gtksourceview4, gjs , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1 -, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }: +, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja, epoxy }: stdenv.mkDerivation rec { pname = "sushi"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"; + sha256 = "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8"; }; nativeBuildInputs = [ @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 gnome3.evince icu harfbuzz - clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf - librsvg libmusicbrainz5 webkitgtk + clutter-gtk clutter-gst gjs gtksourceview4 gdk-pixbuf + librsvg libmusicbrainz5 webkitgtk epoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; From fa8d17ba70e725f422d8d917a14d7079e0d5cd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:28:16 +0000 Subject: [PATCH 085/197] =?UTF-8?q?gnome3.swell-foop:=203.32.0=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index a944e0c568a23..6de5eaa96c3c6 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -3,13 +3,13 @@ let pname = "swell-foop"; - version = "3.32.0"; + version = "3.34.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci"; + sha256 = "1vbclb1jcn2s9rb7whk02v6hfr6fnwx2ppa55bsa7595f3ki79v5"; }; passthru = { From 2f2f17828ceb48d6e27a8cba328c6e53b4785e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:01 +0000 Subject: [PATCH 086/197] =?UTF-8?q?gnome3.totem:=203.32.1=20=E2=86=92=203.?= =?UTF-8?q?34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vala and nautilus support was removed in 3.32. --- pkgs/desktops/gnome-3/core/totem/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index a5388f2eae19d..379f154abecf5 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; + sha256 = "00fpm3609zckiqjrlg3r64vz2mqych44kdkljxbidb847vg6xm84"; }; doCheck = true; @@ -31,14 +31,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ - "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" - # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 - # https://bugzilla.gnome.org/show_bug.cgi?id=784236 - # https://github.com/mesonbuild/meson/issues/1994 - "-Denable-vala=no" - ]; - checkInputs = [ xvfb_run ]; checkPhase = '' From 4a1a728dd5b1c18ca46ad5a566f4c19e13635358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:05 +0000 Subject: [PATCH 087/197] =?UTF-8?q?gnome3.tracker-miners:=202.2.2=20?= =?UTF-8?q?=E2=86=92=202.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- .../development/libraries/tracker-miners/fix-paths.patch | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 9f31e70ad531a..99374b572c62f 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kk5xaajamb8jlm6cfdbc2m3axzr6bnph84m7697xmb0pkg8hdiw"; + sha256 = "1ky7hd0vms1z40a0y9wq9pg3l7gxh4p6a0ngmnjqh8p23qfxdrxd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch index 724c51cb56f8e..ce44416055c41 100644 --- a/pkgs/development/libraries/tracker-miners/fix-paths.patch +++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch @@ -9,12 +9,3 @@ DEFAULT_RULE, NULL); if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -388,7 +388,7 @@ - if (!priv->ontology_location) { - gchar *ontology_path; - -- ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies", -+ ontology_path = g_build_filename ("@tracker@", "share", "tracker", "ontologies", - priv->ontology_name, NULL); - - if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) { From 93ecc2a52f3a015453ae48459ff0f864f43ba449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:04 +0000 Subject: [PATCH 088/197] =?UTF-8?q?gnome3.tracker:=202.2.2=20=E2=86=92=202?= =?UTF-8?q?.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/tracker/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index db4f620a740fa..4add8046de1ae 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,37 +1,32 @@ -{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobject-introspection, python3 +{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, gobject-introspection, python3 , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer -, gnome3, icu, libuuid, networkmanager, libsoup, json-glib -, substituteAll}: +, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, systemd +, substituteAll }: -let +stdenv.mkDerivation rec { pname = "tracker"; - version = "2.2.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "2.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0yxzqvjm3ij28p6g8jc4pd90yhhslmykcvi1cnyb069lm16m611c"; }; nativeBuildInputs = [ - meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection + meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales python3 # for data-generators + systemd # used for checks to install systemd user service ]; buildInputs = [ glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer ]; - LC_ALL = "en_US.UTF-8"; - mesonFlags = [ - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas "-Dfunctional_tests=false" "-Ddocs=true" From b748da63b831828678f87b8fb895fde3fd47c914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:08 +0000 Subject: [PATCH 089/197] =?UTF-8?q?gnome3.yelp-xsl:=203.32.1=20=E2=86=92?= =?UTF-8?q?=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/yelp-xsl/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index fc5b0268df707..7cb63b8df797e 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,23 +1,38 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, itstool, libxml2, libxslt, gnome3 }: +{ stdenv +, gettext +, fetchurl +, pkgconfig +, itstool +, libxml2 +, libxslt +, gnome3 +}: stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; + sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; }; - }; + nativeBuildInputs = [ + pkgconfig + gettext + itstool + libxml2 + libxslt + ]; doCheck = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool itstool libxml2 libxslt ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; From 7d49165f780a3d1c6e7b5724bfed4741fbd77dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 10 Sep 2019 05:10:51 +0200 Subject: [PATCH 090/197] gnomeExtensions.gsconnect: 23 -> 26 --- .../gnome-3/extensions/gsconnect/default.nix | 6 +-- .../extensions/gsconnect/fix-paths.patch | 40 +++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index cef00513df1c4..cfd906a3d0c4f 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "23"; + version = "26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "011asrhkly9zhvnng2mh9v06yw39fx244pmqz5yk9rd9m4c32xid"; + sha256 = "01p8b3blsnxi2i89nddkm51wbbw5irwii2qlvlrzfh8hhh37my0a"; }; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { upower gnome3.caribou gnome3.gjs # for running daemon - gnome3.evolution-data-server # folks.py requires org.gnome.Evolution.DefaultSources gsettings; TODO: hardcode the schema path to the library (similarly to https://github.com/NixOS/nixpkgs/issues/47226) + gnome3.evolution-data-server # for libebook-contacts typelib ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch index b32d0af327216..097cde829ea56 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch @@ -29,16 +29,32 @@ const Gio = imports.gi.Gio; const GLib = imports.gi.GLib; const Gtk = imports.gi.Gtk; ---- a/src/service/__init__.js -+++ b/src/service/__init__.js -@@ -600,7 +600,9 @@ - /** - * Convenience functions for saving/restoring window geometry - */ --const _mutter = new Gio.Settings({schema_id: 'org.gnome.mutter'}); -+const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true); -+const _schema = _schema_source.lookup('org.gnome.mutter', false); -+const _mutter = new Gio.Settings({settings_schema: _schema}); +--- a/src/preferences/service.js ++++ b/src/preferences/service.js +@@ -435,9 +435,9 @@ var Window = GObject.registerClass({ + + _restoreGeometry() { + if (this._mutterSettings === undefined) { +- this._mutterSettings = new Gio.Settings({ +- schema_id: 'org.gnome.mutter' +- }); ++ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true); ++ const _schema = _schema_source.lookup('org.gnome.mutter', false); ++ this._mutterSettings = new Gio.Settings({settings_schema: _schema}); + } + + // Restore geometry, even if we're going to maximize +--- a/src/service/ui/messaging.js ++++ b/src/service/ui/messaging.js +@@ -891,9 +891,9 @@ var Window = GObject.registerClass({ + */ + _restoreGeometry() { + if (this._mutterSettings === undefined) { +- this._mutterSettings = new Gio.Settings({ +- schema_id: 'org.gnome.mutter' +- }); ++ const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@mutter_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true); ++ const _schema = _schema_source.lookup('org.gnome.mutter', false); ++ this._mutterSettings = new Gio.Settings({settings_schema: _schema}); + } - Gtk.Window.prototype.restore_geometry = function() { - let [width, height] = this.settings.get_value('window-size').deep_unpack(); From 99fb5e3668d2f1c4adf65b8a718ca4b7cea391b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 11:27:33 +0000 Subject: [PATCH 091/197] =?UTF-8?q?gobject-introspection:=201.60.2=20?= =?UTF-8?q?=E2=86=92=201.62.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 43695d8db585c..81df734a2ce37 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -9,7 +9,7 @@ let pname = "gobject-introspection"; - version = "1.60.2"; + version = "1.62.0"; in with stdenv.lib; stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz"; + sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"; }; outputs = [ "out" "dev" "man" ]; From 8df73bed150f124dc394a6ca951378e4abe90af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:30 +0000 Subject: [PATCH 092/197] =?UTF-8?q?gsettings-desktop-schemas:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/gsettings-desktop-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index ffb8be85d3acf..ea6e08811afab 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; + sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8"; }; passthru = { From 593e238b5d0b57b8bf885cd358b1f3db4936b6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 8 Sep 2019 18:18:35 +0000 Subject: [PATCH 093/197] =?UTF-8?q?gspell:=201.8.1=20=E2=86=92=201.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index fd6b12ccaac11..8adb6264e3757 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,7 +2,7 @@ let pname = "gspell"; - version = "1.8.1"; + version = "1.8.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1"; + sha256 = "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv"; }; propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig From 5f6c07f3906f92d6cf7dd7f5c4fb299190961ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:39 +0000 Subject: [PATCH 094/197] =?UTF-8?q?gtksourceview4:=204.2.0=20=E2=86=92=204?= =?UTF-8?q?.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/gtksourceview/4.x.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index fde94e79f0563..d3a7d849062e1 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: +{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, fribidi, vala +, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info +, meson, ninja }: stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4"; + sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx"; }; propagatedBuildInputs = [ @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext perl gobject-introspection vala ]; checkInputs = [ xvfb_run dbus ]; - buildInputs = [ atk cairo glib pango libxml2 ]; + buildInputs = [ atk cairo glib pango fribidi libxml2 ]; patches = [ ./4.x-nix_share_path.patch ]; @@ -31,11 +32,10 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkPhase = '' - NO_AT_BRIDGE=1 \ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --no-rebuild --print-errorlogs ''; passthru = { From ad19a11ddf27477ff661752b83902038be5114ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:44:15 +0000 Subject: [PATCH 095/197] =?UTF-8?q?gvfs:=201.40.2=20=E2=86=92=201.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-gnome build now require gnome-desktop-schemas --- pkgs/development/libraries/gvfs/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 8b3bc30a66163..43305291db6fd 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -14,7 +14,7 @@ , libgphoto2 , avahi , libarchive -, fuse +, fuse3 , libcdio , libxml2 , libxslt @@ -36,15 +36,16 @@ , libsecret , libgdata , python3 +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.40.2"; + version = "1.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; + sha256 = "1wbc0qsa97ihpn24fqvl7zwxy0zy20ggakm7vn6vnm7vxsf8v5fh"; }; postPatch = '' @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { libgphoto2 avahi libarchive - fuse + fuse3 libcdio samba libmtp @@ -87,6 +88,7 @@ stdenv.mkDerivation rec { libcdio-paranoia libnfs openssh + gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport [ gnome3.libsoup From d3779eeb81f525e7c4d1748f878744de9fd7cc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:53:36 +0000 Subject: [PATCH 096/197] =?UTF-8?q?jsonrpc-glib:=203.32.0=20=E2=86=92=203.?= =?UTF-8?q?33.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/jsonrpc-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 8012c6b3b149f..63ccc62003374 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.32.0"; + version = "3.33.3"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w"; + sha256 = "03vni35vxhajpgcaz104fzpzgs1yw6lc78d0bz1q1b1yi1b0807q"; }; mesonFlags = [ From a8dd352d4468dfd9d8bf53d61c1b78623c8a03e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:38 +0000 Subject: [PATCH 097/197] =?UTF-8?q?libdazzle:=203.32.3=20=E2=86=92=203.34.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/libdazzle/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 5b6d92d629dce..2c63a3c71db42 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,35 +1,28 @@ { stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: -let - version = "3.32.3"; +stdenv.mkDerivation rec { pname = "libdazzle"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.34.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s37hv12ikfzhvh86qzgmfcjm3wvp12l2vsr0whl5xmm2harp3bc"; + sha256 = "0z3395mpa9qwviazrlgf3356121ypzq9dziyzfhbvmmcnay291cd"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ]; + nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ "-Denable_gtk_doc=true" ]; - LC_ALL = "en_US.UTF-8"; - - # https://gitlab.gnome.org/GNOME/libdazzle/issues/25 - doCheck = false; + doCheck = true; checkPhase = '' - export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs From 88de388c986bf2a6080e82a2abe152698bb91843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:46 +0000 Subject: [PATCH 098/197] =?UTF-8?q?libgweather:=203.32.2=20=E2=86=92=203.3?= =?UTF-8?q?3.92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 5e35a43fb9d48..65f3592eba0c7 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.32.2"; + version = "3.33.92"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00iwbllh8dmnqch0ysng9xhkzzs3ir9jl9f4hp41vbvg1pq5zv98"; + sha256 = "1w9y79lrl0ablbxr3zpgkgad1296z3nxh1573icx26fwaklyakkz"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; From 1edd898ffdd2f7292e2328bb372e544ea8a3b15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:49:40 +0200 Subject: [PATCH 099/197] libmbim: 1.18.2 -> 1.20.0 fix build with glib 2.62 --- pkgs/development/libraries/libmbim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 7a7bd11532807..2d026452e6f11 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.18.2"; + version = "1.20.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"; + sha256 = "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc"; }; outputs = [ "out" "dev" "man" ]; From 9e6d89ea313af6f3caea86d59089b07563ba2a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:48 +0000 Subject: [PATCH 100/197] =?UTF-8?q?libpeas:=201.22.0=20=E2=86=92=201.24.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libpeas/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 314d5884501fe..beee52f8217cc 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3 , glib, gtk3, gobject-introspection, python3, ncurses }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.22.0"; + version = "1.24.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb"; }; - configureFlags = [ "--enable-python3" ]; - - nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ # Required by libpeas-1.0.pc From d5491d49b2e5875197e24bbd0ec6fd50e7d0dccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:50:34 +0200 Subject: [PATCH 101/197] libqmi: 1.22.4 -> 1.22.6 fix build with glib 2.62 --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 930eafc967591..4d365e5be3676 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.22.4"; + version = "1.22.6"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc"; + sha256 = "1pnma62kib6zbs4wr7h5g53v3p81jb8cvyvqcvaidb1hlfibwnvm"; }; outputs = [ "out" "dev" "devdoc" ]; From 7a4bbf6895f7a035ac4a875039ab7dd5a22062a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:48:04 +0200 Subject: [PATCH 102/197] libsoup: 2.66.2 -> 2.68.1 --- pkgs/development/libraries/libsoup/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 5f88ba80cd6af..fae1581c87a6e 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3 }: +, libpsl, python3, brotli }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.66.2"; + version = "2.68.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"; + sha256 = "13dz7x092yswdidj69hadzqfyv6cyfnjbzidjym7nycf7gjj60vz"; }; postPatch = '' @@ -17,15 +17,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite libpsl ]; + buildInputs = [ python3 sqlite libpsl brotli ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ]; propagatedBuildInputs = [ glib libxml2 ]; mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency - "-Dgssapi=false" - "-Dvapi=true" + "-Dgssapi=disabled" + "-Dvapi=enabled" "-Dgnome=${if gnomeSupport then "true" else "false"}" + "-Dntlm=disabled" ]; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) From f4e233e57ae58dc4e3e4d613bdd83c87289d9892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:45:56 +0000 Subject: [PATCH 103/197] =?UTF-8?q?orca:=203.32.0=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/orca/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 1a8d5b76fe3da..4009bbb6da150 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobject-introspection -, intltool, yelp-tools, itstool, libxmlxx3 +, gettext, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.32.0"; + version = "3.34.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i"; + sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p"; }; patches = [ @@ -30,7 +30,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp-tools itstool gobject-introspection + gettext yelp-tools itstool gobject-introspection hicolor-icon-theme # setup-hook ]; @@ -45,11 +45,6 @@ buildPythonApplication rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - # Run intltoolize to create po/Makefile.in.in - preConfigure = '' - intltoolize - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; From 8cca9416eb6324b4ae3b9018a4dade5ac85bd639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:00 +0000 Subject: [PATCH 104/197] =?UTF-8?q?simple-scan:=203.32.2.1=20=E2=86=92=203?= =?UTF-8?q?.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index de56b14d46fd8..89d756c559e42 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.32.2.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; + sha256 = "1fxqrwhpvm7y83zrn85wg2avwlcmkfjvv1gb6br6v58zi6fvny3k"; }; buildInputs = [ From 63b9cbdb8ea6212c5b0eb4d187309ee42825f427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 9 Sep 2019 21:48:51 +0200 Subject: [PATCH 105/197] sysprof: 3.32.0 -> 3.34.0 --- pkgs/development/tools/profiling/sysprof/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 720544f4b6c6e..d01785a8fc0b1 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -5,6 +5,7 @@ , glib , gtk3 , itstool +, libdazzle , libxml2 , meson, ninja , pango @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.32.0"; + version = "3.34.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw"; + sha256 = "0b7rpwvs5wckiy418vs0d4i62wafpcx1zlspw39ag50d1sjcbv58"; }; nativeBuildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ]; + buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" From 374ae1b4ec7b3e5d0a94c409f3251497781cddeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 00:02:39 +0000 Subject: [PATCH 106/197] =?UTF-8?q?vte:=200.56.3=20=E2=86=92=200.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: worldofpeace --- pkgs/development/libraries/vte/default.nix | 62 ++++++++++++++++------ 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 35bc881d3d1ca..b3f1d9306f155 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -1,36 +1,67 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls -, gperf, pcre2 +{ stdenv +, fetchurl +, gettext +, pkgconfig +, meson +, ninja +, gnome3 +, glib +, gtk3 +, gobject-introspection +, vala +, libxml2 +, gnutls +, gperf +, pango +, pcre2 +, fribidi +, zlib }: stdenv.mkDerivation rec { pname = "vte"; - version = "0.56.3"; + version = "0.58.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p"; + sha256 = "0ifvza9sdrkxxqq7m9i7ry23sv7widjz6nzbvgc60kpph4fmf187"; }; passthru = { updateScript = gnome3.updateScript { packageName = pname; }; }; - nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ]; - buildInputs = [ glib gtk3 ncurses ]; + nativeBuildInputs = [ + gettext + gobject-introspection + gperf + libxml2 + meson + ninja + pkgconfig + vala + ]; - propagatedBuildInputs = [ - # Required by vte-2.91.pc. - gtk3 + buildInputs = [ + fribidi gnutls pcre2 + zlib ]; - preConfigure = "patchShebangs ."; - - configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ]; + propagatedBuildInputs = [ + # Required by vte-2.91.pc. + gtk3 + glib + pango + ]; - enableParallelBuilding = true; + postPatch = '' + patchShebangs perf/* + patchShebangs src/box_drawing_generate.sh + ''; meta = with stdenv.lib; { homepage = https://www.gnome.org/; @@ -45,7 +76,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2; maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } - From 12f9e847ff64ab77174d4ed622fa1cab259e4ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 2 Sep 2019 16:46:06 +0000 Subject: [PATCH 107/197] =?UTF-8?q?yelp:=203.32.2=20=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/yelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 7e326dd1657d3..438c71c4ad307 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "3.32.2"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; + sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; From 90b8ac0ff37205f868bd176583aa8a8a265134ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 02:45:42 +0200 Subject: [PATCH 108/197] vte-ng: fix build vte now uses meson so don't bother overriding vte. --- pkgs/development/libraries/vte/ng.nix | 44 +++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index c00be4c008f7d..af4fe76840fec 100644 --- a/pkgs/development/libraries/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -1,6 +1,10 @@ -{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf +, stdenv, fetchurl, intltool, pkgconfig +, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls +, pcre2 +}: -vte.overrideAttrs (oldAttrs: rec { +stdenv.mkDerivation rec { name = "vte-ng-${version}"; version = "0.54.2.a"; @@ -20,8 +24,36 @@ vte.overrideAttrs (oldAttrs: rec { }) ]; - preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; + nativeBuildInputs = [ + gtk-doc autoconf automake gettext libtool gperf + gobject-introspection intltool pkgconfig vala gperf libxml2 + ]; + buildInputs = [ glib gtk3 ncurses ]; + + propagatedBuildInputs = [ + # Required by vte-2.91.pc. + gtk3 + gnutls + pcre2 + ]; - nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ [ gtk-doc autoconf automake gettext libtool gperf ]; -}) + preConfigure = "patchShebangs .; NOCONFIGURE=1 ./autogen.sh"; + + configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ]; + + meta = with stdenv.lib; { + homepage = https://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.unix; + }; +} From 29984810d20c2cbafb2e2779c2cb70e81bcd6f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 02:53:00 +0200 Subject: [PATCH 109/197] gcolor3: fix build --- pkgs/applications/graphics/gcolor3/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index c7555b612f7ba..67be3ba6782c8 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook +, fetchpatch }: let version = "2.3.1"; @@ -14,6 +15,14 @@ in stdenv.mkDerivation { sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; }; + patches = [ + # Remove useage of deprecrated G_PARAM_PRIVATE + (fetchpatch { + url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; + sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; + }) + ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 hicolor-icon-theme ]; From afe005329aed1ad87662c848a320ee72a770a6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 21:29:54 +0200 Subject: [PATCH 110/197] gnome3.gpaste: 3.32.0 -> 3.34.0 --- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 46ca01c1a1a19..ebedf0c81ffa5 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { - version = "3.32.0"; + version = "3.34.0"; pname = "gpaste"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1fvpl9vqmrr1w22hm0ybabn9pjfii5qj9ghnc2jzihgrn2h486v6"; + sha256 = "0mih07b3mb0m1bk8ng9175fgvdbmvsacl4v4kvdnnlnql6rh47gv"; }; patches = [ From e732933aa728ea57b2219c929e7abb322068ccb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 4 Sep 2019 13:24:13 +0200 Subject: [PATCH 111/197] networkmanager-iodine: fix build with glib-2.62 --- pkgs/tools/networking/network-manager/iodine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 27e091b6b6027..a7f5bbf145e56 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -24,8 +24,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool pkgconfig ]; - # Fixes deprecation errors with networkmanager 1.10.2 - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; configureFlags = [ "--without-libnm-glib" From 8ff1d64b431760c16154fdb5d4095ac9e051ef3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 22:42:52 +0200 Subject: [PATCH 112/197] gnucash: fix build with glib-2.62 --- pkgs/applications/office/gnucash/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9ec13c0116837..85868803ec6f7 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -43,9 +43,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; - # glib-2.58 deprecrated g_type_class_add_private - # Should probably be removed next version bump - CXXFLAGS = [ "-Wno-deprecated-declarations" ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; patches = [ ./cmake_check_symbol_exists.patch ]; From 03495ea203851f023ccfbfa9f7e78b9f671b8116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 22:43:59 +0200 Subject: [PATCH 113/197] bamf: fix build with glib-2.62 --- pkgs/development/libraries/bamf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index b1fb17b08fa95..58d44a541374c 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { # TODO: Requires /etc/machine-id doCheck = false; - # ignore deprecation errors - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; meta = with stdenv.lib; { description = "Application matching framework"; From 0b45e79490c2874fee18875acf490a5401325a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 22:45:31 +0200 Subject: [PATCH 114/197] libunique: fix build with glib-2.62 --- pkgs/development/libraries/libunique/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index b96fdf5eeddc3..e0022411221d5 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; # Patches from Gentoo portage patches = [ From 36a95c772ac56ef4fae4dc8d116d77a081e1b021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 22:46:09 +0200 Subject: [PATCH 115/197] ldmtool: fix build with glib-2.62 --- pkgs/tools/misc/ldmtool/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index b59c46a847796..d1d3996bd6201 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, - libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }: + libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl +, fetchpatch }: stdenv.mkDerivation rec { pname = "ldmtool"; @@ -12,13 +13,21 @@ stdenv.mkDerivation rec { sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; }; + patches = [ + # Remove useage of deprecrated G_PARAM_PRIVATE + (fetchpatch { + url = "https://github.com/mdbooth/libldm/commit/ee1b37a034038f09d61b121cc8b3651024acc46f.patch"; + sha256 = "02y34kbcpcpffvy1n9yqngvdldmxmvdkha1v2xjqvrnclanpigcp"; + }) + ]; + preConfigure = '' sed -i docs/reference/ldmtool/Makefile.am \ -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' ''; - # ldm.c:951:5: error: 'g_type_class_add_private' is deprecated [-Werror=deprecated-declarations] - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; configureScript = "sh autogen.sh"; From a993a06a2f2bbffbc98c2c61d8249c1d33f431cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 23:00:47 +0200 Subject: [PATCH 116/197] xlog: fix build with glib-2.62 --- pkgs/applications/radio/xlog/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 7b9cf0a4ee552..3434c0624ed57 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + buildInputs = [ glib pkgconfig gtk2 hamlib ]; meta = with stdenv.lib; { From b85523cf8449438647a975f2efadd87fcd6cfad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 23:10:54 +0200 Subject: [PATCH 117/197] purple-matrix: fix build with glib-2.62 --- .../pidgin-plugins/purple-matrix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 310d419718fe7..8a15a3bdd85ea 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; From 203ba052b2c09211d64fa08e58020424687ec1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 23:21:34 +0200 Subject: [PATCH 118/197] openjfx12: fix build with glib-2.62 --- pkgs/development/compilers/openjdk/openjfx/12.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 418c58ac683ef..356ac4800d9f9 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -83,6 +83,9 @@ in makePackage { cp -r build/modular-sdk $out ''; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + stripDebugList = [ "." ]; postFixup = '' From 1905a6d01eab8ad5dcadd3189937cdbf25a0881e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 14 Sep 2019 23:22:01 +0200 Subject: [PATCH 119/197] openjfx11: fix build with glib-2.62 --- pkgs/development/compilers/openjdk/openjfx/11.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 9e6d30efda817..43fe8ed83876c 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -83,6 +83,9 @@ in makePackage { cp -r build/modular-sdk $out ''; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + stripDebugList = [ "." ]; postFixup = '' From 4885a9522211532a5b05b426a356da5a4306ffe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Sep 2019 02:20:32 +0200 Subject: [PATCH 120/197] putty: fix build with glib-2.62 --- pkgs/applications/networking/remote/putty/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 3b7db7075bb59..d8dc33c944e29 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); From ade2073064887c2312ed1a78c3bdf3a54e4b3734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Sep 2019 02:04:56 +0000 Subject: [PATCH 121/197] =?UTF-8?q?gnome3.gnome-backgrounds:=203.32.0=20?= =?UTF-8?q?=E2=86=92=203.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index e4c772cb1d407..4b91b3219bede 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "3.32.0"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; + sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2"; }; passthru = { From 6a35bd4fcf763dd1d35365bd56ceda5e213a3b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Sep 2019 02:05:16 +0000 Subject: [PATCH 122/197] =?UTF-8?q?grilo:=200.3.9=20=E2=86=92=200.3.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dropped the meson_options patch, not sure if it was necessary. --- pkgs/development/libraries/grilo/default.nix | 25 ++++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b2a7f0bd5aef0..79ccc9319720a 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, fetchpatch +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 , libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; - version = "0.3.9"; # if you change minor, also change ./setup-hook.sh + version = "0.3.10"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,30 +13,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"; + sha256 = "1s7ilyywf18q26aj5c4709kfizqywjlnacp4jzmj9v9i9kkv4i3y"; }; setupHook = ./setup-hook.sh; mesonFlags = [ - "-Dgtk_doc=true" - ]; - - patches = [ - # https://gitlab.gnome.org/GNOME/grilo/merge_requests/45 - # commits are from a separate branch so they shouldn't 404 - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/f6993c2a8a6c1a6246372569f9f7a9179955c95e.patch"; - sha256 = "1x4s0ahs60dqyphgv2dy3x2sjnxv5ydd55kdlcjsys5870ijwbi8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/61bca28b141162a33eb2fb575ef1daf0f21c7741.patch"; - sha256 = "1147xbmaq61myfwxz0pagdv056krfmh1s78qjbiy5k7k203qrjz0"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/worldofpeace/grilo/commit/363b198a062eeb8aaa5489ea9720e69d428e885c.patch"; - sha256 = "01w1bfzdbnxy5l37b2z7a9h2mrxziqkzdw02dybjphy85nb0hz5w"; - }) + "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ From 7817c878b34b38dc71c8c7380d4d9ac66ca5a1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Sep 2019 02:05:18 +0000 Subject: [PATCH 123/197] =?UTF-8?q?gnome3.grilo-plugins:=200.3.9=20?= =?UTF-8?q?=E2=86=92=200.3.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/grilo-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 118a910a16837..435da107fcb12 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.9"; + version = "0.3.10"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hv84b56qjic8vz8iz46ikhrxx31l29ilbr8dm5qcghbd8ikw8j1"; + sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0"; }; nativeBuildInputs = [ From 8ca630391f580ccf938b764989f821d608611815 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 15 Sep 2019 16:00:03 -0400 Subject: [PATCH 124/197] libsecret: 0.18.8 -> 0.19.1 --- pkgs/development/libraries/libsecret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 6c2723bbd907f..6c14269c2d506 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.18.8"; + version = "0.19.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv"; + sha256 = "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5"; }; postPatch = '' From 345ef1cfe0b86b74178b7f666f956fd7de23387c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 15 Sep 2019 16:35:43 -0400 Subject: [PATCH 125/197] gnome3.gnome-autoar: cleanup * enable vapi * multi outputs * correct Inputs --- .../gnome-3/misc/gnome-autoar/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index c8d26988391db..8ccf5107046b1 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -1,11 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gnome3 -, gtk3, glib, gobject-introspection, libarchive +{ stdenv +, fetchurl +, pkgconfig +, gnome3 +, gtk3 +, glib +, gobject-introspection +, libarchive +, vala }: stdenv.mkDerivation rec { pname = "gnome-autoar"; version = "0.2.3"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; @@ -15,9 +24,20 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib ]; - propagatedBuildInputs = [ libarchive gobject-introspection ]; + nativeBuildInputs = [ + gobject-introspection + pkgconfig + vala + ]; + + buildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + libarchive + glib + ]; meta = with stdenv.lib; { platforms = platforms.linux; From 90b0e3c19f8c9d7af12de9fae7c7958a177ddbda Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 15 Sep 2019 16:49:42 -0400 Subject: [PATCH 126/197] gnome3.gnome-shell: enable extensions_tool --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 92578ef2798f6..6c26c8c4fa406 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -5,7 +5,8 @@ , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 -, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }: +, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon +, gnome-autoar, asciidoc-full }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -25,7 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales - sassc desktop-file-utils libxslt.bin python3 + sassc desktop-file-utils libxslt.bin python3 asciidoc-full ]; buildInputs = [ systemd caribou @@ -39,6 +40,7 @@ in stdenv.mkDerivation rec { at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon gst_all_1.gst-plugins-good # recording gobject-introspection + gnome-autoar # not declared at build time, but typelib is needed at runtime libgweather networkmanagerapplet @@ -49,8 +51,6 @@ in stdenv.mkDerivation rec { caribou ]; - mesonFlags = [ "-Dextensions_tool=false" ]; - patches = [ (fetchpatch { name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; From fc43be57f0f475e9f506ded26abc615ad1bac5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 15 Sep 2019 13:30:04 +0200 Subject: [PATCH 127/197] nixos/gdm: start after getty@tty1 GDM is now killed if tty1 is started after gdm is launched. This follows upstream's gdm service config. This might cause problems with nixos-rebuild switch though. See the reasoning and work that led to not following upstream on this: https://github.com/NixOS/nixpkgs/issues/21439 4a180da c46d4da --- nixos/modules/services/x11/display-managers/gdm.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6c7853966139d..8edefd592a1a8 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -159,6 +159,10 @@ in "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" + "getty@tty1.service" + ]; + systemd.services.display-manager.conflicts = [ + "getty@tty1.service" ]; systemd.services.display-manager.serviceConfig = { From d27212d466d0e79c3d9781b60aa3374d234370c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Sep 2019 07:19:00 +0200 Subject: [PATCH 128/197] nixos/gnome3: enable systemd session - register gnome-session and gnome-settings-daemon services. - gnome-shell is already registered due to having a xdg portal - manually specify that gsd is wanted by gnome-session (systemd.packages doesn't pick the .wants directories for some reason) --- .../services/x11/desktop-managers/gnome3.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 30c5250221c19..b625f592efa78 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -236,7 +236,23 @@ in services.gvfs.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; - systemd.packages = [ pkgs.gnome3.vino ]; + + systemd.packages = with pkgs.gnome3; [ vino gnome-session gnome-settings-daemon ]; + + # gnome-settings-daemon.nix is shared between several desktop + # environments (eg. mate and pantheon) so specify these gnome-shell specific + # service dependencies here instead. + systemd.user.targets."gnome-session-initialized".wants = [ + "gsd-a11y-settings.target" "gsd-housekeeping.target" "gsd-power.target" + "gsd-color.target" "gsd-keyboard.target" "gsd-print-notifications.target" + "gsd-datetime.target" "gsd-media-keys.target" "gsd-rfkill.target" + "gsd-screensaver-proxy.target" "gsd-sound.target" "gsd-smartcard.target" + "gsd-sharing.target" "gsd-wacom.target" "gsd-wwan.target" + ]; + + systemd.user.targets."gnome-session-x11-services".wants = [ + "gsd-xsettings.target" + ]; services.avahi.enable = mkDefault true; From b916c657066277e8d30c5061caf4e2068f64f380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Sep 2019 10:49:58 +0200 Subject: [PATCH 129/197] gnome3.gnome-shell: hardcode gsettings path --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 1 + pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 6c26c8c4fa406..abd467d2aa4d3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation rec { (substituteAll { src = ./fix-paths.patch; inherit libgnomekbd unzip; + gsettings = "${glib.bin}/bin/gsettings"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch index 9cb9655b72e55..7b93475619b2c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch @@ -19,3 +19,12 @@ + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); } }); +--- a/data/gnome-shell-disable-extensions.service ++++ b/data/gnome-shell-disable-extensions.service +@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer + [Service] + Type=simple + # Disable extensions +-ExecStart=gsettings set org.gnome.shell disable-user-extensions true ++ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true + Restart=no From a821167046d808365c667e13db44ebba5a680a89 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 16 Sep 2019 10:38:36 -0400 Subject: [PATCH 130/197] gnome3.mutter: enable profiler This needed a patch to get the correct directory to the sysprof dbus interface. --- ...gconfig_variable-for-sysprof-dbusdir.patch | 25 +++++++++++++++++++ pkgs/desktops/gnome-3/core/mutter/default.nix | 5 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch new file mode 100644 index 0000000000000..2df70ff9646a1 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch @@ -0,0 +1,25 @@ +From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Mon, 16 Sep 2019 11:18:27 -0400 +Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir + +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 182f7f5f5..43060865b 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -710,7 +710,7 @@ if have_profiler + 'backends/meta-profiler.h', + ] + +- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') ++ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces') + sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') + + dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', +-- +2.22.1 + diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 8022a0b110c8a..6c4d7a97ba24b 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland-path=${xwayland}/bin/Xwayland" "-Dinstalled_tests=false" # TODO: enable these - "-Dprofiler=false" ]; propagatedBuildInputs = [ @@ -51,7 +50,7 @@ stdenv.mkDerivation rec { geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire xwayland - gnome-settings-daemon # sysprof + gnome-settings-daemon sysprof ]; patches = [ @@ -60,6 +59,8 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch"; sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf"; }) + # TODO: submit upstream + ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch (substituteAll { src = ./fix-paths.patch; inherit zenity; From c95786fcfab441ec2426bbccb54c0fb0631463dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:46:10 +0200 Subject: [PATCH 131/197] stupidterm: fix build with updated vte vte no longer propagates pcre2 --- pkgs/applications/misc/stupidterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index ecaf9d5a34a2d..a3247b29fb8e1 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: +{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vte gtk ]; + buildInputs = [ vte gtk pcre2 ]; src = fetchFromGitHub { owner = "esmil"; From a7d9f9096cff1f7eff52fa726609086c9d497671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:48:07 +0200 Subject: [PATCH 132/197] xfce4-14.xfce4-terminal: fix build with updated vte vte no longer propagates pcre2. --- pkgs/desktops/xfce4-14/xfce4-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix index 78e98e9ea7de3..3b9cd268d55ae 100644 --- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }: +{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2 }: mkXfceDerivation { category = "apps"; @@ -7,7 +7,7 @@ mkXfceDerivation { sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; - buildInputs = [ gtk3 libxfce4ui vte xfconf ]; + buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; meta = { description = "A modern terminal emulator"; From 51770cb77e0f440d831f8e9d4fa9a362ffb18d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:50:31 +0200 Subject: [PATCH 133/197] deepin.deepin-terminal: fix build with updated vte vte no longer propagates pcre2 and gnutls --- pkgs/desktops/deepin/deepin-terminal/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 59789bd84bbeb..11032fba0e792 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala, gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, - libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, + libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { pcre vte wnck + gnutls + pcre2 ]; postPatch = '' From ecc32f8df47013ad2208002ea1538fabbbe2cf3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:37:29 +0200 Subject: [PATCH 134/197] networkmanager_strongswan: fix build with glib-2.62 --- pkgs/tools/networking/network-manager/strongswan.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 60c344e8eb4b0..448fef4226afa 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - # Fixes deprecation errors with networkmanager 1.10.2 - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; configureFlags = [ "--without-libnm-glib" From cc4c198dcacbbdd6fa49f57b336b2985a35ec34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 10:00:56 +0200 Subject: [PATCH 135/197] sakura: fix build with updated vte vte no longer propagates pcre2. --- pkgs/applications/misc/sakura/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 8510d50194249..ede1995f92752 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; - buildInputs = [ makeWrapper gtk3 vte pcre glib ]; + buildInputs = [ makeWrapper gtk3 vte pcre2 glib ]; # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; From 1c5dac0fb26463906a9d1af103c5d83b15f62c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:54:00 +0200 Subject: [PATCH 136/197] roxterm: fix build with updated vte vte no longer propagates pcre2 --- pkgs/applications/misc/roxterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 3dbe7790d185f..efd2ddad22162 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,6 +1,6 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs -, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre +, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; buildInputs = - [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp + [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit ]; From 8fa7740aa7e02b875fdaf3df974a4ffdf575a5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:55:46 +0200 Subject: [PATCH 137/197] planner: fix build with glib-2.62 --- pkgs/applications/office/planner/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 687b83948cd18..f454d8830cba0 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -45,6 +45,9 @@ in stdenv.mkDerivation { python2.pkgs.pygtk ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + preConfigure = ''./autogen.sh''; configureFlags = [ "--enable-python" From f82064919c274a2a759a975e33878b70118c939f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 17 Sep 2019 09:56:44 +0200 Subject: [PATCH 138/197] pidgin-sipe: fix build with glib-2.62 --- .../instant-messengers/pidgin-plugins/sipe/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 5b3e09440a63d..6180f531f47f9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin gmime libxml2 nss ]; enableParallelBuilding = true; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; meta = with stdenv.lib; { From e3bece77a7b51ad85c81589809eb498563cccf92 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 19:08:00 -0400 Subject: [PATCH 139/197] gnome3.gnome-todo: fix build with libecal 2.0 --- pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index dbbbb43659ba3..f5c4eedc48d57 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation rec { }; patches = [ - # fix build with e-d-s 3.32 + # fix build with libecal 2.0 (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch; - sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy"; + name = "gnome-todo-eds-libecal-2.0.patch"; + url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch"; + sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq"; }) ]; postPatch = '' From a9633e883d18a5bdb668e993b825edda2ac2b13b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 19:12:04 -0400 Subject: [PATCH 140/197] gnome3.nautilus-sendto: remove Upstream doesn't recommended its use/ it's archived [0] [0]: https://github.com/GNOME/gnome-build-meta/commit/ba9f5e257cd430d01e7c53aaed8e9a26975760e6 --- .../gnome-3/apps/nautilus-sendto/default.nix | 31 ------------------- pkgs/desktops/gnome-3/default.nix | 4 +-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix diff --git a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix deleted file mode 100644 index 7ac8b4dfe1165..0000000000000 --- a/pkgs/desktops/gnome-3/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, meson, ninja, glib, pkgconfig, gnome3, appstream-glib, gettext }: - -let - pname = "nautilus-sendto"; - version = "3.8.6"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/3.8/${name}.tar.xz"; - sha256 = "164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d"; - }; - - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib gettext ]; - buildInputs = [ glib ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 370733798affc..f082dd1584bab 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -215,8 +215,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-weather = callPackage ./apps/gnome-weather { }; - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - polari = callPackage ./apps/polari { }; seahorse = callPackage ./apps/seahorse { }; @@ -356,4 +354,6 @@ lib.makeScope pkgs.newScope (self: with self; { corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`"; optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`"; gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`"; + + nautilus-sendto = throw "deprecated 2019-09-17: abandoned"; }) From 08fc2fc7497470336a9018d8c0f57c8019e32bc9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Aug 2019 21:46:42 +0200 Subject: [PATCH 141/197] gnome-firmware-updater: init at 3.34.0 Co-authored-by: worldofpeace --- .../misc/gnome-firmware-updater/default.nix | 76 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/applications/misc/gnome-firmware-updater/default.nix diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix new file mode 100644 index 0000000000000..f05c5fd210c4f --- /dev/null +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchFromGitLab +, fetchpatch +, appstream-glib +, desktop-file-utils +, fwupd +, gettext +, glib +, gnome3 +, gtk3 +, libsoup +, libxmlb +, meson +, ninja +, pkgconfig +, systemd +, help2man +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-firmware-updater"; + version = "3.34.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "hughsie"; + repo = "gnome-firmware-updater"; + rev = version; + sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; + }; + + patches = [ + # Fixes manual build + (fetchpatch { + url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; + sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; + sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; + }) + ]; + + nativeBuildInputs = [ + appstream-glib # for ITS rules + desktop-file-utils + gettext + help2man + meson + ninja + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + fwupd + glib + gtk3 + libsoup + libxmlb + systemd + ]; + + mesonFlags = [ + "-Dconsolekit=false" + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; + description = "Tool for installing firmware on devices"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 243883874fc39..ea4077a9d2349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9633,6 +9633,8 @@ in gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {}; + gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {}; + gnome-hexgl = callPackage ../games/gnome-hexgl {}; gnome-usage = callPackage ../applications/misc/gnome-usage {}; From 2e4f06c4d2e3d9746e4ed4a12d9525976c9f2508 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 19:43:18 -0400 Subject: [PATCH 142/197] pantheon.elementary-calendar: 5.0 -> 2019-09-17 This is needed for the libical 2.0 compat that landed in master [0] [0]: https://github.com/elementary/calendar/issues/404 --- .../desktops/pantheon/apps/elementary-calendar/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index b806c085f8446..72983c8479c43 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -25,21 +25,22 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.0"; + version = "unstable-2019-09-17"; repoName = "calendar"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = version; - sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35"; + rev = "46346e48b53e9d3d59d9f567b622532338f50f32"; # needed for libical 2.0 compat + sha256 = "04xzczcj5rbzqlhmf175d8p0wzw01s4658v5jllrp8nchmndb986"; }; passthru = { updateScript = pantheon.updateScript { inherit repoName; attrPath = pname; + versionPolicy = "master"; }; }; From 70f24029dd9c18257566951f8584fa417f57a947 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 13:42:53 -0400 Subject: [PATCH 143/197] gnome3.gnome-sound-recorder: 3.32.1 -> 3.34.0 --- pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 907c0424454a1..667750b012e0c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.32.1"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q83b6dabckmwj8mcw0wvhbxaszwdzzcf8ajx5bldll3lyl5yh2b"; + sha256 = "1i442qas2dkp5d9j9j1z1jicb4cb7jkgbcl4c36bmhvaq3hddwa9"; }; nativeBuildInputs = [ From d82ed7e741780184a029419f2a4f46a9557f2aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Wed, 18 Sep 2019 09:04:26 +0200 Subject: [PATCH 144/197] lxqt-archiver: 0.0.96 -> 2019-09-15 fix build with glib-2.62 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index da90826116f29..07a603364d789 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,13 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: mkDerivation rec { - pname = "lxqt-archiver"; - version = "0.0.96"; + # pname = "lxqt-archiver"; + pname = "lxqt-archiver-unstable"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; - rev = version; + rev = "1e657b6a3e68c32f042d583872eca39a5d4b820f"; sha256 = "1vc9pzxrhznp65gdkzj3fzzivfqy712mwcxp3r25ar59d54alfpj"; }; From 393e96b3fac51139c134209c5d4f2738506b140e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 18 Sep 2019 13:01:09 -0500 Subject: [PATCH 145/197] gtk3: 3.24.10 -> 3.24.11 --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index aee97d9bad00c..3f599a7846fc9 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -45,7 +45,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.10"; + version = "3.24.11"; outputs = [ "out" "dev" ]; outputBin = "dev"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "00qvq1r96ikdalv7xzgng1kad9i0rcahqk01gwhxl3xrw83z3a1m"; + sha256 = "1598k357xvffbswsrvc63lyj73wq0b510lhg4vcgl6rf1a6nb9yv"; }; patches = [ From ec52a8a1ef0a686e1a2b028a358527f6a11abc34 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 19:48:32 -0400 Subject: [PATCH 146/197] glibmm: 2.60.0 -> 2.62.0 --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 829dca04c18c5..18963e31b6e2c 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.60.0"; + version = "2.62.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3"; + sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"; }; outputs = [ "out" "dev" ]; From edc4d08f45feb6f0a4542e47b7ee2699d96ba182 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 23:50:20 -0400 Subject: [PATCH 147/197] vala_0_44: 0.44.6 -> 0.44.7 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 15ed7f8bd29d0..9c07745e9eef4 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_44 = generic { - version = "0.44.6"; - sha256 = "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb"; + version = "0.44.7"; + sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz"; }; vala = vala_0_44; From 14bcc08c434b98a344d61947d36d16c59a466eb4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 23:53:21 -0400 Subject: [PATCH 148/197] vala_0_38: remove --- pkgs/development/compilers/vala/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 9c07745e9eef4..4b1bf69f4e219 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -22,10 +22,6 @@ let }; in { - "0.38" = fp { - commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263"; - sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp"; - }; # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 # We've fixed the single merge conflict in the following patch. @@ -112,12 +108,6 @@ in rec { sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar"; }; - vala_0_38 = generic { - version = "0.38.10"; - sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw"; - extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool; - }; - vala_0_40 = generic { version = "0.40.16"; sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea4077a9d2349..4666973902100 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8517,7 +8517,6 @@ in inherit (callPackage ../development/compilers/vala { }) vala_0_36 - vala_0_38 vala_0_40 vala_0_42 vala_0_44 From 6b4bdd626b128a8e8c9927c6361b29990a46a477 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 18 Sep 2019 23:54:44 -0400 Subject: [PATCH 149/197] vala_0_36: 0.36.19 -> 0.36.20 --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 4b1bf69f4e219..ea134f5aa8dc6 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -104,8 +104,8 @@ let in rec { vala_0_36 = generic { - version = "0.36.19"; - sha256 = "05si2f4zjvq0q3wqfh1wxdq20jy1xqxq2skqh8vfh2jyp355lwar"; + version = "0.36.20"; + sha256 = "19v7zjhr9yxkh9lxg46n9gjr0lb7j6v0xqfhrdvgz18xhj3hm5my"; }; vala_0_40 = generic { From 2c4fd1512cc143ec2f0607887ffb7d375a01c056 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 00:09:18 -0400 Subject: [PATCH 150/197] vala_0_46: init at 0.46.1 --- pkgs/development/compilers/vala/default.nix | 7 + .../vala/disable-graphviz-0.46.1.patch | 261 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 269 insertions(+) create mode 100644 pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ea134f5aa8dc6..eeb4b5431fed0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -39,6 +39,8 @@ let # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.44" = ./disable-graphviz-0.44.3.patch; + "0.46" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -123,5 +125,10 @@ in rec { sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz"; }; + vala_0_46 = generic { + version = "0.46.1"; + sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l"; + }; + vala = vala_0_44; } diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch new file mode 100644 index 0000000000000..8c3e54b6a9591 --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.46.1.patch @@ -0,0 +1,261 @@ +diff --git a/Makefile.am b/Makefile.am +index f70234759..b3d6c3833 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,19 +13,9 @@ SUBDIRS = \ + doc \ + gobject-introspection \ + vapigen \ +- $(NULL) +- +-if ENABLE_VALADOC +-SUBDIRS += \ + libvaladoc \ + valadoc \ + $(NULL) +-endif +- +-DISTCHECK_CONFIGURE_FLAGS = \ +- --enable-valadoc \ +- --enable-unversioned \ +- $(NULL) + + if ENABLE_UNVERSIONED + aclocaldir = $(datadir)/aclocal +diff --git a/configure.ac b/configure.ac +index 6de326bbb..91f159b16 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,10 +160,11 @@ AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + + AC_ARG_WITH(cgraph, AS_HELP_STRING([--with-cgraph], [Required flag for cross-compilation to define capability of graphviz]), [], with_cgraph=check) +-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) +-if test x$enable_valadoc = xyes; then ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) + AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" + cgraph_tmp_LIBADD="$LIBADD" + cgraph_tmp_CFLAGS="$CFLAGS" + LIBADD="$LIBADD $LIBGVC_LIBS" +@@ -201,8 +202,8 @@ if test x$enable_valadoc = xyes; then + LIBADD="$cgraph_tmp_LIBADD" + CFLAGS="$cgraph_tmp_CFLAGS" + fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") +-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) + AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index d2684a0e0..b343c7c10 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -6,16 +6,11 @@ SUBDIRS = \ + + dist_man_MANS = \ + valac.1 \ ++ valadoc.1 \ + vala-gen-introspect.1 \ + vapigen.1 \ + $(NULL) + +-if ENABLE_VALADOC +-dist_man_MANS += \ +- valadoc.1 \ +- $(NULL) +-endif +- + EXTRA_DIST = \ + valac.h2m \ + valadoc.h2m \ +@@ -24,11 +19,7 @@ EXTRA_DIST = \ + $(NULL) + + if HAVE_HELP2MAN +-if ENABLE_VALADOC + manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 +-else +-manpages: valac.1 vala-gen-introspect.1 vapigen.1 +-endif + @rm $^ + $(MAKE) $(AM_MAKEFLAGS) $^ + +@@ -37,13 +28,11 @@ valac.1: + --include $(srcdir)/valac.h2m \ + --libtool --no-info \ + --output=$@ +-if ENABLE_VALADOC + valadoc.1: + $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ + --include $(srcdir)/valadoc.h2m \ + --libtool --no-info \ + --output=$@ +-endif + vala-gen-introspect.1: + $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ + --include $(srcdir)/vala-gen-introspect.h2m \ +@@ -60,15 +49,12 @@ endif + if ENABLE_UNVERSIONED + install-data-hook: + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1 +-if ENABLE_VALADOC + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1 +-endif + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1 + endif + + +-if ENABLE_VALADOC + COMMON_VALADOCFLAGS = \ + --force \ + --verbose \ +@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen + @touch $@ + + internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc +-endif + + clean-local: + rm -rf $(builddir)/internal-apis +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index 8a3924b54..81fde9ac8 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala +index 46578c28f..f6ce7097c 100644 +--- a/libvaladoc/html/basicdoclet.vala ++++ b/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- a/libvaladoc/html/htmlmarkupwriter.vala ++++ b/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4666973902100..033d978b1afab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8520,6 +8520,7 @@ in vala_0_40 vala_0_42 vala_0_44 + vala_0_46 vala; valadoc = callPackage ../development/tools/valadoc { }; From 628bb2ae0a5f33cfe81c0eb3fa62faf0e4121513 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 00:13:17 -0400 Subject: [PATCH 151/197] vala_0_42: remove --- pkgs/desktops/deepin/default.nix | 2 +- pkgs/development/compilers/vala/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 869f08154bbb5..61db4ca05713f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -39,7 +39,7 @@ let deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { - vala = pkgs.vala_0_42; + vala = pkgs.vala_0_40; }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index eeb4b5431fed0..9f4d8b6686070 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -28,11 +28,6 @@ let # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch "0.40" = ./disable-graphviz-0.40.12.patch; - "0.42" = fp { - commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8"; - sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g"; - }; - # NOTE: the openembedded-core project doesn't have a patch for 0.44.1 # We've reverted the addition of the "--disable-valadoc" option # and then applied the following patch. @@ -115,11 +110,6 @@ in rec { sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b"; }; - vala_0_42 = generic { - version = "0.42.7"; - sha256 = "029ksbsdpl581wzy570kj4kkw8b4bizgh494c051zsvkwck55p83"; - }; - vala_0_44 = generic { version = "0.44.7"; sha256 = "0z5xy4qc95rm2gj7s2k14xm1xp3mrf0yz64fx4kddqjxkpsz87xz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 033d978b1afab..72c818a455e9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8518,7 +8518,6 @@ in inherit (callPackage ../development/compilers/vala { }) vala_0_36 vala_0_40 - vala_0_42 vala_0_44 vala_0_46 vala; From 9e6896cb59a0f948b3d8ddf7dd7b302ed5b728b0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 00:26:36 -0400 Subject: [PATCH 152/197] vala: use vala_0_46 --- pkgs/development/compilers/vala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 9f4d8b6686070..9714a8ebd5050 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -120,5 +120,5 @@ in rec { sha256 = "10czkhclnisdz6k5qfiicmvx47m9177l5dkhjn29g43khnmpkr8l"; }; - vala = vala_0_44; + vala = vala_0_46; } From 41d71bacd6f224a540ee7d58b3caa6f43b895ad5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 00:43:34 -0400 Subject: [PATCH 153/197] dee: pull in patches Fixes the deprecation warnings and vapi stuff. This also allows us to use latest vala. --- pkgs/development/libraries/dee/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 1318d9453b3e4..dd26e5eb8baab 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,11 +1,12 @@ { stdenv , fetchgit +, fetchpatch , pkgconfig , glib , icu , gobject-introspection , dbus-glib -, vala_0_40 +, vala , python3 , autoreconfHook }: @@ -18,20 +19,26 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dee"; - rev = "import/1.2.7+17.10.20170616-4ubuntu1"; - sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394"; + rev = "import/1.2.7+17.10.20170616-4ubuntu3"; + sha256 = "09blrdj7229vscp4mkg0fabmcvc6jdpamvblrq86rbky7j2nnwlk"; }; patches = [ "${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/strict-prototype.patch" - "${src}/debian/patches/icu-pkg-config.patch" + "${src}/debian/patches/vapi-skip-properties.patch" + + # Fixes glib 2.62 deprecations + (fetchpatch { + name = "dee-1.2.7-deprecated-g_type_class_add_private.patch"; + url = "https://src.fedoraproject.org/rpms/dee/raw/1a9a4ce3377074fabfca653ffe0287cd73aef82f/f/dee-1.2.7-deprecated-g_type_class_add_private.patch"; + sha256 = "13nyprq7bb7lnzkcb7frcpzidbl836ycn5bvmwa2k0nhmj6ycbx5"; + }) ]; nativeBuildInputs = [ pkgconfig - # https://gitlab.gnome.org/GNOME/vala/issues/803 - vala_0_40 + vala autoreconfHook gobject-introspection python3 @@ -43,9 +50,6 @@ stdenv.mkDerivation rec { dbus-glib ]; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; - configureFlags = [ "--disable-gtk-doc" "--with-pygi-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" From 4ff0d1e23fe3cd431762a9a3068d964721a23525 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 00:49:13 -0400 Subject: [PATCH 154/197] umockdev: use latest vala --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72c818a455e9e..5c3bc883690b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13931,9 +13931,7 @@ in uid_wrapper = callPackage ../development/libraries/uid_wrapper { }; - umockdev = callPackage ../development/libraries/umockdev { - vala = vala_0_40; - }; + umockdev = callPackage ../development/libraries/umockdev { }; unconvert = callPackage ../development/tools/unconvert { }; From f8682c31dde566786f727e91281ce2f0ea575109 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 11:52:29 -0400 Subject: [PATCH 155/197] gnome3.gnome-initial-setup: init at 3.34.0 --- .../core/gnome-initial-setup/default.nix | 115 ++++++++++++++++++ .../core/gnome-initial-setup/fix-paths.patch | 67 ++++++++++ .../core/gnome-initial-setup/vendor.conf | 5 + pkgs/desktops/gnome-3/default.nix | 2 + 4 files changed, 189 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch create mode 100644 pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix new file mode 100644 index 0000000000000..1ca3d69672675 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -0,0 +1,115 @@ +{ stdenv +, fetchurl +, fetchpatch +, substituteAll +, gettext +, meson +, ninja +, pkgconfig +, wrapGAppsHook +, gnome3 +, accountsservice +, fontconfig +, gdm +, geoclue2 +, geocode-glib +, glib +, gnome-desktop +, gnome-getting-started-docs +, gnome-online-accounts +, gtk3 +, libgweather +, json-glib +, krb5 +, libpwquality +, librest +, libsecret +, networkmanager +, pango +, polkit +, webkitgtk +, systemd +, networkmanagerapplet +, tzdata +, yelp +, libgnomekbd +}: + +stdenv.mkDerivation rec { + pname = "gnome-initial-setup"; + version = "3.34.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "19ly8xrj7vvjlhhbh6y2cm5l02qgq9wqfczrjdn0llkga9f8b8sc"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkgconfig + systemd + wrapGAppsHook + ]; + + buildInputs = [ + accountsservice + fontconfig + gdm + geoclue2 + geocode-glib + glib + gnome-desktop + gnome-getting-started-docs + gnome-online-accounts + gtk3 + json-glib + krb5 + libgweather + libpwquality + librest + libsecret + networkmanager + pango + polkit + webkitgtk + networkmanagerapplet + ]; + + 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; + yelp = "${yelp}/bin/yelp"; # gnome-welcome-tour + }) + ]; + + mesonFlags = [ + "-Dregion-page=true" + "-Dcheese=disabled" + "-Dsoftware-sources=disabled" + "-Dibus=disabled" + "-Dvendor-conf-file=${./vendor.conf}" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "Simple, easy, and safe way to prepare a new system"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch new file mode 100644 index 0000000000000..94e14f688b3ca --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/fix-paths.patch @@ -0,0 +1,67 @@ +diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour +index c479296..3dd629c 100755 +--- a/data/gnome-welcome-tour ++++ b/data/gnome-welcome-tour +@@ -3,7 +3,7 @@ + cfgdir=${XDG_CONFIG_DIR:-$HOME/.config} + + # Don't do anything if yelp isn't installed +-yelp_path=$(which yelp 2>/dev/null) ++yelp_path=@yelp@ + if test -z "${yelp_path}"; then + rm -f $cfgdir/run-welcome-tour + exit +@@ -17,5 +17,5 @@ geometry=(1024, 709) + EOF + fi + +-yelp help:gnome-help/getting-started ++$yelp_path help:gnome-help/getting-started + rm -f $cfgdir/run-welcome-tour +diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +index 1c34ef7..a1e7f93 100644 +--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c ++++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c +@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label, + return TRUE; + + if (variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout); ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout); + g_spawn_command_line_async (commandline, NULL); + g_free (commandline); + +@@ -829,7 +829,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass) + g_param_spec_string ("showing-extra", "", "", "", + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + +- signals[CHANGED] = ++ signals[CHANGED] = + g_signal_new ("changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, +diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h +index 93905b3..e7ee785 100644 +--- a/gnome-initial-setup/pages/timezone/tz.h ++++ b/gnome-initial-setup/pages/timezone/tz.h +@@ -4,7 +4,7 @@ + * Copyright (C) 2000-2001 Ximian, Inc. + * + * Authors: Hans Petter Jansson +- * ++ * + * Largely based on Michael Fulbright's work on Anaconda. + * + * This program is free software; you can redistribute it and/or modify +@@ -28,7 +28,7 @@ + #include + + #ifndef __sun +-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" ++# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" + #else + # define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" + #endif diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf new file mode 100644 index 0000000000000..a06b37e100edc --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf @@ -0,0 +1,5 @@ +# Disable pages not right for NixOS +# For example user accounts should be preconfigured +# and we can't modify system time with systemd. +[pages] +skip=account;software;password;timezone; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f082dd1584bab..d2a377d084e01 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -79,6 +79,8 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-keyring = callPackage ./core/libgnome-keyring { }; + gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; + gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; From f9b44934bc153eff178921d764c230c53f4c720c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 15:12:18 -0400 Subject: [PATCH 156/197] nixos/gnome-initial-setup: init It tries to start during the GDM session even with the conflicts. --- nixos/modules/module-list.nix | 3 +- .../desktops/gnome3/gnome-initial-setup.nix | 56 +++++++++++++++++++ .../services/x11/desktop-managers/gnome3.nix | 1 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a648eef46e556..7a33af688e2bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -299,10 +299,11 @@ ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/glib-networking.nix + ./services/desktops/gnome3/gnome-initial-setup.nix ./services/desktops/gnome3/gnome-keyring.nix ./services/desktops/gnome3/gnome-online-accounts.nix - ./services/desktops/gnome3/gnome-remote-desktop.nix ./services/desktops/gnome3/gnome-online-miners.nix + ./services/desktops/gnome3/gnome-remote-desktop.nix ./services/desktops/gnome3/gnome-settings-daemon.nix ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/rygel.nix diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix new file mode 100644 index 0000000000000..d50624a3457e4 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix @@ -0,0 +1,56 @@ +# GNOME Initial Setup. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.gnome-initial-setup = { + + enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.gnome-initial-setup.enable { + + environment.systemPackages = [ + pkgs.gnome3.gnome-initial-setup + ]; + + systemd.packages = [ + pkgs.gnome3.gnome-initial-setup + ]; + + systemd.user.targets."gnome-session".wants = [ + "gnome-initial-setup-copy-worker.service" + "gnome-initial-setup-first-login.service" + "gnome-welcome-tour.service" + ]; + + systemd.user.targets."gnome-session@gnome-initial-setup".wants = [ + "gnome-initial-setup.service" + ]; + + # Setup conflicts + systemd.user.services."gnome-initial-setup-copy-worker".conflicts = [ + "gnome-session@gnome-login.target" + ]; + + systemd.user.services."gnome-initial-setup-first-login".conflicts = [ + "gnome-session@gnome-login.target" + "gnome-session@gnome-initial-setup.target" + ]; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index b625f592efa78..c112d4b6e4de2 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -229,6 +229,7 @@ in services.colord.enable = mkDefault true; services.gnome3.chrome-gnome-shell.enable = mkDefault true; services.gnome3.glib-networking.enable = true; + services.gnome3.gnome-initial-setup.enable = mkDefault true; services.gnome3.gnome-remote-desktop.enable = mkDefault true; services.gnome3.gnome-settings-daemon.enable = true; services.gnome3.gnome-user-share.enable = mkDefault true; From ea6aae81f1e2df347fdbffe78fc8697b2e255bff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 19:14:12 -0400 Subject: [PATCH 157/197] gnome3.gdm: add branding We use the logo key to add the NixOS text logo to GDM. --- pkgs/desktops/gnome-3/core/gdm/default.nix | 21 ++++++++++++++++++- .../org.gnome.login-screen.gschema.override | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 8659efe2c3229..37199737fc4b4 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,7 +1,21 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook , gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth -, librsvg, coreutils, xwayland }: +, librsvg, coreutils, xwayland, nixos-icons }: + +let + + icon = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/4f041870efa1a6f0799ef4b32bb7be2cafee7a74/logo/nixos.svg"; + sha256 = "0b0dj408c1wxmzy6k0pjwc4bzwq286f1334s3cqqwdwjshxskshk"; + }; + + override = substituteAll { + src = ./org.gnome.login-screen.gschema.override; + inherit icon; + }; + +in stdenv.mkDerivation rec { pname = "gdm"; @@ -65,6 +79,11 @@ stdenv.mkDerivation rec { "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; + preInstall = '' + schema_dir=${glib.makeSchemaPath "$out" "${pname}-${version}"} + install -D ${override} $schema_dir/org.gnome.login-screen.gschema.override + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "gdm"; diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override new file mode 100644 index 0000000000000..8c17f494b0f2a --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.login-screen] +logo='@icon@' From f462b376bb9ee469067e4a30c0ee52ad1ef155d5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 23:07:45 -0400 Subject: [PATCH 158/197] nixos/gdm: prevent g-i-s from running --- nixos/modules/services/x11/display-managers/gdm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 8edefd592a1a8..9f76bba998087 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -150,6 +150,11 @@ in mkdir -p /run/gdm/.config/pulse ln -sf ${pulseConfig} /run/gdm/.config/pulse/default.pa chown -R gdm:gdm /run/gdm/.config + '' + optionalString config.services.gnome3.gnome-initial-setup.enable '' + # Create stamp file for gnome-initial-setup to prevent run. + cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF + yes + EOF ''; }; From 38147b92153c50d4f229a0b734ddd0a3284f86b1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 19 Sep 2019 23:09:02 -0400 Subject: [PATCH 159/197] nixos/gnome-initial-setup: prevent run on existing systems GNOME initial setup's run is conditioned on whether the gnome-initial-setup-done file exists in XDG_CONFIG_HOME Because of this, every existing user will have initial setup running because they never ran it before. To prevent this we create the file if the users stateVersion is older than 20.03 (the release we added this module). Also drop uneeded manual conflicts as systemd.packages does handle this. --- .../desktops/gnome3/gnome-initial-setup.nix | 52 +++++++++++++++---- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix index d50624a3457e4..d715d52c2d067 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix @@ -4,6 +4,44 @@ with lib; +let + + # GNOME initial setup's run is conditioned on whether + # the gnome-initial-setup-done file exists in XDG_CONFIG_HOME + # Because of this, every existing user will have initial setup + # running because they never ran it before. + # + # To prevent this we create the file if the users stateVersion + # is older than 20.03 (the release we added this module). + + script = pkgs.writeScript "create-gis-stamp-files" '' + #!${pkgs.runtimeShell} + setup_done=$HOME/.config/gnome-initial-setup-done + + echo "Creating g-i-s stamp file $setup_done ..." + cat - > $setup_done <<- EOF + yes + EOF + ''; + + createGisStampFilesAutostart = pkgs.writeTextFile rec { + name = "create-g-i-s-stamp-files"; + destination = "/etc/xdg/autostart/${name}.desktop"; + text = '' + [Desktop Entry] + Type=Application + Name=Create GNOME Initial Setup stamp files + Exec=${script} + StartupNotify=false + NoDisplay=true + OnlyShowIn=GNOME; + AutostartCondition=unless-exists gnome-initial-setup-done + X-GNOME-Autostart-Phase=EarlyInitialization + ''; + }; + +in + { ###### interface @@ -25,7 +63,9 @@ with lib; environment.systemPackages = [ pkgs.gnome3.gnome-initial-setup - ]; + ] + ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart + ; systemd.packages = [ pkgs.gnome3.gnome-initial-setup @@ -41,16 +81,6 @@ with lib; "gnome-initial-setup.service" ]; - # Setup conflicts - systemd.user.services."gnome-initial-setup-copy-worker".conflicts = [ - "gnome-session@gnome-login.target" - ]; - - systemd.user.services."gnome-initial-setup-first-login".conflicts = [ - "gnome-session@gnome-login.target" - "gnome-session@gnome-initial-setup.target" - ]; - }; } From 84fb39ef12a71caabd4fb4a87a4892497bcb2f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 16 Sep 2019 14:06:13 +0200 Subject: [PATCH 160/197] webkitgtk: 2.24.4 -> 2.26.1 * add fix-bubblewrap-paths.patch * use clangStdenv We're running into #36947 Co-authored-by: worldofpeace --- .../libraries/webkitgtk/default.nix | 20 +++++++++++----- .../webkitgtk/fix-bubblewrap-paths.patch | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index c0fae2f717650..7d48b68d14c7a 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -6,6 +6,7 @@ , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad, woff2 +, bubblewrap, libseccomp, xdg-dbus-proxy, substituteAll }: assert enableGeoLocation -> geoclue2 != null; @@ -15,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.24.4"; + version = "2.26.1"; meta = { description = "Web content rendering engine, GTK port"; @@ -28,11 +29,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"; + sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb"; }; - patches = optionals stdenv.isDarwin [ - ## TODO add necessary patches for Darwin + patches = optionals stdenv.isLinux [ + (substituteAll { + src = ./fix-bubblewrap-paths.patch; + inherit (builtins) storeDir; + }) ]; postPatch = '' @@ -41,8 +45,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPORT=GTK" - "-DUSE_LIBHYPHEN=0" + "-DUSE_LIBHYPHEN=OFF" "-DENABLE_INTROSPECTION=ON" + "-DUSE_WPE_RENDERER=OFF" ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" @@ -73,11 +78,14 @@ stdenv.mkDerivation rec { ++ optional enableGtk2Plugins gtk2 ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] - ++ optional stdenv.isLinux wayland; + ++ optionals stdenv.isLinux [ + wayland bubblewrap libseccomp xdg-dbus-proxy + ]; propagatedBuildInputs = [ libsoup gtk3 ]; outputs = [ "out" "dev" ]; + } diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch new file mode 100644 index 0000000000000..6485ba0f261fe --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch @@ -0,0 +1,23 @@ +diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +--- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400 ++++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400 +@@ -585,7 +585,7 @@ + { SCMP_SYS(keyctl), nullptr }, + { SCMP_SYS(request_key), nullptr }, + +- // Scary VM/NUMA ops ++ // Scary VM/NUMA ops + { SCMP_SYS(move_pages), nullptr }, + { SCMP_SYS(mbind), nullptr }, + { SCMP_SYS(get_mempolicy), nullptr }, +@@ -724,6 +724,10 @@ + "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", + + "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, ++ ++ // Nix Directories ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + }; + // We would have to parse ld config files for more info. + bindPathVar(sandboxArgs, "LD_LIBRARY_PATH"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c3bc883690b6..c200860c317a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14098,7 +14098,7 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = gcc6Stdenv; + stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { From e7b7d75825471cbf7fe3194235d75dc8897ef37c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 20 Sep 2019 22:39:40 -0400 Subject: [PATCH 161/197] epiphany: 3.32.4 -> 3.34.0 --- .../gnome-3/core/epiphany/default.nix | 90 +++++++++++++++---- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c52162ce7f1d6..d583e8d1f8725 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,32 +1,90 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk3, glib, icu -, wrapGAppsHook, gnome3, libxml2, libxslt, itstool -, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit -, sqlite, gcr, isocodes, desktop-file-utils, python3, nettle -, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: +{ stdenv +, meson +, ninja +, gettext +, fetchurl +, pkgconfig +, gtk3 +, glib +, icu +, wrapGAppsHook +, gnome3 +, libxml2 +, libxslt +, itstool +, webkitgtk +, libsoup +, glib-networking +, libsecret +, gnome-desktop +, libnotify +, p11-kit +, sqlite +, gcr +, isocodes +, desktop-file-utils +, python3 +, nettle +, gdk-pixbuf +, gst_all_1 +, json-glib +, libdazzle +, libhandy +}: stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.32.4"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69"; + sha256 = "04wxnz8i0wbg21lqll2gqaa5j17f4vxqzgwgc7b0nylqi9pyd8bb"; }; # Tests need an X display - mesonFlags = [ "-Dunit_tests=disabled" ]; + mesonFlags = [ + "-Dunit_tests=disabled" + ]; nativeBuildInputs = [ - meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3 + desktop-file-utils + gettext + itstool + libxslt + meson + ninja + pkgconfig + python3 + wrapGAppsHook ]; buildInputs = [ - gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify - sqlite isocodes p11-kit icu libhandy - gdk-pixbuf gnome3.adwaita-icon-theme gcr - glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json-glib libdazzle nettle + gcr + gdk-pixbuf + glib + glib-networking + gnome-desktop + gnome3.adwaita-icon-theme + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gstreamer + gtk3 + icu + isocodes + json-glib + libdazzle + libhandy + libnotify + libsecret + libsoup + libxml2 + nettle + p11-kit + sqlite + webkitgtk ]; postPatch = '' @@ -36,7 +94,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = "epiphany"; + packageName = pname; }; }; From 752ebe1078db6f067febbd5a89873418b9b8ac41 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 21 Sep 2019 17:27:36 -0400 Subject: [PATCH 162/197] libunity: fix build with latest vala See: https://gitlab.gnome.org/GNOME/vala/issues/766 --- .../libraries/libunity/default.nix | 5 +++ .../libraries/libunity/fix-vala.patch | 36 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/libunity/fix-vala.patch diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 2baaa14b88ea2..daaf3de6bcc77 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation { libdbusmenu ]; + patches = [ + # See: https://gitlab.gnome.org/GNOME/vala/issues/766 + ./fix-vala.patch + ]; + preConfigure = '' intltoolize ''; diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch new file mode 100644 index 0000000000000..ec34229b44431 --- /dev/null +++ b/pkgs/development/libraries/libunity/fix-vala.patch @@ -0,0 +1,36 @@ +diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala +--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 +@@ -51,7 +51,7 @@ + */ + public abstract int category_index_for_scope_id (string scope_id); + +- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) ++ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) + { + Object (dbus_path: dbus_path_, id: id_, is_master: true, + merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); +diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala +--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 +@@ -61,7 +61,7 @@ + internal CategorySet _categories; + internal FilterSet _filters; + +- public DeprecatedScopeBase (string dbus_path_, string id_) ++ protected DeprecatedScopeBase (string dbus_path_, string id_) + { + Object (dbus_path: dbus_path_, id: id_); + } +diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala +--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 ++++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 +@@ -63,7 +63,7 @@ + */ + public abstract class GridRenderer: PreviewRenderer + { +- public GridRenderer() ++ protected GridRenderer() + { + Object(); + } From 7ba3608aa0c591c7216f22311a35337dd9a7aff8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 21 Sep 2019 17:27:51 -0400 Subject: [PATCH 163/197] feedreader: fix build with latest libsecret --- .../networking/feedreaders/feedreader/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 959649c4b1509..c2fda72e36a71 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -33,6 +33,14 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + patches = [ + # Fixes build with libsecret + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch"; + sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5"; + }) + ]; + meta = with stdenv.lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; From 1252132f080e6c0d8246b9d511cebb55e5642e20 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 21 Sep 2019 17:45:51 -0400 Subject: [PATCH 164/197] midori: 7 -> 9.0 * add libarchive and json-glib We use vala_0_44 to avoid the issue with sqlite3 vapi [0] [0]: https://gitlab.gnome.org/GNOME/vala/commit/a54e4d89a449044c965869abf0ce78dadcf093ac.patch --- .../networking/browsers/midori/default.nix | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a0bc0c743e469..f87ba43f2bbad 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,24 +1,52 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas -, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking +{ stdenv +, fetchurl +, cmake +, ninja +, pkgconfig +, intltool +, vala_0_44 +, wrapGAppsHook +, gcr +, libpeas +, gtk3 +, webkitgtk +, sqlite +, gsettings-desktop-schemas +, libsoup +, glib-networking +, json-glib +, libarchive }: stdenv.mkDerivation rec { pname = "midori"; - version = "7"; + version = "9.0"; src = fetchurl { - url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz"; - sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh"; + url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz"; + sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"; }; nativeBuildInputs = [ - pkgconfig cmake ninja intltool vala wrapGAppsHook + cmake + intltool + ninja + pkgconfig + vala_0_44 + wrapGAppsHook ]; buildInputs = [ - gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) libpeas + (libsoup.override { gnomeSupport = true; }) + gcr glib-networking + gsettings-desktop-schemas + gtk3 + libpeas + sqlite + webkitgtk + json-glib + libarchive ]; meta = with stdenv.lib; { From dac8bf9ed5bbbcac38a8091c1234f79bc98e2678 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 21 Sep 2019 18:46:31 -0400 Subject: [PATCH 165/197] libpeas: correct gtk .pc file Here's the diff post meson: -prefix=/nix/store/hfrrby8wapcz17v927as18z3znqdv2ps-libpeas-1.22.0 -exec_prefix=${prefix} -libdir=${exec_prefix}/lib +prefix=/nix/store/sc8h3m6fv3zdjzpkimhm4yqarafhjp6y-libpeas-1.24.0 +libdir=${prefix}/lib includedir=${prefix}/include -Name: libpeas-gtk -Description: libpeas-gtk, a GObject plugins library (Gtk widgets) -Requires: glib-2.0 >= 2.38.0, gtk+-3.0 >= 3.0.0, libpeas-1.0 >= 1.22.0 -Version: 1.22.0 +Name: libpeas-gtk-1.0 +Description: GObject plugins library widgetery +Version: 1.24.0 +Requires.private: libpeas-1.0, glib-2.0 >= 2.38.0, gobject-2.0 >= 2.38.0, gobject-introspection-1.0 >= 1.39.0, gtk+-3.0 >= 3.0.0, gmodule-2.0 >= 2.38.0, gio-2.0 >= 2.38.0 +Libs: -L${prefix}//lib -lpeas-gtk-1.0 Cflags: -I${includedir}/libpeas-1.0 -Libs: -L${libdir} -lpeas-gtk-1.0 As we can see, all the requires got moved into private. This appears to have broken midori [0] [0]: https://hydra.nixos.org/build/101627205 --- .../development/libraries/libpeas/default.nix | 4 ++++ .../libpeas/fix-libpeas-gtk-pc.patch | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index beee52f8217cc..cdb1b95935f41 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { gobject-introspection ]; + patches = [ + ./fix-libpeas-gtk-pc.patch + ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch new file mode 100644 index 0000000000000..8016939716d9b --- /dev/null +++ b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch @@ -0,0 +1,22 @@ +diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build +index bf590de..00def42 100644 +--- a/libpeas-gtk/meson.build ++++ b/libpeas-gtk/meson.build +@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency( + sources: libpeas_gtk_dep_sources, + ) + ++libpeas_gtk_pc_reqs = [ ++ glib_dep, ++ gtk_dep, ++ package_string + ' >= @0@'.format(version) ++] ++ + libpeas_gtk_pc = pkg.generate( + libpeas_gtk_sha, + name: package_gtk_string, + description: 'GObject plugins library widgetery', ++ requires: libpeas_gtk_pc_reqs, + subdirs: package_string, + install_dir: pkgconfigdir, + ) From d935c9bc59a206ba552f27f488451179e26ddb71 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:26:52 -0400 Subject: [PATCH 166/197] gnomeExtensions.mediaplayer: remove Source repo is archived and the extension was retired [0] [0]: https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md --- .../extensions/mediaplayer/default.nix | 37 ------------------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix deleted file mode 100644 index 10175719e46c0..0000000000000 --- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: - -stdenv.mkDerivation { - pname = "gnome-shell-extensions-mediaplayer"; - version = "unstable-2019-03-21"; - - src = fetchFromGitHub { - owner = "JasonLG1979"; - repo = "gnome-shell-extensions-mediaplayer"; - rev = "b382c98481fa421501684e2ff3eafc53971ef22b"; - sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh"; - }; - - nativeBuildInputs = [ - meson - ninja - python3 - ]; - buildInputs = [ - glib - gettext - ]; - - postPatch = '' - rm build - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - meta = with stdenv.lib; { - description = "Control MPRIS Version 2 Capable Media Players"; - license = licenses.gpl2Plus; - homepage = https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/; - maintainers = with maintainers; [ tiramiseb ]; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c200860c317a8..0bca4e145f771 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22753,7 +22753,6 @@ in gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; - mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; @@ -22765,6 +22764,8 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + + mediaplayer = throw "deprecated 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; }; hsetroot = callPackage ../tools/X11/hsetroot { }; From fc8413d218c5737dce9517f213bfd007369f9960 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:47:16 -0400 Subject: [PATCH 167/197] gnomeExtensions.appindicator: 29 -> 30 --- pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 6f289fd74d9f7..910007bc05b43 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "29"; + version = "30"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "02cr6rhi3dfk49jcjm6vh7yx117bv5wqyvd34cyv1kzwzsla8v2i"; + sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8"; }; # This package has a Makefile, but it's used for building a zip for From 3b81b3a8274ce7afb0b41abf5c1e1a207ad15970 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:49:23 -0400 Subject: [PATCH 168/197] gnomeExtensions.arc-menu: 31 -> 33.2 --- pkgs/desktops/gnome-3/extensions/arc-menu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index b38f0aeba9195..cb1fa70d6819d 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arc-menu"; - version = "31"; + version = "33.2"; src = fetchFromGitLab { owner = "LinxGem33"; repo = "Arc-Menu"; - rev = "v${version}-stable"; - sha256 = "124jgdy6mw76nrkq3f0y7qkhdm39wg273zifdvwbgpvirwzxbia1"; + rev = "v${version}-dev"; + sha256 = "1dd9ysiyza6drwdv4qcxyijy7yijirjf2fd1aq5jv8s4bqajcqf4"; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { glib gettext ]; - makeFlags = [ "INSTALL_BASE=$(out)/share/gnome-shell/extensions" ]; + makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ]; meta = with stdenv.lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; From 18f2e6230a12e7c8d41c8ea66ef4ddfd673b63fd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:50:03 -0400 Subject: [PATCH 169/197] gnomeExtensions.caffeine: make as broken --- pkgs/desktops/gnome-3/extensions/caffeine/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 95a68505c7c8a..8cf9fb9f0e632 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext, bash }: +{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } From 77f1d77a3b12509ba3ee8b0cba660705e8bfc9ce Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:50:22 -0400 Subject: [PATCH 170/197] gnomeExtensions.clipboard-indicator: mark as broken --- .../gnome-3/extensions/clipboard-indicator/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 0faadbcd2b688..5277cb08cbb5b 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux; homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator; + broken = versionAtLeast gnome3.gnome-shell.version "3.26"; }; } From 006330bce48e8c7574468a6dcfe7db42380d7598 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:50:37 -0400 Subject: [PATCH 171/197] gnomeExtensions.icon-hider: mark as broken --- pkgs/desktops/gnome-3/extensions/icon-hider/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index 8214300a5311f..8bfd681625f29 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jonafato ]; platforms = gnome3.gnome-shell.meta.platforms; homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } From 4333119b64b9c712a4133c67321935afa83e5a7c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:50:57 -0400 Subject: [PATCH 172/197] gnomeExtensions.pidgin-im-integration: mark as broken --- .../gnome-3/extensions/pidgin-im-integration/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index 6f1cc3df409a0..cffe96894cc7f 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib }: +{ stdenv, fetchFromGitHub, glib, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } From d6413fc352109896680a3c270640edf3dfd16082 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:51:22 -0400 Subject: [PATCH 173/197] gnomeExtensions.remove-dropdown-arrows: 11 -> 13 --- .../gnome-3/extensions/remove-dropdown-arrows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index d9ea670db09e8..fbbd56f1c0f9f 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-remove-dropdown-arrows"; - version = "11"; + version = "13"; src = fetchFromGitHub { owner = "mpdeimos"; repo = "gnome-shell-remove-dropdown-arrows"; rev = "version/${version}"; - sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh"; + sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk"; }; # This package has a Makefile, but it's used for publishing and linting, not From 9599236469e39ada9a6504d43b66ba9b2d30a1b3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:53:03 -0400 Subject: [PATCH 174/197] gnomeExtension.sound-output-device-chooser: 2019-04-01 -> 24 --- .../extensions/sound-output-device-chooser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index 33c127f449b8f..a5f94288ae57e 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "unstable-2019-04-01"; + version = "24"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; - rev = "37098909a50bafe2f2538819f988cb2327ed7c60"; - sha256 = "09sbby8zi9xn21lbdry57bp1vwgd5c73anvqpw9css3x2ryda5li"; + rev = version; + sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x"; }; dontBuild = true; From b9f3160c2aa55f75506385683047365a457e32ba Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:53:26 -0400 Subject: [PATCH 175/197] gnomeExtension.system-monitor-applet: mark as broken --- pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 13b2d6a1db4f0..921991a33aea8 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: +{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ aneeshusa tiramiseb ]; homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; }; } From 3e0539af09ab1dfcaa1d1b31a4d0c2ca09f29632 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:53:45 -0400 Subject: [PATCH 176/197] gnomeExtension.taskwhisperer: mark as broken --- pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index 90be6aed1d798..1e44cd4de5c2e 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: +{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-taskwhisperer"; @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jonafato ]; homepage = https://github.com/cinatic/taskwhisperer; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesnt't support 3.34 }; } From eebc63aabde2eef67f3ca5c6336522c546d62e3a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:54:22 -0400 Subject: [PATCH 177/197] gnomeExtension.tilingnome: 2019-01-18 -> 2019-09-19 --- .../gnome-3/extensions/tilingnome/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 293918bd2b118..22f857a7809d7 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, glib, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-tilingnome"; - version = "unstable-2019-01-18"; + pname = "gnome-shell-extension-tilingnome-unstable"; + version = "unstable-2019-09-19"; src = fetchFromGitHub { owner = "rliang"; - repo = pname; - rev = "bd4fb8c19f7a6282b38724b30e62645143390226"; - sha256 = "1y4s4n88gdkpvgd3v3dg0181ccyhlixbvkx3bwyvdxyyyxbqibid"; + repo = "gnome-shell-extension-tilingnome"; + rev = "f401c20c9721d85e6b3e30d1e822a200db370407"; + sha256 = "1hq9g9bxqpzqrdj9zm0irld8r6q4w1m4b00jya7wsny8rzb1s0y2"; }; nativeBuildInputs = [ glib ]; @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ benley ]; homepage = https://github.com/rliang/gnome-shell-extension-tilingnome; platforms = gnome3.gnome-shell.meta.platforms; - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.31"; }; } From 76d12e8b88fb95e3668dae9333e7256f67ca99ef Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 18:54:46 -0400 Subject: [PATCH 178/197] gnomeExtension.timepp: mark as broken --- pkgs/desktops/gnome-3/extensions/timepp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index f841ef2403dce..04e98d51b0c4c 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/zagortenay333/timepp__gnome; license = licenses.gpl3; maintainers = with maintainers; [ svsdep ]; + broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113 }; } From da8226b3342bbd38bd7083282f8c17dd7f561b2f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 23 Sep 2019 19:12:28 -0400 Subject: [PATCH 179/197] gnome3.pomodoro: 0.15.1 -> 2019-09-15 --- pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index fcbceab24eab7..0080177df7123 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -22,14 +22,14 @@ }: stdenv.mkDerivation rec { - pname = "gnome-shell-pomodoro"; - version = "0.15.1"; + pname = "gnome-shell-pomodoro-unstable"; + version = "2019-09-15"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; - rev = version; - sha256 = "0nmgd122gsfka0p50mila88iwrzckq2r36a3h20lswn5qkn321i1"; + rev = "cb1ad32587c209d3322cd1bbc139efa624a4436f"; + sha256 = "1zp3z043zzkkn2305s55hnpf9bdzirlzljpzswfh1fj6j4dqlb9k"; }; nativeBuildInputs = [ From 513e8de83bcfd690db57e737b80816324913fe5c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 25 Sep 2019 08:16:20 -0400 Subject: [PATCH 180/197] pantheon.elementary-settings-daemon: fix gnome-session detecting autostarts For some reason GNOME 3.34 gnome-session fails to recognize these autostarts suffixed with `-pantheon`, whereas they worked before. It seems to work fine without the suffix, and it's verified elementary-settings-daemon proccess are running in the session. --- .../pantheon/services/elementary-settings-daemon/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 67a67dd4b3d2c..d29178b220d87 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -90,8 +90,6 @@ stdenv.mkDerivation rec { ''; postFixup = '' - for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done - for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) do echo "Patching OnlyShowIn to Pantheon in: $autostart" @@ -100,7 +98,7 @@ stdenv.mkDerivation rec { # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) - rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop + rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper mkdir -p $out/bin/elementary-settings-daemon From a62a8aaa141ad4b1f1fa6d66c501992f8e177a10 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 25 Feb 2019 21:11:39 -0500 Subject: [PATCH 181/197] pantheon.elementary-session-settings: add default settings to config dirs Also don't use placeholder in the executable. --- .../desktop/elementary-session-settings/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 7b0657bcd80b1..69a1efa3e9e90 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -10,7 +10,6 @@ , onboard , at-spi2-core , elementary-default-settings -, writeShellScriptBin , elementary-settings-daemon , runtimeShell }: @@ -50,9 +49,9 @@ let script = dockitems-script; }; - executable = writeShellScriptBin "pantheon" '' - export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:$XDG_CONFIG_DIRS - export XDG_DATA_DIRS=${placeholder "out"}/share:$XDG_DATA_DIRS + executable = writeScript "pantheon" '' + export XDG_CONFIG_DIRS=${elementary-settings-daemon}/etc/xdg:${elementary-default-settings}/etc:$XDG_CONFIG_DIRS + export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS exec ${gnome-session}/bin/gnome-session --session=pantheon "$@" ''; @@ -95,13 +94,17 @@ stdenv.mkDerivation rec { mkdir -p $out/share/gnome-session/sessions cp -av gnome-session/pantheon.session $out/share/gnome-session/sessions + mkdir -p $out/libexec + substitute ${executable} $out/libexec/pantheon --subst-var out + chmod +x $out/libexec/pantheon + mkdir -p $out/share/xsessions cp -av xsessions/pantheon.desktop $out/share/xsessions ''; postFixup = '' substituteInPlace $out/share/xsessions/pantheon.desktop \ - --replace "gnome-session --session=pantheon" "${executable}/bin/pantheon" \ + --replace "gnome-session --session=pantheon" "$out/libexec/pantheon" \ --replace "wingpanel" "${wingpanel}/bin/wingpanel" for f in $out/etc/xdg/autostart/*; do mv "$f" "''${f%.desktop}-pantheon.desktop"; done From 22dccf9602c1c028c1d7b3fa1c99782ba98ff2e1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 27 Sep 2019 18:10:03 -0400 Subject: [PATCH 182/197] gnome3.gdm: fix rebuild switch See: https://gitlab.gnome.org/GNOME/gdm/issues/515 --- pkgs/desktops/gnome-3/core/gdm/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 37199737fc4b4..1e37c45a1adb6 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg , accountsservice, libX11, gnome3, systemd, autoreconfHook , gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth -, librsvg, coreutils, xwayland, nixos-icons }: +, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }: let @@ -51,6 +51,12 @@ 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"; + }) + # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch; From dcd578d94941d60d403116adabd629402040e181 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 27 Sep 2019 19:28:18 -0400 Subject: [PATCH 183/197] gnome3.gdm: Remove duplicate sessions when on Xorg --- pkgs/desktops/gnome-3/core/gdm/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 1e37c45a1adb6..8b9c3732454ca 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { 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; From 2f41598ba83a6d258013de34614524c6478511be Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 27 Sep 2019 19:47:15 -0400 Subject: [PATCH 184/197] gnome3.gnome-session: fix debug spam with systemd session --- .../desktops/gnome-3/core/gnome-session/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 127aa5bf79b98..9e86297e1ecbd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,6 +1,6 @@ { 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 }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, fetchpatch }: stdenv.mkDerivation rec { pname = "gnome-session"; @@ -12,6 +12,17 @@ stdenv.mkDerivation rec { }; 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"; From dd86155fe4c372c3d524211f2a0839a4ce7d721f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 27 Sep 2019 19:48:44 -0400 Subject: [PATCH 185/197] nixos/gnome3: use sessionVariables Without this GNOME_SESSION_DEBUG likely won't be set in the systemd user environment. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index c112d4b6e4de2..304554e368409 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -155,10 +155,10 @@ in environment.systemPackages = cfg.sessionPath; - environment.variables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; # Override GSettings schemas - environment.variables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; + environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; @@ -346,10 +346,10 @@ in # Let nautilus find extensions # TODO: Create nautilus-with-extensions package - environment.variables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; + environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; # Override default mimeapps for nautilus - environment.variables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${mimeAppsList}/share" ]; environment.pathsToLink = [ "/share/nautilus-python/extensions" From 34a76d40cd9ea624bdfc7df4b06d39545bd85c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 28 Sep 2019 00:24:26 +0200 Subject: [PATCH 186/197] gnome3.gnome-shell: drop caribou This should no longer be necessary as gnome-shell ships its own on-screen keyboard. --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index abd467d2aa4d3..57fa9c967ca64 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -2,7 +2,7 @@ , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou +, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr , accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { sassc desktop-file-utils libxslt.bin python3 asciidoc-full ]; buildInputs = [ - systemd caribou + systemd gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice libcroco libsecret libsoup polkit gdk-pixbuf librsvg clutter networkmanager libstartup_notification telepathy-glib @@ -45,11 +45,6 @@ in stdenv.mkDerivation rec { # not declared at build time, but typelib is needed at runtime libgweather networkmanagerapplet ]; - propagatedUserEnvPkgs = [ - # Needed to support on-screen keyboard used with touch screen devices - # see https://github.com/NixOS/nixpkgs/issues/25968 - caribou - ]; patches = [ (fetchpatch { From 880fab10fc8fb882d98c6087e28caad49eb64314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 28 Sep 2019 14:01:27 +0200 Subject: [PATCH 187/197] gnome3.mutter: Add upstream patches before 3.34.1 Fixes some eg. animation related crashes which in particular affected dash-to-dock. --- pkgs/desktops/gnome-3/core/mutter/default.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 6c4d7a97ba24b..ce129f7537f69 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -59,6 +59,33 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/mutter/commit/850ef518795dcc20d3b9a4f661f70ff8d0ddacb2.patch"; sha256 = "0cxdbrbcc8kfkvw7ryxjm2v1vk15jki7bawn128385r5hasabhxf"; }) + # fix animation related crashes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/805 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/63a0b702c94af013b94ad3f32a8c5ba86bf6dfba.patch"; + sha256 = "13hvz3n275crvpankj1b47nds71c42nnbq1yx2xhhvk60qc72vh4"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/1e637bd7e1b2a4316d1cf6da80966d43819a10df.patch"; + sha256 = "0jcx33j2sw7hva0gs0svqg69habxxmgdi0kcb07nqq2df6pb62qf"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/c9c53cb55fd6e782c50f36da1e2adbf28111a660.patch"; + sha256 = "0iwjlbr8j0icigmilpghlkcyg4hll9dm0mcaj8lvi7qxrgjrmczr"; + }) + # Fix crash when pressing ctrl-super: https://gitlab.gnome.org/GNOME/mutter/issues/823 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/0706e021f5bd82cf4c9b2c0d2916d272f3cba406.patch"; + sha256 = "0i4ixr419jggrd17gxxs45jnx131lnp8wkkhhygqsrpq8941sdw6"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/76f2579e442d8ad0a3b8b644daab7c72a585506b.patch"; + sha256 = "0c3ls624k9f4mqrrbv8ng0slvm31l0li6ciqn04qd4yi18plnldy"; + }) + # Avoid crashing any apps on X11 when restarting: https://gitlab.gnome.org/GNOME/mutter/merge_requests/808 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/f352c3d79da99e961341c1d2b5dd334dcade0271.patch"; + sha256 = "1drn8wjbkj903jxay5wxq163i9ahp558sjl2bc3fi1qs90xj6cn2"; + }) # TODO: submit upstream ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch (substituteAll { From b8ab8598ed3f6d2efefc08fe908a6cce49c38974 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Sep 2019 01:30:15 +0200 Subject: [PATCH 188/197] vte-ng: move inside termite It is just a few patches only needed by termite. Let's not pollute our tree with it. --- pkgs/applications/misc/termite/default.nix | 40 +++++++++++++-- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/development/libraries/vte/ng.nix | 59 ---------------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 38 insertions(+), 65 deletions(-) delete mode 100644 pkgs/development/libraries/vte/ng.nix diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 6a9de3644469a..992c1f7e223d7 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,6 +1,40 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: -stdenv.mkDerivation rec { +let + + # termite requires VTE with some internals exposed + # https://github.com/thestinger/vte-ng + vte-ng = vte.overrideAttrs (attrs: { + patches = attrs.patches or [] ++ [ + (fetchpatch { + name = "0001-expose-functions-for-pausing-unpausing-output.patch"; + url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch"; + sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715"; + }) + (fetchpatch { + name = "0002-expose-function-for-setting-cursor-position.patch"; + url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch"; + sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89"; + }) + (fetchpatch { + name = "0003-add-function-for-setting-the-text-selections.patch"; + url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch"; + sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x"; + }) + (fetchpatch { + name = "0004-add-functions-to-get-set-block-selection-mode.patch"; + url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch"; + sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g"; + }) + (fetchpatch { + name = "0005-expose-function-for-getting-the-selected-text.patch"; + url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; + sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27"; + }) + ]; + }); + +in stdenv.mkDerivation rec { pname = "termite"; version = "15"; @@ -24,7 +58,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte-ng gtk3 ncurses ]; + buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d2a377d084e01..017ced6c98b70 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -338,7 +338,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix deleted file mode 100644 index af4fe76840fec..0000000000000 --- a/pkgs/development/libraries/vte/ng.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf -, stdenv, fetchurl, intltool, pkgconfig -, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls -, pcre2 -}: - -stdenv.mkDerivation rec { - name = "vte-ng-${version}"; - version = "0.54.2.a"; - - src = fetchFromGitHub { - owner = "thestinger"; - repo = "vte-ng"; - rev = version; - sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; - }; - - patches = [ - # Fix build with vala 0.44 - # See: https://github.com/thestinger/vte-ng/issues/32 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch"; - sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66"; - }) - ]; - - nativeBuildInputs = [ - gtk-doc autoconf automake gettext libtool gperf - gobject-introspection intltool pkgconfig vala gperf libxml2 - ]; - buildInputs = [ glib gtk3 ncurses ]; - - propagatedBuildInputs = [ - # Required by vte-2.91.pc. - gtk3 - gnutls - pcre2 - ]; - - preConfigure = "patchShebangs .; NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ]; - - meta = with stdenv.lib; { - homepage = https://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bca4e145f771..076dfc603603b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14035,8 +14035,6 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vte-ng = callPackage ../development/libraries/vte/ng.nix { }; - vtk = callPackage ../development/libraries/vtk { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; From 1c5db6535d4eb19378175b7328eaec3f881ded88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Sep 2019 02:00:18 +0200 Subject: [PATCH 189/197] gnome3.seahorse: fix build with recent libsecret --- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index a1bcb406eb3a0..670cbabf3623f 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, meson, ninja, libpwquality +{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, gpgme, python3, openldap, gcr @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x"; }; + patches = [ + # fix build with recent libsecret + # https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch; + sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj"; + }) + ]; + doCheck = true; nativeBuildInputs = [ From 44069671ebf6c186a7881648da3022f82d7ccf7a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Sep 2019 05:13:14 +0200 Subject: [PATCH 190/197] grilo-plugins: build grl-bookmarks Totem asks after it. --- pkgs/development/libraries/grilo-plugins/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 435da107fcb12..3f6ab858c2397 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -18,6 +18,7 @@ , grilo , gnome-online-accounts , gmime +, gom , json-glib , avahi , tracker @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { libarchive libsoup gmime + gom json-glib avahi libmediaart From 6d88a57efe6adf8986b0faee4cf9f200f92bb5ab Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Sep 2019 05:38:41 -0400 Subject: [PATCH 191/197] gnome3.evolution: fix FHS paths This includes commands to spamassassin, sa-learn, bogofilter and the prefix to openldap --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 71bec86038482..8085b2a824a30 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -38,6 +38,7 @@ , procps , p11-kit , openldap +, spamassassin }: stdenv.mkDerivation rec { @@ -102,6 +103,10 @@ stdenv.mkDerivation rec { "-DENABLE_LIBCRYPTUI=OFF" "-DENABLE_PST_IMPORT=OFF" "-DENABLE_YTNEF=OFF" + "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" + "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" + "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" + "-DWITH_OPENLDAP=${openldap}" ]; requiredSystemFeatures = [ From a631d57c7916a8aba1c0f0bf84665c4ac122e72d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 29 Sep 2019 06:57:53 -0400 Subject: [PATCH 192/197] pantheon.wingpanel-indicator-datetime: use older e-s-d Workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122 Revert once resolved upstream. --- .../wingpanel-indicators/datetime/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 74408a4ed6d49..74542b5c4c451 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -18,8 +18,23 @@ , elementary-calendar , elementary-icon-theme , wrapGAppsHook +, fetchurl }: +let + + # Terrible workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122 + # Evolution Data Server functionality will be broken (events from calendar in indicator) + # but at least we don't fail to build. + old-evolution-data-server = evolution-data-server.overrideAttrs(old: { + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor "3.32.4"}/${old.pname}-3.32.4.tar.xz"; + sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; + }; + }); + +in + stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; version = "2.1.3"; @@ -49,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ elementary-icon-theme - evolution-data-server + old-evolution-data-server granite gtk3 libgee From 0038189df8e1cc4138d88f4108340cd82cfe0d5e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 29 Sep 2019 13:48:21 +0200 Subject: [PATCH 193/197] grilo-plugins: add grl-chromaprint --- .../chromaprint-gst-plugins.patch | 13 +++++++++++++ .../libraries/grilo-plugins/default.nix | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch new file mode 100644 index 0000000000000..cb6a1a354945e --- /dev/null +++ b/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch @@ -0,0 +1,13 @@ +diff --git a/src/chromaprint/grl-chromaprint.c b/src/chromaprint/grl-chromaprint.c +index 5a3598b..8979291 100644 +--- a/src/chromaprint/grl-chromaprint.c ++++ b/src/chromaprint/grl-chromaprint.c +@@ -111,6 +111,8 @@ + + gst_init (NULL, NULL); + ++ @load_plugins@ ++ + source = grl_chromaprint_source_new (); + grl_registry_register_source (registry, + plugin, diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 3f6ab858c2397..ddf29c2dcd8c8 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, substituteAll , meson , ninja , pkgconfig @@ -16,6 +17,7 @@ , libgdata , libmediaart , grilo +, gst_all_1 , gnome-online-accounts , gmime , gom @@ -36,6 +38,21 @@ stdenv.mkDerivation rec { sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0"; }; + patches = [ + # grl-chromaprint requires the following GStreamer elements: + # * fakesink (gstreamer) + # * playbin (gst-plugins-base) + # * chromaprint (gst-plugins-bad) + (substituteAll { + src = ./chromaprint-gst-plugins.patch; + load_plugins = stdenv.lib.concatMapStrings (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]); + }) + ]; + nativeBuildInputs = [ meson ninja @@ -64,6 +81,7 @@ stdenv.mkDerivation rec { libmediaart tracker dleyna-server + gst_all_1.gstreamer ]; passthru = { From 4b3942b75ab64fb46a3cedc62556ac3fb153c72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 29 Sep 2019 15:34:34 +0200 Subject: [PATCH 194/197] gnomeExtensions.dash-to-dock: 66 -> 20190921 There's still no official release for gnome-3.34 --- pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index e80149e500531..1f09afc52c43d 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-dock"; - version = "66"; + version = "20190921"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; - rev = "extensions.gnome.org-v" + version; - sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh"; + # rev = "extensions.gnome.org-v" + version; + rev = "d918d29a6afced8823dc954a4317988b79aad6b8"; + sha256 = "1wlmbcn8zs8xiyxhgdcbnf2igjsjg0bkcsvjpy8fk13fxshxsqx6"; }; nativeBuildInputs = [ From 7543b25e3746c7e2880f5cebeb8f1ff0be02bef6 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Sep 2019 11:02:01 -0400 Subject: [PATCH 195/197] libproxy: build with spidermonkey_60 --- .../libraries/libproxy/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 773acd0353553..c9b08079c3800 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -6,7 +6,7 @@ , fetchpatch , dbus , networkmanager -, spidermonkey_38 +, spidermonkey_60 , pcre , gsettings-desktop-schemas , glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { JavaScriptCore ] else [ glib - spidermonkey_38 + spidermonkey_60 dbus networkmanager ]); @@ -59,7 +59,21 @@ stdenv.mkDerivation rec { "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = [ + # Make build with spidermonkey_60 + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/86.patch"; + sha256 = "17c06ilinrnzr7xnnmw9pc6zrncyaxcdd6r6k1ah5p156skbykfs"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/87.patch"; + sha256 = "0sagzfwm16f33inbkwsp88w9wmrd034rjmw0y8d122f7k1qfx6zc"; + }) + (fetchpatch { + url = "https://github.com/libproxy/libproxy/pull/95.patch"; + sha256 = "18vyr6wlis9zfwml86606jpgb9mss01l9aj31iiciml8p857aixi"; + }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch"; sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1"; From 04b726c032af4c2a8ba9fe0113ff8b25da308b72 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 1 Oct 2019 00:37:57 -0400 Subject: [PATCH 196/197] gnome3.evince: 3.32.0 -> 3.34.0 --- pkgs/desktops/gnome-3/core/evince/default.nix | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 9313ca8990c9f..ee4e619332ccf 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -1,6 +1,5 @@ -{ fetchFromGitLab -, stdenv -, fetchpatch +{ stdenv +, fetchFromGitLab , meson , ninja , pkgconfig @@ -34,6 +33,9 @@ , texlive , t1lib , gst_all_1 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps @@ -41,64 +43,62 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.32.0"; + version = "3.34.0"; + 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 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r"; + sha256 = "0kjylhlkadi89w3p9afzl69jpd9gryk21sm1g89a0y2pkwz181qr"; }; - - patches = [ - (fetchpatch { - name = "CVE-2019-11459.patch"; - url = "https://gitlab.gnome.org/GNOME/evince/commit/3e38d5ad724a042eebadcba8c2d57b0f48b7a8c7.patch"; - sha256 = "1ds6iwr2r9i86nwrly8cx7p1kbvf1gljjplcffa67znxqmwx4n74"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py ''; nativeBuildInputs = [ + appstream + docbook-xsl-nons + docbook_xml_dtd_43 + gettext + gobject-introspection + gtk-doc + itstool meson ninja pkgconfig - gobject-introspection - gettext - itstool - yelp-tools - appstream - wrapGAppsHook python3 + wrapGAppsHook + yelp-tools ]; buildInputs = [ - glib - gtk3 - pango + adwaita-icon-theme atk + dbus # only needed to find the service directory + djvulibre gdk-pixbuf - libxml2 - gsettings-desktop-schemas - poppler ghostscriptX - djvulibre - libspectre + glib + gnome-desktop + gsettings-desktop-schemas + gspell + gtk3 libarchive - libsecret librsvg - adwaita-icon-theme - gspell - gnome-desktop - dbus # only needed to find the service directory - texlive.bin.core # kpathsea for DVI support + libsecret + libspectre + libxml2 + pango + poppler t1lib + texlive.bin.core # kpathsea for DVI support ] ++ stdenv.lib.optional supportXPS libgxps ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]); @@ -106,7 +106,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dnautilus=false" "-Dps=enabled" - "-Dgtk_doc=false" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; From fa8b4eec80d5d890cfc741790ce465c9d36156c4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 1 Oct 2019 00:41:54 -0400 Subject: [PATCH 197/197] gnome3.gnome-keyring: 3.31.91 -> 3.34.0 --- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 7817936bfda6e..fa960087f9bd5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "3.31.91"; + version = "3.34.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; + sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9"; }; outputs = [ "out" "dev" ];