diff --git a/pkgs/by-name/ge/gexiv2/package.nix b/pkgs/by-name/ge/gexiv2/package.nix index e38d656937cd..ce21a32f7c62 100644 --- a/pkgs/by-name/ge/gexiv2/package.nix +++ b/pkgs/by-name/ge/gexiv2/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.14.5"; + version = "0.14.6"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE="; + sha256 = "YGwoqq57Hz71yOq+Xn3/18WhyGbSW3Zx+4R/4oenK4s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 9f76418519e7..a92b7a771e5b 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "48.beta2"; + version = "48.0"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-4vIgRVGNgWtG0wluCp075lTdggMBVGX8ck/okWrY70E="; + hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index c13a6cb8da5a..50cb9d4058a7 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "48.0"; + version = "48.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; - hash = "sha256-jNqs0FJitjuxYIolrK1RboksMyIyNXy5t/aPLPuG1m4="; + hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 0fd9b87e021f..750662baef97 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -9,10 +9,12 @@ gettext, gperf, glib, + localsearch, sqlite, libarchive, libdmapsharing, libsoup_3, + librest_1_0, gnome, libxml2, lua5_4, @@ -33,11 +35,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.16"; + version = "0.3.18"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs="; + sha256 = "jjznTucXw8Mi0MsPjfJrsJFAKKXQFuKAVf+0nMmkbF4="; }; patches = [ @@ -74,6 +76,7 @@ stdenv.mkDerivation rec { itstool gperf # for lua-factory glib # glib-compile-resources + localsearch ]; buildInputs = [ @@ -88,6 +91,7 @@ stdenv.mkDerivation rec { libarchive libdmapsharing libsoup_3 + librest_1_0 gmime gom json-glib diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix index bcfef88811f8..aa5378c5e067 100644 --- a/pkgs/by-name/gu/gupnp-av/package.nix +++ b/pkgs/by-name/gu/gupnp-av/package.nix @@ -5,11 +5,9 @@ meson, ninja, pkg-config, + gi-docgen, gobject-introspection, vala, - gtk-doc, - docbook-xsl-nons, - docbook_xml_dtd_412, glib, libxml2, gnome, @@ -17,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gupnp-av"; - version = "0.14.3"; + version = "0.14.4"; outputs = [ "out" @@ -27,18 +25,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor version}/gupnp-av-${version}.tar.xz"; - sha256 = "q+IEYEPmapUpNl2JBZvhIhnCGk7eDEdDcDsP2arxe7Q="; + sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + gi-docgen gobject-introspection vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_412 ]; propagatedBuildInputs = [ @@ -46,16 +48,17 @@ stdenv.mkDerivation rec { libxml2 ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - ]; - mesonFlags = [ "-Dgtk_doc=true" ]; doCheck = true; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc/gupnp-av-1.0" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gupnp-av"; diff --git a/pkgs/by-name/js/jsonrpc-glib/package.nix b/pkgs/by-name/js/jsonrpc-glib/package.nix index 51d2b0551148..33720e56ac6d 100644 --- a/pkgs/by-name/js/jsonrpc-glib/package.nix +++ b/pkgs/by-name/js/jsonrpc-glib/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.44.1"; + version = "3.44.2"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "E2HRfpyAVkav5RAuWbr4ykUCOGAPyr0BWGxlS3i7MN8="; + sha256 = "llSWtuExTzRotIKl2ANA3DsDQKVALXeDytJBVK7nc5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix index 66c7ac8b7ea0..2fb121dad148 100644 --- a/pkgs/by-name/li/libspelling/package.nix +++ b/pkgs/by-name/li/libspelling/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libspelling"; - version = "0.4.8"; + version = "0.4.9"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz"; - hash = "sha256-J3ZGKFgY2nspXvAHssXr2BXQkws60JdQWzztlpZa9Rc="; + hash = "sha256-0JP9Na4PHJj7WIdlBSh/wKiF5H2p0kEdbXzVlfNNTr8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 0271e693bde8..fc777d2e7a77 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "NetworkManager-openvpn"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz"; - sha256 = "qhtfmt341kvIxFk2HPDV4+uZ8Utg6oKjUAYxkor2Km8="; + sha256 = "S9ochVm7jDX28THAntrpDN/M0DFOi4y5isVeCbYAWtw="; }; patches = [ diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix index 05d550d7d1f6..da3d143821fd 100644 --- a/pkgs/by-name/si/simple-scan/package.nix +++ b/pkgs/by-name/si/simple-scan/package.nix @@ -1,14 +1,12 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitLab, meson, ninja, pkg-config, gettext, itstool, - python3, wrapGAppsHook4, cairo, gdk-pixbuf, @@ -22,35 +20,28 @@ libxml2, sane-backends, vala, - gnome, + gitUpdater, gobject-introspection, }: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "46.0"; + version = "48.1"; - src = fetchurl { - url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz"; - hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "simple-scan"; + tag = version; + hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g="; }; - patches = [ - # simple-scan: Use RDNN app ID - # https://gitlab.gnome.org/GNOME/simple-scan/-/issues/390 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c09a6def153e52494072a36233c7e7b3307b67bf.patch"; - hash = "sha256-deyssrsVwPAfT5ru6c0LFwR2pEFnZ0v8wMqoi96tw8s="; - }) - ]; - nativeBuildInputs = [ meson ninja gettext itstool pkg-config - python3 wrapGAppsHook4 libxml2 gobject-introspection # For setup hook @@ -70,15 +61,12 @@ stdenv.mkDerivation rec { sane-backends ]; - postPatch = '' - patchShebangs data/meson_compile_gschema.py - ''; - doCheck = true; passthru = { - updateScript = gnome.updateScript { - packageName = "simple-scan"; + updateScript = gitUpdater { + # Ignore tags like 48.1-2, which actually does not introduce any changes. + ignoredVersions = "-"; }; }; diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix index e0fc4f0d6c62..e9b150bed5ab 100644 --- a/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "libgnome-games-support"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AYbyXEiSyGx+rEOjB/wZ22lt9PGayn9U6DwiHfnZeQo="; + sha256 = "grvHTwj5i4M6m2REuEeeG9hN7QoHQl0Fe0XzjoeD5b0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index 128fd56a57e7..291be022365c 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, meson, ninja, @@ -16,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "rest"; - version = "0.9.1"; + pname = "librest"; + version = "0.10.2"; outputs = [ "out" @@ -26,22 +25,10 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM="; + url = "mirror://gnome/sources/librest/${lib.versions.majorMinor version}/librest-${version}.tar.xz"; + sha256 = "e2y5Ers6Is+n3PAFkl3LYogwJNsMCQmUhufWhRGFybg="; }; - patches = [ - # Pick up MR 30 (https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30) to fix GOA crashes with libsoup 3 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/librest/-/commit/fbad64abe28a96f591a30e3a5d3189c10172a414.patch"; - hash = "sha256-r8+h84Y/AdM1IOMRcBVwDvfqapqOY8ZtRXdOIQvFR9w="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/librest/-/commit/8049048a0f7d52b3f4101c7123797fed099d4cc8.patch"; - hash = "sha256-AMhHKzzOoTIlkRwN4KfUwdhxlqvtRgiVjKRfnG7KZwc="; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ @@ -67,18 +54,6 @@ stdenv.mkDerivation rec { "-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt" ]; - postPatch = '' - # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 - substituteInPlace meson.build \ - --replace "con." "conf." - - # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) - # it should be a build-time dep for build - # TODO: send upstream - substituteInPlace docs/meson.build \ - --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" - ''; - postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" @@ -88,7 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "librest"; attrPath = "librest_1_0"; versionPolicy = "odd-unstable"; };