Merge remote-tracking branch 'origin/master' into haskell-updates

2021-05-08 14:04:31 +02:00
parent 5999d83b56 3452a739d1
commit e37a0ebc85
698 changed files with 3107 additions and 2091 deletions
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , gettext
-, gnome3
+, gnome
 , itstool
 , libxml2
 , yelp-tools
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
      packageName = pname;
    };
  };
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }:
+{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }:

 stdenv.mkDerivation rec {
  pname = "cantarell-fonts";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z";

  passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
      packageName = pname;
    };
  };
--- a/pkgs/data/fonts/open-sans/default.nix
+++ b/pkgs/data/fonts/open-sans/default.nix
@@ -26,6 +26,6 @@ in fetchFromGitLab {
    homepage = "https://www.opensans.com";
    license = licenses.asl20;
    platforms = platforms.all;
-    maintainers = [ maintainers.worldofpeace ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/data/icons/arc-icon-theme/default.nix
+++ b/pkgs/data/icons/arc-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  pname = "arc-icon-theme";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [
    moka-icon-theme
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    gnome-icon-theme
    hicolor-icon-theme
  ];
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  pname = "elementary-xfce-icon-theme";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [
    pantheon.elementary-icon-theme
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    gnome-icon-theme
    hicolor-icon-theme
  ];
--- a/pkgs/data/icons/humanity-icon-theme/default.nix
+++ b/pkgs/data/icons/humanity-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }:
+{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  pname = "humanity-icon-theme";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  ];

  propagatedBuildInputs = [
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    hicolor-icon-theme
  ];

--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  pname = "paper-icon-theme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  ];

  propagatedBuildInputs = [
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    gnome-icon-theme
    hicolor-icon-theme
  ];
--- a/pkgs/data/icons/pop-icon-theme/default.nix
+++ b/pkgs/data/icons/pop-icon-theme/default.nix
@@ -4,7 +4,7 @@
 , ninja
 , gtk3
 , breeze-icons
-, gnome3
+, gnome
 , pantheon
 , hicolor-icon-theme
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [
    breeze-icons
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    pantheon.elementary-icon-theme
    hicolor-icon-theme
  ];
--- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix
+++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gnome3, libxslt }:
+{ lib, stdenv, fetchurl, gnome, libxslt }:

 stdenv.mkDerivation rec {
  pname = "mobile-broadband-provider-info";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  ];

  passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
      packageName = pname;
    };
  };
--- a/pkgs/data/themes/adapta/default.nix
+++ b/pkgs/data/themes/adapta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }:

 stdenv.mkDerivation rec {
  pname = "adapta-gtk-theme";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    inkscape
    libxml2
    glib.dev
-    gnome3.gnome-shell
+    gnome.gnome-shell
  ];

  buildInputs = [
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
    description = "A style to bend Qt applications to look like they belong into GNOME Shell";
    homepage = "https://github.com/FedoraQt/adwaita-qt";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ worldofpeace ];
+    maintainers = teams.gnome.members ++ (with maintainers; [ ]);
    platforms = platforms.linux;
  };
 }
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -4,7 +4,7 @@
 , autoreconfHook
 , pkg-config
 , gtk3
-, gnome3
+, gnome
 , gtk-engine-murrine
 , optipng
 , inkscape
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  ];

  propagatedUserEnvPkgs = [
-    gnome3.gnome-themes-extra
+    gnome.gnome-themes-extra
    gtk-engine-murrine
  ];

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

  configureFlags = [
    "--with-cinnamon=${cinnamon.cinnamon-common.version}"
-    "--with-gnome-shell=${gnome3.gnome-shell.version}"
+    "--with-gnome-shell=${gnome.gnome-shell.version}"
    "--disable-unity"
  ];

--- a/pkgs/data/themes/canta/default.nix
+++ b/pkgs/data/themes/canta/default.nix
@@ -4,7 +4,7 @@
 , librsvg
 , gtk-engine-murrine
 , gtk3
-, gnome3
+, gnome
 , gnome-icon-theme
 , numix-icon-theme-circle
 , hicolor-icon-theme
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  ];

  propagatedBuildInputs = [
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    gnome-icon-theme
    numix-icon-theme-circle
    hicolor-icon-theme
--- a/pkgs/data/themes/equilux-theme/default.nix
+++ b/pkgs/data/themes/equilux-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
+{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:

 stdenv.mkDerivation rec {
  pname = "equilux-theme";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ glib libxml2 bc ];

-  buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
+  buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ];

  propagatedUserEnvPkgs = [ gtk-engine-murrine ];

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    patchShebangs install.sh
    sed -i install.sh \
      -e "s|if .*which gnome-shell.*;|if true;|" \
-      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|"
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|"
    mkdir -p $out/share/themes
    ./install.sh --dest $out/share/themes
    rm $out/share/themes/*/COPYING
--- a/pkgs/data/themes/lounge/default.nix
+++ b/pkgs/data/themes/lounge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }:

 stdenv.mkDerivation rec {
  pname = "lounge-gtk-theme";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  propagatedUserEnvPkgs = [ gtk-engine-murrine ];

  mesonFlags = [
-    "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}"
+    "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
  ];

  postFixup = ''
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , sassc
-, gnome3
+, gnome
 , gtk-engine-murrine
 , gdk-pixbuf
 , librsvg
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    gnome3.gnome-themes-extra
+    gnome.gnome-themes-extra
    gdk-pixbuf
    librsvg
  ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
  dontBuild = true;

  mesonFlags = [
-    "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}"
+    "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
  ];

  postInstall = ''
--- a/pkgs/data/themes/ubuntu-themes/default.nix
+++ b/pkgs/data/themes/ubuntu-themes/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , fetchpatch
 , gnome-icon-theme
-, gnome3
+, gnome
 , gtk-engine-murrine
 , gtk3
 , hicolor-icon-theme
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  propagatedBuildInputs = [
    gnome-icon-theme
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
    humanity-icon-theme
    hicolor-icon-theme
  ];
--- a/pkgs/data/themes/yaru/default.nix
+++ b/pkgs/data/themes/yaru/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja,
-  python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }:
+  python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
  pname = "yaru";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
-  buildInputs = [ gtk3 gnome3.gnome-themes-extra ];
+  buildInputs = [ gtk3 gnome.gnome-themes-extra ];
  propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ];

  propagatedUserEnvPkgs = [ gtk-engine-murrine ];