From 8cc5bdf807d63a0aadeabca17e4a449a2dbab60b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 15:59:17 +0000 Subject: [PATCH 1/6] =?UTF-8?q?json-glib:=201.6.2=20=E2=86=92=201.6.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/json-glib/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9ef66fd2ce69..e041908f3f48 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -9,22 +9,20 @@ , withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , fixDarwinDylibNames -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , gnome }: stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.6.2"; + version = "1.6.6"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; + sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; }; strictDeps = true; @@ -39,13 +37,11 @@ stdenv.mkDerivation rec { pkg-config gettext glib - docbook-xsl-nons - docbook_xml_dtd_43 ] ++ lib.optional stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ] ++ lib.optionals withIntrospection [ gobject-introspection - gtk-doc + gi-docgen ]; propagatedBuildInputs = [ @@ -54,12 +50,23 @@ stdenv.mkDerivation rec { mesonFlags = lib.optionals (!withIntrospection) [ "-Dintrospection=disabled" - # doc gen uses introspection, doesn't work properly + # gi-docgen relies on introspection data "-Dgtk_doc=disabled" ]; doCheck = true; + postFixup = '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + if [[ -d "$out/share/doc" ]]; then + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + fi + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 77c8341cdce5db14546729097f2bdb01216ebdb6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 15:59:45 +0000 Subject: [PATCH 2/6] =?UTF-8?q?librsvg:=202.52.0=20=E2=86=92=202.52.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 03bd2eb96bc6..7cfa4a499f5a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.0"; + version = "2.52.2"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx"; + sha256 = "A9KIfBj/uQbhpg+X/kanFp9pqijW210oV0jzYYsJNCc="; }; nativeBuildInputs = [ From d2f5694571887d347eeab6a28e45cb636a246b65 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 15:59:56 +0000 Subject: [PATCH 3/6] =?UTF-8?q?networkmanager:=201.32.10=20=E2=86=92=201.3?= =?UTF-8?q?2.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 8a1a6dd8fa1b..3913cb0520b7 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.10"; + version = "1.32.12"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g="; + sha256 = "sha256-qKs2oKUC/nPNjjustlhfl/u5Tr73nids268Rwz/49Us="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From be480f08dee8156ca1e99290be6b0696d049f0c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 16:00:13 +0000 Subject: [PATCH 4/6] =?UTF-8?q?vala:=200.54.1=20=E2=86=92=200.54.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index ba64e53876cb..8390ab0ae57e 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -134,8 +134,8 @@ in rec { }; vala_0_54 = generic { - version = "0.54.1"; - sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx"; + version = "0.54.2"; + sha256 = "iE3nRTF9TVbk6M7emT3I8E1Qz8o2z2DS8vJ4wwwrExE="; }; vala = vala_0_54; From e388e5a012c26d90514381b99b31e9848df29560 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 16:00:17 +0000 Subject: [PATCH 5/6] =?UTF-8?q?vala=5F0=5F52:=200.52.5=20=E2=86=92=200.52.?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 8390ab0ae57e..ba9abc0def1d 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -129,8 +129,8 @@ in rec { }; vala_0_52 = generic { - version = "0.52.5"; - sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; + version = "0.52.6"; + sha256 = "sha256-FNfrTZZLfDrcFuRTcTIIbdxmJO0eDruBEeKsgierOnI="; }; vala_0_54 = generic { From 226bc325359c2a24cb672e706167c7e016374972 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 16:26:45 +0200 Subject: [PATCH 6/6] =?UTF-8?q?gi-docgen:=202021.7=20=E2=86=92=202021.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gi-docgen/-/tags/2021.8 --- pkgs/development/tools/documentation/gi-docgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 7e8c61e1c8d2..e10fc7f8bb26 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.7"; + version = "2021.8"; format = "other"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "i2s4JXg+D9sYq1QwVcDRLIr9qnRmzHC+cBInHv4SXHI="; + sha256 = "Y1IdCH6bytxbKIj48IAw/3XUQhoqwPshvdj/d1hRS3o="; }; nativeBuildInputs = [