Merge branch 'master' into staging

This apparently fixes some broken src fetches (gnuradio, twisted).

3 files changed, 7 insertions, 30 deletions

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 44b0de37d69..dc55fa9a7b4 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -7,16 +7,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "tracker-miners";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
+    sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4";
   };
 
-  # https://github.com/NixOS/nixpkgs/issues/39547
-  LIBRARY_PATH = stdenv.lib.makeLibraryPath [ giflib ];
-
   nativeBuildInputs = [
     intltool
     itstool
@@ -71,31 +68,11 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       inherit (gnome3) tracker;
     })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795573
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371422;
-      sha256 = "1rzwzrc7q73k42s1j1iw52chy10w6y3xksfrzg2l42nn9wk7n281";
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795574
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371423;
-      sha256 = "0b2ck8z4b2yrgwg4v9jsac5n8h3a91qkp90vv17wxcvr4v50fg48";
-    })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795575
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371424;
-      sha256 = "03i29fabxrpraydh7712vdrc571qmiq0l4axj24gbi6h77xn7mxc";
-    })
     # https://bugzilla.gnome.org/show_bug.cgi?id=795576
     (fetchurl {
       url = https://bugzilla.gnome.org/attachment.cgi?id=371427;
       sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
     })
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795577
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371425;
-      sha256 = "05m629469jr2lm2cjs54n7xwyim2d5rwwvdjxzcwh5qpfjds5phm";
-    })
   ];
 
   passthru = {
@@ -114,7 +91,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
   '';
-  
+
   # https://bugzilla.gnome.org/show_bug.cgi?id=796145
   postFixup = ''
     rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index cbf16c6807f..649960c0bf3 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "tracker";
-  version = "2.0.3";
+  version = "2.0.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1005w90vhk1cl8g6kxpy2vdzbskw2jskfjcl42lngv18q5sb4bss";
+    sha256 = "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 253f8112f5b..1c2ade5938e 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "compton-conf";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1p1y7g5psczx1dgh6gd1h5iga8rylvczkwlfirzrh0rfl45dajgb";
+    sha256 = "1r187fx1vivzq1gcwwawax36mnlmfig5j1ba4s4wfdi3q2wcq7mw";
   };
 
   nativeBuildInputs = [