From 76c7dfef031a0897862d90b9834649824b8734d6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:56:25 +0000 Subject: [PATCH 01/11] =?UTF-8?q?gjs:=201.76.0=20=E2=86=92=201.76.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gjs/-/compare/1.76.0...1.76.2 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 3db1a36e3f3c..55425c6aa7f2 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -31,13 +31,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.76.0"; + version = "1.76.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pj8VaWSxNgU+q1HqATEU59fBk7dRjSjAQLawLDyTOm0="; + sha256 = "sha256-99jJ1lPqb9eK/kpQcg4EaqK/wHj9pjXdEwZ90ZnGJdQ="; }; patches = [ From c8e3cbacd75f836591fed3959938a89cde60110b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:56:27 +0000 Subject: [PATCH 02/11] =?UTF-8?q?glib-networking:=202.76.0=20=E2=86=92=202?= =?UTF-8?q?.76.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib-networking/-/compare/2.76.0...2.76.1 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 35091bcbcfcd..8b7c18cf1335 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.76.0"; + version = "2.76.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FJoFoXnmKaU4viVmKqMktJnXxFScUVHbU3PngKG/G5o="; + sha256 = "XGmKmZTd5R79+xAmpWaYoiHWJQ6J3FDrzd2nuBSApCs="; }; patches = [ From e86eb603b3258e6472d82aed3ff92a4b5156981c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:57:46 +0000 Subject: [PATCH 03/11] =?UTF-8?q?gupnp=5F1=5F6:=201.6.3=20=E2=86=92=201.6.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp/-/compare/gupnp-1.6.3...gupnp-1.6.4 --- pkgs/development/libraries/gupnp/1.6.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 2b3cd2566b5b..da830a6366c9 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.3"; + version = "1.6.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg="; + sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/32 - name = "gi-docgen-as-native-dep.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/11d4a33cff1f5d8b8ad4b80c4506246a9e0dff8f.diff"; - hash = "sha256-+p4vzUG2v+7mxtQ5AUcEI7SW0cDX6XlzqlyegF+I1Go="; - }) - ]; - depsBuildBuild = [ pkg-config ]; From 1b499400c0e815a4ce1c0a95f7717a3fda25065c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:58:29 +0000 Subject: [PATCH 04/11] =?UTF-8?q?tracker:=203.5.1=20=E2=86=92=203.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker/-/compare/3.5.1...3.5.3 --- pkgs/development/libraries/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 1df7553e6c69..25049440c6ca 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.5.1"; + version = "3.5.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+XLVCse6/czxE7HrmdyuNUBGhameVb/vFvOsg7Tel00="; + sha256 = "FGbIsIl75dngVth+EK1YkntYgDPwGvLxplaokhw6KO4="; }; patches = [ From 72f9a50f5b21397141833e419fce8be3a0bd877a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:58:16 +0000 Subject: [PATCH 05/11] =?UTF-8?q?networkmanager:=201.42.6=20=E2=86=92=201.?= =?UTF-8?q?42.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/compare/1.42.6...1.42.8 --- pkgs/tools/networking/networkmanager/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index a5cdc383f9ad..ab747df01f86 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -4,7 +4,6 @@ , substituteAll , gettext , pkg-config -, fetchpatch , dbus , gnome , systemd @@ -58,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.42.6"; + version = "1.42.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-jDiKw3daxrzrYF+uIb4sPiYcr+YGeZSonw36RhDtAnk="; + sha256 = "sha256-AzfnWD0uxa3iui6MYl0vCe7M2h0ig27imqcpJdOZw1M="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -126,12 +125,6 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch - - # Support for building with ppp 2.5.0 - (fetchpatch { - url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.diff"; - hash = "sha256-BDm0P2U4HENAtq7OowWVDxqALNbG0nr9k/CLdE61Sck="; - }) ]; buildInputs = [ From c543d28001ad48a39b703b165a43949784aa5231 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 20:52:15 +0200 Subject: [PATCH 06/11] =?UTF-8?q?libqmi:=201.32.2=20=E2=86=92=201.32.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/compare/1.32.2...1.32.4 Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/1.32.4/NEWS --- pkgs/development/libraries/libqmi/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index e2c7fcea1953..62aa346e002a 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch2 , meson , ninja , pkg-config @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.32.2"; + version = "1.32.4"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; @@ -34,18 +33,9 @@ stdenv.mkDerivation rec { owner = "mobile-broadband"; repo = "libqmi"; rev = version; - hash = "sha256-XIbeWgkPiJL8hN8Rb6KFt5Q5sG3KsiEQr0EnhwmI6h8="; + hash = "sha256-cczGvoD+2+G6uiAt0Iv1BO4/FqzO9bkqhFsEwOfp7qw="; }; - patches = [ - # Fix pkg-config file missing qrtr in Requires. - # https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/99 - (fetchpatch2 { - url = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/7d08150910974c6bd2c29f887c2c6d4a3526e085.patch"; - hash = "sha256-LFrlm2ZqLqewLGO2FxL5kFYbZ7HaxdxvVHsFHYSgZ4Y="; - }) - ]; - nativeBuildInputs = [ meson ninja From 32fcf619c831f7df6f642a078c2a48ed49fefe32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 18:32:23 +0000 Subject: [PATCH 07/11] =?UTF-8?q?librsvg:=202.55.1=20=E2=86=92=202.56.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/librsvg/-/compare/2.55.1...2.56.2 --- .../development/libraries/librsvg/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 57ed620fbf8d..9520dda51c48 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -30,30 +30,32 @@ , nix }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.55.1"; + version = "2.56.2"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a69IqdOlb9E7v7ufH3Z1myQLcKH6Ig/SOEdNZqkm+Yw="; + url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; + sha256 = "PsPE2Pc+C6S5EwAmlp6DccCStzQpjTbi/bPrSvzsEgA="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-nRmOB9Jo+mmB0+wXrQvoII4e0ucV7bNCDeuk6CbcPdk="; + inherit (finalAttrs) src; + name = "librsvg-deps-${finalAttrs.version}"; + hash = "sha256-GIEpZ5YMvmYQLcaLXseXQ6gIF7ICtUKq28JCVJ3PEYk="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; strictDeps = true; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ gdk-pixbuf @@ -137,6 +139,13 @@ stdenv.mkDerivation rec { # Merge gdkpixbuf and librsvg loaders cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" ''; postFixup = lib.optionalString withIntrospection '' @@ -189,4 +198,4 @@ stdenv.mkDerivation rec { mainProgram = "rsvg-convert"; platforms = platforms.unix; }; -} +}) From cd94a00aa7447246854fcc859cb07b59d2a73d36 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 21:03:45 +0200 Subject: [PATCH 08/11] stoken: Clean up - Format the expression. - Use static repo name. - Use autoreconfHook. --- pkgs/tools/security/stoken/default.nix | 38 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 04e47dcb8409..7d3709ed2f37 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,30 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config -, libxml2, nettle -, withGTK3 ? true, gtk3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxml2 +, nettle +, withGTK3 ? true +, gtk3 +}: stdenv.mkDerivation rec { pname = "stoken"; version = "0.92"; + src = fetchFromGitHub { owner = "cernekee"; - repo = pname; + repo = "stoken"; rev = "v${version}"; sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; }; - preConfigure = '' - aclocal - libtoolize --automake --copy - autoheader - automake --add-missing --copy - autoconf - ''; - strictDeps = true; - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ - libxml2 nettle - ] ++ lib.optional withGTK3 gtk3; + libxml2 + nettle + ] ++ lib.optionals withGTK3 [ + gtk3 + ]; meta = with lib; { description = "Software Token for Linux/UNIX"; From 551964118c57d9d921d4eb511d9c06025cb621c2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 21:09:15 +0200 Subject: [PATCH 09/11] =?UTF-8?q?stoken:=200.92=20=E2=86=92=200.93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/cernekee/stoken/compare/v0.92...v0.93 --- pkgs/tools/security/stoken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 7d3709ed2f37..526caf44d679 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "stoken"; - version = "0.92"; + version = "0.93"; src = fetchFromGitHub { owner = "cernekee"; repo = "stoken"; rev = "v${version}"; - sha256 = "0q7cv8vy5b2cslm57maqb6jsm7s4rwacjyv6gplwp26yhm38hw7y"; + hash = "sha256-8N7TXdBu37eXWIKCBdaXVW0pvN094oRWrdlcy9raddI="; }; strictDeps = true; From 55032e712fe1669aa4c43e771d729f01d7f7a5f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Jul 2023 20:15:54 +0000 Subject: [PATCH 10/11] =?UTF-8?q?glib:=202.76.3=20=E2=86=92=202.76.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/glib/-/compare/2.76.3...2.76.4 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c3955bc10e30..8a1ba46f50eb 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -56,11 +56,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.76.3"; + version = "2.76.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "wL5ETkA9fDGE0fOU+J8LZEcQtekzG1T6TotQN4E60yo="; + sha256 = "WloZHJaDbhZqd3H36myisAacYDx9o8uhzTjRaUo5Xdo="; }; patches = lib.optionals stdenv.isDarwin [ From 77e1f5126149a16355687e2c7b3e6ea068f65b9b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 11 Jul 2023 01:20:54 +0200 Subject: [PATCH 11/11] gupnp: Fix build against libxml2 2.11 --- pkgs/development/libraries/gupnp/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index bebf109d2778..4bff529a5156 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -33,6 +34,13 @@ stdenv.mkDerivation rec { patches = [ # Bring .pc file in line with our patched pkg-config. ./0001-pkg-config-Declare-header-dependencies-as-public.patch + + # Fix build against libxml2 2.11 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; + hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; + }) ]; depsBuildBuild = [