diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 998341d6bb524..38f38ae3a51b9 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ stdenv +, lib , ctags +, cmark , appstream-glib , desktop-file-utils -, docbook_xsl -, docbook_xml_dtd_43 , fetchurl , flatpak , gnome , libgit2-glib +, gi-docgen , gobject-introspection , glade , gspell -, gtk-doc , gtk3 , gtksourceview4 , json-glib @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.40.2"; + version = "41.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - docbook_xsl - docbook_xml_dtd_43 + gi-docgen gobject-introspection - gtk-doc meson ninja pkg-config @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags + cmark flatpak gnome.devhelp glade @@ -92,8 +93,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - outputs = [ "out" "devdoc" ]; - prePatch = '' patchShebangs build-aux/meson/post_install.py ''; @@ -134,9 +133,13 @@ stdenv.mkDerivation rec { done ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + passthru.updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; meta = with lib; { diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 50e1babda2acd..d412c6fded878 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.4"; + version = "3.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; + sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fe739cb581a38..688d5acdd1278 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -8,7 +8,6 @@ , gettext , yelp-tools , itstool -, libxmlxx3 , python , pygobject3 , gtk3 @@ -35,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; + sha256 = "dpflFEXhn9d05osWCtr2aHuAgXLeBBdgLhaXZra21L0="; }; patches = [ @@ -58,7 +57,6 @@ buildPythonApplication rec { autoreconfHook wrapGAppsHook pkg-config - libxmlxx3 gettext yelp-tools itstool diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 9859163031c34..f3400f7e8e026 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index a00b239641f82..1f2cb9dc52e1a 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -13,6 +13,7 @@ , wrapGAppsHook , glib , gtk3 +, libhandy , libxml2 , gtk-vnc , gtk-frdp @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; + hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { glib gtk-vnc gtk3 + libhandy libxml2 gtk-frdp ]; diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 11cd3735e1d53..39eb0338332c7 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.4"; + version = "41.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; + sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 3d2f19b02e8b6..7d15e6b41ef60 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , intltool , fetchFromGitLab , meson @@ -11,7 +12,6 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome , itstool , libxml2 , yelp-tools @@ -25,6 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection +, nix-update-script }: let @@ -93,8 +94,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = "gnome.gucharmap"; }; }; diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 7d1d4e90abf05..0178c04b53ca9 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; + sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index fb134962b74a2..ba64e53876cb9 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -91,10 +91,11 @@ let doCheck = false; # fails, requires dbus daemon passthru = { - updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - packageName = pname; - }; + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + freeze = true; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix index 03dd009d26412..6b22c34e0c2f5 100644 --- a/pkgs/development/libraries/atkmm/2.36.nix +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "atkmm_2_36"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index ff3e9ee52e998..a556b64f1d385 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,26 +1,69 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, exiv2 +, glib +, gnome +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +}: stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.3"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; + sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4="; }; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ exiv2 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + # Python binding overrides + python3 + python3.pkgs.pygobject3 + ]; + + propagatedBuildInputs = [ + exiv2 + ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" ]; doCheck = true; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/libgexiv2.so.2 $out/lib/libgexiv2.so.2 + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -31,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index db713cf9ea5f8..1ba18898ad892 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.68.1"; + version = "2.70.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w="; + sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index dfa454b9253ac..f409935372eed 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.1"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; + sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 4194064a5a29a..1f2966695d864 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index c5decffe74e2e..8a07f31b818d4 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -9,6 +9,7 @@ , cairo , gtk3 , glib +, gnome }: stdenv.mkDerivation rec { @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 1bc763349a869..03268fb024c66 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 4e706f409870d..7642080086562 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # stable version has not been released yet, last update 2015 }; }; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 13ec503fae0e6..ed8f8edd656fb 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; + sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 172ae39536e6e..16897c6f04468 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; + setupHook = ./setup-hook.sh; + src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - - setupHook = ./setup-hook.sh; - mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 7123aa0d3ac1f..76adcc1fae338 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "gst_all_1.gstreamermm"; + attrPath = "gst_all_1.gstreamermm"; + packageName = "gstreamermm"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index e6c6d93919331..b7c2d5d3aa9c6 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,19 @@ , glib , gtk3 , freerdp -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "3.37.1-unstable-2020-10-26"; + version = "unstable-2021-10-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; - sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; + sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; }; nativeBuildInputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). + url = "${meta.homepage}.git"; + branch = "gtk-frdp-0-1"; }; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7999d62b91125..499615a79c1c7 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2e43e58db42da..734cf833fd846 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 0a654d9518dca..67afc4026d1ac 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; + sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index e5563d37f1ace..0095b6ca9e08c 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 3011a126c10de..5bdcc029c5c8c 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "gtksourceviewmm4"; packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 2b9124032590e..cdc96f3f1a04b 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index b3f6e1a7cdd99..63acabb320e4c 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -87,6 +87,7 @@ assert postgresSupport -> postgresql != null; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index ad5e0cbecd6e8..34735e644e436 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. }; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cbc2c8a617b4e..d4583c74df0ff 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; + sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 6fd7f3e696a2c..b958ba3076747 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { glib-networking.out ]; updateScript = gnome.updateScript { - attrPath = "libsoup3"; + attrPath = "libsoup_3"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 6d2150103a107..f902d32037761 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 39a1d505b6521..c78cc192a7cff 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "3.36.0"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; }; nativeBuildInputs = [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 67c5a0794ed5f..19af942d759f7 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "libxmlxx"; packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 41c842220c7de..b3ff59ad41e17 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; + passthru = { + updateScript = gnome.updateScript { + attrPath = "libxmlxx3"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a5553dd0d00a4..2668de9b4612e 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; + sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fc3be7421adb2..d6864b80f9ed0 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; + sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; }; nativeBuildInputs = [