Merge branch 'staging-next' into staging

2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3908 additions and 1908 deletions
--- a/pkgs/development/misc/yelp-tools/default.nix
+++ b/pkgs/development/misc/yelp-tools/default.nix
@@ -4,7 +4,7 @@
 , libxml2
 , libxslt
 , itstool
-, gnome3
+, gnome
 , pkg-config
 , meson
 , ninja
@@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = [
    itstool # build script checks for its presence but I am not sure if anything uses it
-    gnome3.yelp-xsl
+    gnome.yelp-xsl
  ];

  pythonPath = [
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
  doCheck = true;

  passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
      packageName = pname;
    };
  };