From d0ce5d642d235d10863a0d19d554b84c8e4bab37 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 02:54:50 +0200 Subject: [PATCH 01/15] libxml2Python: Remove updateScript `update.nix` considers this a different package from `libxml2` based on `meta.position`. As a result `update.nix` in commit mode would crash when it tried to cherry pick `libxml2Python` update after `libxml2` commit has already been picked. nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.match "libxml.+" pkg.name != null)' --argstr keep-going true --argstr commit true Perhaps we should consider synchronizing all the worktrees after each commit so that conflicting updates would not happen in different worktrees but removing the update script is easier. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7dae96a18cb1..ebc912ab44ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23207,7 +23207,8 @@ with pkgs; in pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; - inherit (libxml2) passthru; + # Avoid update.nix conflicts with libxml2. + passthru = builtins.removeAttrs libxml2.passthru [ "updateScript" ]; # the hook to find catalogs is hidden by buildEnv postBuild = '' mkdir "$out/nix-support" From 30645470ee167d28952b486aec301e074573a12c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:56:18 +0000 Subject: [PATCH 02/15] =?UTF-8?q?gcab:=201.5=20=E2=86=92=201.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gcab/-/compare/v1.5...v1.6 --- pkgs/development/libraries/gcab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index ad5ef1ced5b8b..b31e93553766d 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gcab"; - version = "1.5"; + version = "1.6"; outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww="; + url = "mirror://gnome/sources/gcab/${lib.versions.majorMinor version}/gcab-${version}.tar.xz"; + hash = "sha256-LwyWFVd8QSaQniUfneBibD7noVI3bBW1VE3xD8h+Vgs="; }; patches = [ From 831b8c3d44ea947d32b90bc01c1c734f072f3a1a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:57:06 +0000 Subject: [PATCH 03/15] =?UTF-8?q?gvfs:=201.50.4=20=E2=86=92=201.50.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gvfs/-/compare/1.50.4...1.50.5 --- pkgs/development/libraries/gvfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 39c06d23fdb23..51526ebf32e14 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.50.4"; + version = "1.50.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q5BZpnalN+2+ohOIwqr+Gn4sjxrC39xtZFUCMwdUV/0="; + url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; + hash = "sha256-uG8JtzMchkLs6/RqPNoGkvXrJghvEyMmpUg8Lr+GpMs="; }; patches = [ From 81a554f12538f6f3df3cc83cbf8fd0c4d0b1d8d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:58:14 +0000 Subject: [PATCH 04/15] =?UTF-8?q?msitools:=200.101=20=E2=86=92=200.102?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/msitools/-/compare/v0.101...v0.102 --- .../tools/misc/msitools/default.nix | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 84a9a1135b51b..84d699311b5ea 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , vala @@ -19,28 +18,13 @@ stdenv.mkDerivation rec { pname = "msitools"; - version = "0.101"; + version = "0.102"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4="; + url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz"; + hash = "sha256-+khaQhOX71/gLfWrk/ztkav2hXMPQPlMcVe0MNJKNJg="; }; - patches = [ - # Fix executable bit on tools (regression in Meson migration). - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch"; - sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U="; - }) - - # Fix failure on big-endian platforms. - # https://gitlab.gnome.org/GNOME/msitools/issues/31 - (fetchpatch { - url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch"; - sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo="; - }) - ]; - nativeBuildInputs = [ meson ninja From 9818a0e0f88eea940ee399f7533f4a0b682cd469 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 18:29:49 +0200 Subject: [PATCH 05/15] =?UTF-8?q?malcontent:=200.11.0=20=E2=86=92=200.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/pwithnall/malcontent/-/compare/0.11.0...0.11.1 --- .../malcontent/better-separation.patch | 23 +++++++++++-------- .../libraries/malcontent/default.nix | 6 ++--- pkgs/development/libraries/malcontent/ui.nix | 6 ----- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/malcontent/better-separation.patch b/pkgs/development/libraries/malcontent/better-separation.patch index ef42650e249d1..24effe9dde045 100644 --- a/pkgs/development/libraries/malcontent/better-separation.patch +++ b/pkgs/development/libraries/malcontent/better-separation.patch @@ -1,4 +1,4 @@ -commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f +commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5 Author: Jan Tojnar Date: Thu Jul 23 18:49:03 2020 +0200 @@ -22,7 +22,7 @@ Date: Thu Jul 23 18:49:03 2020 +0200 https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946 diff --git a/meson.build b/meson.build -index 6e1dfa5..196350b 100644 +index 038dd35..e3c77f0 100644 --- a/meson.build +++ b/meson.build @@ -123,9 +123,8 @@ test_env = [ @@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644 subdir('libmalcontent') else libmalcontent_api_version = '0' -@@ -136,11 +135,16 @@ endif - if get_option('ui').enabled() +@@ -143,14 +142,19 @@ if get_option('ui').enabled() + ) subdir('libmalcontent-ui') endif -subdir('malcontent-client') @@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644 if get_option('ui').enabled() subdir('malcontent-control') + subdir('help') -+endif -+if not get_option('use_system_libmalcontent') -+ subdir('pam') -+ subdir('po') + + gnome.post_install( + gtk_update_icon_cache: true, + update_desktop_database: true, + ) endif -subdir('pam') -subdir('po') - - meson.add_install_script('build-aux/meson_post_install.py') ++if not get_option('use_system_libmalcontent') ++ subdir('pam') ++ subdir('po') ++endif diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 92ec23542883f..d897230f8f377 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.11.0"; + version = "0.11.1"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pwithnall"; - repo = pname; + repo = "malcontent"; rev = version; - sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA="; + hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw="; }; patches = [ diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index 8969d1e134284..59950a75c745b 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -66,12 +66,6 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; - postPatch = '' - # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148 - substituteInPlace build-aux/meson_post_install.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; From d178fcafb3859a11da39ab04268fbc365d8b52f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 18:48:46 +0200 Subject: [PATCH 06/15] =?UTF-8?q?hid-tools:=200.3.1=20=E2=86=92=200.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/libevdev/hid-tools/-/compare/0.3.1...0.4 --- pkgs/tools/misc/hid-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/tools/misc/hid-tools/default.nix index 0d31ceea2dcf5..dcba7fb105324 100644 --- a/pkgs/tools/misc/hid-tools/default.nix +++ b/pkgs/tools/misc/hid-tools/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonPackage rec { pname = "hid-tools"; - version = "0.3.1"; + version = "0.4"; format = "setuptools"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonPackage rec { owner = "libevdev"; repo = "hid-tools"; rev = version; - sha256 = "r496SKBGgHriIhriWYhhCSiChQUKhnHT/lEx9sEoT/0="; + hash = "sha256-pxU1BvB+rjc5sptafMGnWi+vWPNDyCyUv8gTWg6z5hU="; }; propagatedBuildInputs = with python3.pkgs; [ From ce4922b6604d805a5258f4451157a775ae1de299 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 18:58:00 +0200 Subject: [PATCH 07/15] =?UTF-8?q?babl:=200.1.102=20=E2=86=92=200.1.106?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/babl/-/compare/BABL_0_1_102...BABL_0_1_106 --- pkgs/development/libraries/babl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 8273553a14aba..12dcbd12b9ddd 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.102"; + version = "0.1.106"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0"; + url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/babl-${version}.tar.xz"; + hash = "sha256-0yUTXTME8IjBNMxiABOs8DXeLl0SWlCi2RBU5zd8QV8="; }; nativeBuildInputs = [ From 2362cd5a2eed7f35e7dbbfd0a003317541e2bdaf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 19:01:15 +0200 Subject: [PATCH 08/15] =?UTF-8?q?deja-dup:=2044.1=20=E2=86=92=2044.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/deja-dup/-/compare/44.1...44.2 --- pkgs/applications/backup/deja-dup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 68d3d92b169f5..c2212373e70ff 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "44.1"; + version = "44.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = pname; + repo = "deja-dup"; rev = version; - sha256 = "sha256-+Z8o45ZJOmYN+G4viGJW+9BPL6gNitfFBu76qx+sOF0="; + hash = "sha256-TnyH2tIvzG1B2hbDPyFyaTArfuMJaP6GKw6yahwsQ1Q="; }; patches = [ From 92d436705bfc79d1cd35a5b81fe3ac9195422526 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 19:12:04 +0200 Subject: [PATCH 09/15] =?UTF-8?q?gnome-keysign:=201.2.0=20=E2=86=92=201.3.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://gitlab.gnome.org/GNOME/gnome-keysign/-/compare/1.2.0...1.3.0 --- pkgs/tools/security/gnome-keysign/default.nix | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index f5157fc9e4190..56ea016eda93d 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitLab -, fetchpatch , python3 , wrapGAppsHook , gobject-introspection @@ -11,32 +10,16 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-keysign"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; + repo = "gnome-keysign"; rev = version; - sha256 = "1sjphi1lsivg9jmc8khbcqa9w6608pkrccz4nz3rlcc54hn0k0sj"; + hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss="; }; - patches = [ - # fix build failure due to missing import - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch"; - sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990"; - }) - - # stop requiring lxml (no longer used) - # https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch"; - sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy"; - includes = [ "setup.py" ]; - }) - ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection From 74d0c97cc69a72f3dd738f77edcb111339a7dc88 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 19:06:13 +0200 Subject: [PATCH 10/15] =?UTF-8?q?speechd:=200.11.2=20=E2=86=92=200.11.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/brailcom/speechd/releases/tag/0.11.3 https://github.com/brailcom/speechd/releases/tag/0.11.4 --- pkgs/development/libraries/speechd/default.nix | 4 ++-- pkgs/development/libraries/speechd/fix-paths.patch | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 962d056ce7dd7..16bc36a781240 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let inherit (python3Packages) python pyxdg wrapPython; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.11.2"; + version = "0.11.4"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i0ZJkl5oy+GntMCge7BBznc4s1yQamAr+CmG2xqg82Q="; + sha256 = "sha256-jAkiG7ctnbXInP17kZdxgyuGw6N3LWRWAWlklO31Zrk="; }; patches = [ diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/development/libraries/speechd/fix-paths.patch index acf7e5e08f4fd..7509c1842ba87 100644 --- a/pkgs/development/libraries/speechd/fix-paths.patch +++ b/pkgs/development/libraries/speechd/fix-paths.patch @@ -1,9 +1,11 @@ +diff --git a/speech-dispatcherd.service.in b/speech-dispatcherd.service.in +index ab14b99d..12521b1b 100644 --- a/speech-dispatcherd.service.in +++ b/speech-dispatcherd.service.in -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ Description=Speech-Dispatcher, common interface to speech synthesizers [Service] Type=forking - ExecStart=@bindir@/speech-dispatcher -d + ExecStart=@bindir@/speech-dispatcher -d -t 0 -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=@utillinux@/bin/kill -HUP $MAINPID From 33660f9e2d343bcfe09d75db527981296730b338 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 6 Jul 2023 00:18:25 +0000 Subject: [PATCH 11/15] =?UTF-8?q?gnome.geary:=2043.0=20=E2=86=92=2044.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/geary/-/compare/43.0...44.0 --- pkgs/desktops/gnome/misc/geary/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index 37a5cf2cace50..1a6189e6c3ef4 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , pkg-config , gtk3 , vala @@ -48,26 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "43.0"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c="; + sha256 = "gBSsWorTxURMpWl32a0QBr1vTvXJLkNzXFEw3o7ckJ0="; }; - patches = [ - # Fix build with Vala 0.56.7 & 0.57+ - # https://hydra.nixos.org/build/217892787 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch"; - sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4="; - }) - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch"; - sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw="; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils From 33fadac2296ee622ad7803becfbb52d7f4169bb5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Jul 2023 22:15:27 +0200 Subject: [PATCH 12/15] gedit: Fix updateScript attr-path Missed in 6bbcd65c4486d09395e37ce10fbbcb9b3f58c371 --- pkgs/applications/editors/gedit/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index a7afca46ee6c5..5fa77f0ca4c9e 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gedit"; - attrPath = "gnome.gedit"; }; }; From 5a5c30719220dbd1c8ae0e20ebefa614bc9818ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Jul 2023 20:16:25 +0000 Subject: [PATCH 13/15] =?UTF-8?q?gnome.gnome-shell:=2044.2=20=E2=86=92=204?= =?UTF-8?q?4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 528f44ae66d51..7528f1bc3a5de 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.2"; + version = "44.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8="; + sha256 = "VWlLccLuTq72DZNCgAPy6qTPABhoSPXja0XP5Qb8Mb8="; }; patches = [ From 20627266997d164e22bcb5c991b7d912ccd41137 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Jul 2023 20:16:34 +0000 Subject: [PATCH 14/15] =?UTF-8?q?gnome.mutter:=2044.2=20=E2=86=92=2044.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index c502eefa352ec..360095a8ad1d6 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.2"; + version = "44.3"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE="; + sha256 = "GFy+vyFQ0+RQVQ43G9sTqLTbCWl4sU+ZUh6WbqzHBVE="; }; mesonFlags = [ From 48ae1081ebe48452dc83e5f496fefd3d13c1b4ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Jul 2023 11:55:31 +0000 Subject: [PATCH 15/15] =?UTF-8?q?libshumate:=201.0.3=20=E2=86=92=201.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.0.3...1.0.4 --- pkgs/development/libraries/libshumate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 810047394e30b..3274f22d654a7 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "gT6jpFN0mkSdDs+8GQa0qKuL5KLzxanBMGwA4EATW7Y="; + sha256 = "yiPHrI0QU6AcyPWlJoMlI3GvGZU+7+3mFcyR3ViJGzc="; }; nativeBuildInputs = [