diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 21:07:20 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-01 02:53:00 +0100 |
| commit | 546e7669b211eee9f40ea9051a02033c27dc7ec6 (patch) | |
| tree | 540993e0fab50a9ed80f31ba73f08046c4dd95af /pkgs/desktops/gnome-3/core | |
| parent | 20e53c0b14b85112d180d18f424fb75dd78053da (diff) | |
| download | nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar.gz nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar.bz2 nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar.lz nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar.xz nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.tar.zst nixlib-546e7669b211eee9f40ea9051a02033c27dc7ec6.zip | |
gnome3: move src.nix into default.nix automatically
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
114 files changed, 627 insertions, 632 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 780a315ca660..2178004a43ac 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -2,7 +2,17 @@ , iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "adwaita-icon-theme-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "adwaita-icon-theme"; attrPath = "gnome3.adwaita-icon-theme"; }; + }; # For convenience, we can specify adwaita-icon-theme only in packages propagatedBuildInputs = [ hicolor-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix deleted file mode 100644 index 24f0955659ec..000000000000 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.1.tar.xz; - sha256 = "28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index f94cb3c57c46..1ff67e35f0fd 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,7 +4,17 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "baobab-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/baobab/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "baobab"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/src.nix b/pkgs/desktops/gnome-3/core/baobab/src.nix deleted file mode 100644 index d3e2f03feb8b..000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz; - sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 49780aeea607..47ddf6b64861 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -2,7 +2,17 @@ , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "dconf-editor-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/dconf-editor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "dconf-editor"; attrPath = "gnome3.dconf-editor"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/core/dconf-editor/src.nix deleted file mode 100644 index b21630641d94..000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz; - sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 0263a152f7dc..bf83c7aa8a15 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -10,7 +10,17 @@ , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "empathy-${version}"; + version = "3.12.14"; + + src = fetchurl { + url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "empathy"; }; + }; propagatedUserEnvPkgs = [ gnome-online-accounts shared-mime-info diff --git a/pkgs/desktops/gnome-3/core/empathy/src.nix b/pkgs/desktops/gnome-3/core/empathy/src.nix deleted file mode 100644 index 7e54ed38fd36..000000000000 --- a/pkgs/desktops/gnome-3/core/empathy/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "empathy-3.12.14"; - - src = fetchurl { - url = mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz; - sha256 = "7d86942ce97edd10ade0e6ae6a210d35e4d627fe4d223377d71fd1840bc6e3a3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index b41be5c9d14c..1acd6eb69425 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -2,7 +2,17 @@ , shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "eog-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/eog/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "eog"; attrPath = "gnome3.eog"; }; + }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/eog/src.nix b/pkgs/desktops/gnome-3/core/eog/src.nix deleted file mode 100644 index d0046d899bec..000000000000 --- a/pkgs/desktops/gnome-3/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz; - sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index aa8722f53f2e..18a27af7977e 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -5,7 +5,17 @@ , gdk_pixbuf, gnome-common, gst_all_1, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "epiphany-${version}"; + version = "3.26.4"; + + src = fetchurl { + url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "epiphany"; }; + }; # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; diff --git a/pkgs/desktops/gnome-3/core/epiphany/src.nix b/pkgs/desktops/gnome-3/core/epiphany/src.nix deleted file mode 100644 index 3365261b7bcf..000000000000 --- a/pkgs/desktops/gnome-3/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.26.4"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.4.tar.xz; - sha256 = "390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index de5b20a49919..2d52e22c54cd 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -8,7 +8,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evince-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evince"; }; + }; nativeBuildInputs = [ pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp-tools autoreconfHook diff --git a/pkgs/desktops/gnome-3/core/evince/src.nix b/pkgs/desktops/gnome-3/core/evince/src.nix deleted file mode 100644 index 6627be550884..000000000000 --- a/pkgs/desktops/gnome-3/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz; - sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; - }; -} 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 bb45952f1d53..f5723f673bb2 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -4,7 +4,17 @@ , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "evolution-data-server-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "evolution-data-server"; }; + }; nativeBuildInputs = [ cmake pkgconfig intltool python3 gperf makeWrapper diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix deleted file mode 100644 index 906df1b2160a..000000000000 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.3.tar.xz; - sha256 = "63b1ae5f76be818862f455bf841b5ebb1ec3e1f4df6d3a16dc2be348b7e0a1c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix index 7ecf79391f0c..aa26c660768b 100644 --- a/pkgs/desktops/gnome-3/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/core/gcr/default.nix @@ -3,7 +3,17 @@ , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gcr-${version}"; + version = "3.20.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gcr"; attrPath = "gnome3.gcr"; }; + }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/gcr/src.nix b/pkgs/desktops/gnome-3/core/gcr/src.nix deleted file mode 100644 index d166f033266c..000000000000 --- a/pkgs/desktops/gnome-3/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz; - sha256 = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index a6c8375e9b52..ef9439a30291 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -4,7 +4,17 @@ , librsvg, coreutils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gdm-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; }; + }; # Only needed to make it build preConfigure = '' diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix deleted file mode 100644 index 8d92167a0391..000000000000 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; - sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix index 341f1c4f095e..e97e557e87a0 100644 --- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix @@ -1,7 +1,17 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "geocode-glib-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "geocode-glib"; attrPath = "gnome3.geocode-glib"; }; + }; buildInputs = with gnome3; [ intltool pkgconfig glib libsoup json-glib ]; diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/core/geocode-glib/src.nix deleted file mode 100644 index 394e3a68c35c..000000000000 --- a/pkgs/desktops/gnome-3/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz; - sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index e2ae74931030..6e9f6c464df1 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,7 +3,17 @@ , makeWrapper }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gjs-${version}"; + version = "1.50.4"; + + src = fetchurl { + url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; }; + }; outputs = [ "out" "installedTests" ]; diff --git a/pkgs/desktops/gnome-3/core/gjs/src.nix b/pkgs/desktops/gnome-3/core/gjs/src.nix deleted file mode 100644 index d42b2e845585..000000000000 --- a/pkgs/desktops/gnome-3/core/gjs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gjs-1.50.4"; - - src = fetchurl { - url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz; - sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index eb801caf5657..0aea3c4eac48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, gnome3, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-backgrounds-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; + }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix deleted file mode 100644 index 9d86b7168ad0..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz; - sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 12e91b8e431e..11816f68ff48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -2,7 +2,17 @@ , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-bluetooth-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; + }; nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix deleted file mode 100644 index 31aab6649d75..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz; - sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 5382bce44a01..8376bea1a038 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,7 +3,17 @@ , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-calculator-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; }; + }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix deleted file mode 100644 index 517220c94572..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz; - sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index 8623e598dc20..23fd157a528a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-common-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + }; patches = [(fetchurl { name = "gnome-common-patch"; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index d05ab4470c56..eb2f7631ba8c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -6,7 +6,17 @@ , libsoup, vala, dbus-glib, automake, autoconf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-contacts-${version}"; + version = "3.26"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-contacts"; attrPath = "gnome3.gnome-contacts"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix deleted file mode 100644 index bf3df1bc84fe..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.26"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz; - sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; - }; -} 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 1c4d4858bf52..8774de41c4b2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -8,7 +8,17 @@ , fontconfig, sound-theme-freedesktop, grilo }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-control-center-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-control-center/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-control-center"; attrPath = "gnome3.gnome-control-center"; }; + }; propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix deleted file mode 100644 index 948768904aea..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz; - sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index deabb41224f0..7e85e27d6be9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -3,7 +3,17 @@ , libseccomp, bubblewrap, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-desktop-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-desktop"; attrPath = "gnome3.gnome-desktop"; }; + }; # this should probably be setuphook for glib NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix deleted file mode 100644 index f3c0d446d3f1..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz; - sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 0327ce9862bc..95fcfac1d751 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -3,7 +3,17 @@ , gnome3, gtk, glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-dictionary-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix deleted file mode 100644 index 92a50430bd1f..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; - }; -} 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 c37f824a5613..0937f5c30823 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -4,7 +4,17 @@ , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-disk-utility-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; + }; propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix deleted file mode 100644 index e3241153a930..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz; - sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; - }; -} 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 6908a5161a06..3774ff32db04 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,7 +3,17 @@ , wrapGAppsHook, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-font-viewer-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-font-viewer"; attrPath = "gnome3.gnome-font-viewer"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix deleted file mode 100644 index c31f09938c92..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz; - sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 9c1282ecc4cd..f7f06e35d3ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -3,7 +3,17 @@ , docbook_xsl, docbook_xml_dtd_42, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-keyring-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-keyring"; attrPath = "gnome3.gnome-keyring"; }; + }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix deleted file mode 100644 index ffee6211232e..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz; - sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix index b0edf4f978f1..2abe8b28c039 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix @@ -5,7 +5,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-accounts-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-accounts"; attrPath = "gnome3.gnome-online-accounts"; }; + }; NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix deleted file mode 100644 index c43183c7c57d..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.2.tar.xz; - sha256 = "49f8760d86fe33057eaeeb4f1667bc7f6163e428591e7aed9575563be10b17d1"; - }; -} 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 2ef1ae2fa3e0..1df5465382a9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -2,7 +2,17 @@ , libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-online-miners-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-online-miners"; attrPath = "gnome3.gnome-online-miners"; }; + }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix deleted file mode 100644 index 3b8306c6a1a5..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-miners-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz; - sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index c4030f38d5d5..1f7aa4d874ad 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -3,7 +3,17 @@ , gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-screenshot-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix deleted file mode 100644 index 72b1e6625452..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz; - sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index c12b96f60905..c8bc61462213 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -2,7 +2,17 @@ , libxslt, intltool, makeWrapper, systemd, xorg, epoxy }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-session-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; + }; configureFlags = "--enable-systemd"; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/core/gnome-session/src.nix deleted file mode 100644 index bb9dec1efc23..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-session/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-session-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz; - sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; - }; -} 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 6741eb81ade6..e3c84dfa9fd8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -4,7 +4,17 @@ , docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-settings-daemon-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-settings-daemon"; attrPath = "gnome3.gnome-settings-daemon"; }; + }; # fatal error: gio/gunixfdlist.h: No such file or directory NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix deleted file mode 100644 index 1c3fbbfc2efa..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz; - sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; - }; -} 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 fd90b8867d7b..a76dd35711a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,7 +2,17 @@ , bash, makeWrapper, itstool, gnome3, file }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-extensions-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-shell-extensions"; attrPath = "gnome3.gnome-shell-extensions"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix deleted file mode 100644 index 150a15d0a5f3..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz; - sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 29b2bdd84068..0ba1fbc5e8a4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -12,7 +12,17 @@ let pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-shell-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-shell"; attrPath = "gnome3.gnome-shell"; }; + }; # Needed to find /etc/NetworkManager/VPN mesonFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/core/gnome-shell/src.nix deleted file mode 100644 index 83cdd0682fda..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz; - sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index dda6e78661ba..354924c5c436 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -3,7 +3,17 @@ , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-software-${version}"; + version = "3.26.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-software"; attrPath = "gnome3.gnome-software"; }; + }; nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 valgrind-light docbook_xsl gtk-doc desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/core/gnome-software/src.nix deleted file mode 100644 index 99c6415e83dc..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-software/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-software-3.26.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz; - sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 07eed05762d6..0e64bc4362c7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,7 +3,17 @@ , itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-system-monitor-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-system-monitor"; attrPath = "gnome3.gnome-system-monitor"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix deleted file mode 100644 index b5d527632efe..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz; - sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4ce393ad4e45..703bb6fe110e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -3,7 +3,17 @@ , desktop-file-utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-terminal-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-terminal"; attrPath = "gnome3.gnome-terminal"; }; + }; buildInputs = [ gnome3.gtk gnome3.gsettings-desktop-schemas gnome3.vte appdata-tools gnome3.dconf itstool gnome3.nautilus ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix deleted file mode 100644 index a6072ba7ca5e..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz; - sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix index 3db252d063f2..720120b392de 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix @@ -2,7 +2,17 @@ , gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-themes-standard-${version}"; + version = "3.22.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-themes-standard"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk3 librsvg pango atk gtk2 gdk_pixbuf diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix deleted file mode 100644 index dcda746c8dd1..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.22.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.22/gnome-themes-standard-3.22.3.tar.xz; - sha256 = "61dc87c52261cfd5b94d65e8ffd923ddeb5d3944562f84942eeeb197ab8ab56a"; - }; -} 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 6ab72ab7826d..8854e7a2d0c3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-docs-${version}"; + version = "3.26.2.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-docs"; attrPath = "gnome3.gnome-user-docs"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gnome3.yelp itstool libxml2 intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix deleted file mode 100644 index c18bad6b4cd8..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.26.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.1.tar.xz; - sha256 = "93136f5baffd160c14e1b39f0ac60b9768975edac2da2b30c945faef534af8f5"; - }; -} 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 5d551dff1c0a..642ee0badf1e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -4,7 +4,17 @@ , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gnome-user-share-${version}"; + version = "3.18.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix deleted file mode 100644 index 2d06f9e7a7cf..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/src.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "3.18"; - minor = "3"; - name = "gnome-user-share-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${major}/${name}.tar.xz"; - sha256 = "3092fa7ad137531e35484195dde4ecbbc75a8a3d9b8209aef4c852717cf4bbf1"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix index 836d178f09db..89614a327a6a 100644 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -3,7 +3,17 @@ , gnome3, gtk3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gsettings-desktop-schemas-${version}"; + version = "3.24.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; + }; preInstall = '' mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index 1eca56c509bf..000000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.24.1"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz; - sha256 = "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 88e6a0bd7853..b3948942c12b 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -4,7 +4,17 @@ let checkInputs = [ xvfb_run dbus ]; in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceview-${version}"; + version = "3.24.6"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; }; + }; propagatedBuildInputs = [ # Required by gtksourceview-3.0.pc diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/core/gtksourceview/src.nix deleted file mode 100644 index ec7a8a6aaa57..000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.24.6"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz; - sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix index 7763867bcbff..d9f9e95114c2 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gtksourceviewmm-${version}"; + version = "3.21.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; attrPath = "gnome3.gtksourceviewmm"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glibmm gtkmm gtksourceview ]; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix deleted file mode 100644 index 21618c45e051..000000000000 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceviewmm-3.21.2"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceviewmm/3.21/gtksourceviewmm-3.21.2.tar.xz; - sha256 = "d21296d8624a1046841bfec082021b7b966df0b62e19ee300828519bc54dd9c6"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 40b7a4c7d9f1..ff9b232cb7a8 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -7,7 +7,17 @@ # use packaged gnome3.adwaita-icon-theme stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "gucharmap-${version}"; + version = "10.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "gucharmap"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/core/gucharmap/src.nix deleted file mode 100644 index fb38e3bf386b..000000000000 --- a/pkgs/desktops/gnome-3/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-10.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz; - sha256 = "ac07d75924e2d8f436d9492e8f7d54cf109404d34de06886a3967563cd1726a4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix index 319f089b9206..6301f6f4ab65 100644 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgnomekbd-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgnomekbd"; attrPath = "gnome3.libgnomekbd"; }; + }; nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; buildInputs = [ glib gtk3 libxklavier ]; diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix deleted file mode 100644 index 431006daf4fb..000000000000 --- a/pkgs/desktops/gnome-3/core/libgnomekbd/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgnomekbd-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz; - sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix index 40f02886101d..ad14abb10008 100644 --- a/pkgs/desktops/gnome-3/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix @@ -2,7 +2,17 @@ , pango, gdk_pixbuf, atk, tzdata, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libgweather-${version}"; + version = "3.26.1"; + + src = fetchurl { + url = "mirror://gnome/sources/libgweather/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libgweather"; attrPath = "gnome3.libgweather"; }; + }; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ]; diff --git a/pkgs/desktops/gnome-3/core/libgweather/src.nix b/pkgs/desktops/gnome-3/core/libgweather/src.nix deleted file mode 100644 index 799713c28a4a..000000000000 --- a/pkgs/desktops/gnome-3/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.26.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.1.tar.xz; - sha256 = "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 998a1a02b3f9..8eaa927ac7b9 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -3,7 +3,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "libpeas-${version}"; + version = "1.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; }; + }; configureFlags = [ "--enable-python3" ]; diff --git a/pkgs/desktops/gnome-3/core/libpeas/src.nix b/pkgs/desktops/gnome-3/core/libpeas/src.nix deleted file mode 100644 index 6f2cd82fb215..000000000000 --- a/pkgs/desktops/gnome-3/core/libpeas/src.nix +++ /dev/null @@ -1,13 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: rec { - major = "1.22"; - minor = "0"; - version = "${major}.${minor}"; - name = "libpeas-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${major}/${name}.tar.xz"; - sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 92c2fee8e46c..dc89c8c674ab 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -4,7 +4,17 @@ , pipewire, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "mutter-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "mutter"; attrPath = "gnome3.mutter"; }; + }; configureFlags = [ "--with-x" diff --git a/pkgs/desktops/gnome-3/core/mutter/src.nix b/pkgs/desktops/gnome-3/core/mutter/src.nix deleted file mode 100644 index b3d0841a2e5c..000000000000 --- a/pkgs/desktops/gnome-3/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz; - sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index ebabc269e814..8ed7bb2f01a0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -3,7 +3,17 @@ , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "nautilus-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/nautilus/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "nautilus"; attrPath = "gnome3.nautilus"; }; + }; nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ]; diff --git a/pkgs/desktops/gnome-3/core/nautilus/src.nix b/pkgs/desktops/gnome-3/core/nautilus/src.nix deleted file mode 100644 index 1cc14391e394..000000000000 --- a/pkgs/desktops/gnome-3/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz; - sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index b65b722be7a0..f982af2d56db 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,7 +3,17 @@ , libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "simple-scan-${version}"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "simple-scan"; }; + }; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/src.nix b/pkgs/desktops/gnome-3/core/simple-scan/src.nix deleted file mode 100644 index fb430db7d844..000000000000 --- a/pkgs/desktops/gnome-3/core/simple-scan/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "simple-scan-3.26.2"; - - src = fetchurl { - url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz; - sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 3e568f8639a2..00cec2f93b9f 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -4,7 +4,17 @@ , gdk_pixbuf, librsvg, gtk3, harfbuzz }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "sushi-${version}"; + version = "3.24.0"; + + src = fetchurl { + url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "sushi"; attrPath = "gnome3.sushi"; }; + }; propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/gnome-3/core/sushi/src.nix b/pkgs/desktops/gnome-3/core/sushi/src.nix deleted file mode 100644 index a713aef6f7f0..000000000000 --- a/pkgs/desktops/gnome-3/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz; - sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix index c763621564c7..ef6bc97b1c67 100644 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-pl-parser-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem-pl-parser"; attrPath = "gnome3.totem-pl-parser"; }; + }; nativeBuildInputs = [ meson ninja pkgconfig gettext ]; buildInputs = [ gmime libxml2 libsoup ]; diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix deleted file mode 100644 index 2935111df27d..000000000000 --- a/pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-pl-parser-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; - sha256 = "f153a53391e9b42fed5cb6ce62322a58e323fde6ec4a54d8ba4d376cf4c1fbcb"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index deb56e3c51cf..a9d8b2ad11cb 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -5,7 +5,17 @@ , gdk_pixbuf, file, tracker, nautilus }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "totem-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/totem/src.nix b/pkgs/desktops/gnome-3/core/totem/src.nix deleted file mode 100644 index e051b13dee8d..000000000000 --- a/pkgs/desktops/gnome-3/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz; - sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 7213bbdfdb22..6cb3aa39c214 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -10,7 +10,17 @@ , libiptcdata }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-miners-${version}"; + version = "2.0.3"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker-miners/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker-miners"; attrPath = "gnome3.tracker-miners"; }; + }; NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix b/pkgs/desktops/gnome-3/core/tracker-miners/src.nix deleted file mode 100644 index 1c5ee9b35fa1..000000000000 --- a/pkgs/desktops/gnome-3/core/tracker-miners/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-miners-2.0.3"; - - src = fetchurl { - url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.3.tar.xz; - sha256 = "12413a9f8dfa705a48a2697dcbb3eef12ee91bb98f392a23ba4bda7813e41d1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 2596709c0bac..f75de96669d2 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -3,7 +3,17 @@ , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "tracker-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/tracker/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "tracker"; attrPath = "gnome3.tracker"; }; + }; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/core/tracker/src.nix b/pkgs/desktops/gnome-3/core/tracker/src.nix deleted file mode 100644 index 887ae9a865a9..000000000000 --- a/pkgs/desktops/gnome-3/core/tracker/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tracker-2.0.2"; - - src = fetchurl { - url = mirror://gnome/sources/tracker/2.0/tracker-2.0.2.tar.xz; - sha256 = "ece71a56c29151a76fc1b6e43c15dd1b657b37162dc948fa2487faf5ddb47fda"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index 4eadcc05760b..4365451636ae 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -10,7 +10,17 @@ with lib; stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vino-${version}"; + version = "3.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vino"; attrPath = "gnome3.vino"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/vino/src.nix b/pkgs/desktops/gnome-3/core/vino/src.nix deleted file mode 100644 index 8cf55272da97..000000000000 --- a/pkgs/desktops/gnome-3/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.22.0"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.22/vino-3.22.0.tar.xz; - sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix index ef33cc34023c..4abeb2ba9618 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -4,7 +4,17 @@ }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "vte-${version}"; + version = "0.50.2"; + + src = fetchurl { + url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + }; nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; diff --git a/pkgs/desktops/gnome-3/core/vte/src.nix b/pkgs/desktops/gnome-3/core/vte/src.nix deleted file mode 100644 index c63873767dc4..000000000000 --- a/pkgs/desktops/gnome-3/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.50.2"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz; - sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index d849178ae09c..28e89cad9fb8 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-tools-${version}"; + version = "3.18.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; + }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 353b9ccb55e3..341a7d7582ca 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,7 +2,17 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-xsl-${version}"; + version = "3.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp-xsl"; attrPath = "gnome3.yelp-xsl"; }; + }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix deleted file mode 100644 index de5d68d1fab1..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.20.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz; - sha256 = "dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 16e314462858..661ddc1f12f4 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,7 +4,17 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "yelp-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "yelp"; }; + }; propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; diff --git a/pkgs/desktops/gnome-3/core/yelp/src.nix b/pkgs/desktops/gnome-3/core/yelp/src.nix deleted file mode 100644 index dd06a6bf1ebb..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz; - sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; - }; -} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index e7d14188b0c4..fd55fd9f87a6 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -2,7 +2,17 @@ , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; + name = "zenity-${version}"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "zenity"; attrPath = "gnome3.zenity"; }; + }; preBuild = '' mkdir -p $out/include diff --git a/pkgs/desktops/gnome-3/core/zenity/src.nix b/pkgs/desktops/gnome-3/core/zenity/src.nix deleted file mode 100644 index ad0ce2f4d733..000000000000 --- a/pkgs/desktops/gnome-3/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.26.0"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz; - sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; - }; -} |