From 8645d231906977d295ef793798c1307949083317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 15:34:00 +0000 Subject: [PATCH 01/26] python312Packages.nbconvert: 7.16.2 -> 7.16.3 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 8f4d2a53e811..b80f75dc4549 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -33,14 +33,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.2"; + version = "7.16.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gxDt1B4cQ5R+Ts8WYUxhRp68AkiY64CMzgmZhg/J+xY="; + hash = "sha256-pnM7eM49R8P4XlBJmElbB+bqnPm/bsHJjdpj7GrRkUI="; }; # Add $out/share/jupyter to the list of paths that are used to search for From b65cd9bb4df254b62fb7a97d175f1a5792505c11 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 30 Mar 2024 16:36:11 +0100 Subject: [PATCH 02/26] httpdirfs: format with nixfmt-rfc-style --- pkgs/tools/filesystems/httpdirfs/default.nix | 31 +++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix index 6163e1a0158a..1d4952edcbf9 100644 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ b/pkgs/tools/filesystems/httpdirfs/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, curl, expat, fuse, gumbo, libuuid }: +{ + curl, + expat, + fetchFromGitHub, + fuse, + gumbo, + lib, + libuuid, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "httpdirfs"; @@ -7,21 +17,28 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fangfufu"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl expat fuse gumbo libuuid ]; + + buildInputs = [ + curl + expat + fuse + gumbo + libuuid + ]; makeFlags = [ "prefix=${placeholder "out"}" ]; - meta = with lib; { + meta = { description = "A FUSE filesystem for HTTP directory listings"; homepage = "https://github.com/fangfufu/httpdirfs"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ sbruder schnusch ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Only; mainProgram = "httpdirfs"; + maintainers = with lib.maintainers; [ sbruder schnusch ]; + platforms = lib.platforms.unix; }; } From 2ebe93cb8caf8c07efaa8d8723503c6c4028cc8d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 30 Mar 2024 16:39:19 +0100 Subject: [PATCH 03/26] httpdirfs: add passthru.{tests.version,updateScript} --- pkgs/tools/filesystems/httpdirfs/default.nix | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix index 1d4952edcbf9..caf75a26b74c 100644 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ b/pkgs/tools/filesystems/httpdirfs/default.nix @@ -6,18 +6,20 @@ gumbo, lib, libuuid, + nix-update-script, pkg-config, stdenv, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "httpdirfs"; version = "1.2.3"; src = fetchFromGitHub { owner = "fangfufu"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "httpdirfs"; + rev = "refs/tags/${finalAttrs.version}"; sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A="; }; @@ -33,6 +35,17 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + passthru = { + # Disabled for Darwin because requires macFUSE installed outside NixOS + tests.version = lib.optionalAttrs stdenv.isLinux ( + testers.testVersion { + command = "${lib.getExe finalAttrs.finalPackage} --version"; + package = finalAttrs.finalPackage; + } + ); + updateScript = nix-update-script { }; + }; + meta = { description = "A FUSE filesystem for HTTP directory listings"; homepage = "https://github.com/fangfufu/httpdirfs"; @@ -41,4 +54,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ sbruder schnusch ]; platforms = lib.platforms.unix; }; -} +}) From 00632e239431b7e845fb7f20d0e0933fbc65caf7 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 30 Mar 2024 16:48:46 +0100 Subject: [PATCH 04/26] httpdirfs: 1.2.3 -> 1.2.5 https://github.com/fangfufu/httpdirfs/compare/1.2.3...1.2.5 https://github.com/fangfufu/httpdirfs/releases/tag/1.2.5 https://github.com/fangfufu/httpdirfs/releases/tag/1.2.4 --- pkgs/tools/filesystems/httpdirfs/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix index caf75a26b74c..ea0f1a4ac4ee 100644 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ b/pkgs/tools/filesystems/httpdirfs/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, fuse, gumbo, + help2man, lib, libuuid, nix-update-script, @@ -14,16 +15,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "httpdirfs"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "fangfufu"; repo = "httpdirfs"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-rdeBlAV3t/si9x488tirUGLZRYAxh13zdRIQe0OPd+A="; + sha256 = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I="; }; - nativeBuildInputs = [ pkg-config ]; + postPatch = lib.optional stdenv.isDarwin '' + substituteInPlace Makefile --replace-fail '-fanalyzer' '-Xanalyzer' + ''; + + nativeBuildInputs = [ + help2man + pkg-config + ]; buildInputs = [ curl @@ -35,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "prefix=${placeholder "out"}" ]; + postBuild = '' + make man + ''; + passthru = { # Disabled for Darwin because requires macFUSE installed outside NixOS tests.version = lib.optionalAttrs stdenv.isLinux ( @@ -47,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://github.com/fangfufu/httpdirfs/releases/tag/${finalAttrs.version}"; description = "A FUSE filesystem for HTTP directory listings"; homepage = "https://github.com/fangfufu/httpdirfs"; license = lib.licenses.gpl3Only; From 4bc9e0221b2e942087a987f622f3ef3d1b4e649a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 30 Mar 2024 16:48:57 +0100 Subject: [PATCH 05/26] httpdirfs: add anthonyroussel to maintainers --- pkgs/tools/filesystems/httpdirfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/tools/filesystems/httpdirfs/default.nix index ea0f1a4ac4ee..54d16dbfcbb5 100644 --- a/pkgs/tools/filesystems/httpdirfs/default.nix +++ b/pkgs/tools/filesystems/httpdirfs/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/fangfufu/httpdirfs"; license = lib.licenses.gpl3Only; mainProgram = "httpdirfs"; - maintainers = with lib.maintainers; [ sbruder schnusch ]; + maintainers = with lib.maintainers; [ sbruder schnusch anthonyroussel ]; platforms = lib.platforms.unix; }; }) From 3de8f433e235e16ebc53f8198f381347efc2168b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 30 Mar 2024 17:13:30 +0100 Subject: [PATCH 06/26] httpdirfs: move to pkgs/by-name --- .../httpdirfs/default.nix => by-name/ht/httpdirfs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/filesystems/httpdirfs/default.nix => by-name/ht/httpdirfs/package.nix} (100%) diff --git a/pkgs/tools/filesystems/httpdirfs/default.nix b/pkgs/by-name/ht/httpdirfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/httpdirfs/default.nix rename to pkgs/by-name/ht/httpdirfs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5b454bfcb0e..82e86a03ee96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9154,8 +9154,6 @@ with pkgs; http-getter = callPackage ../applications/networking/flent/http-getter.nix { }; - httpdirfs = callPackage ../tools/filesystems/httpdirfs { }; - httpdump = callPackage ../tools/security/httpdump { }; httpie = with python3Packages; toPythonApplication httpie; From 96fd4c843603882148992f4b2c03682e672c5948 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 3 Apr 2024 04:20:00 +0000 Subject: [PATCH 07/26] git-absorb: 0.6.12 -> 0.6.13 Diff: https://github.com/tummychow/git-absorb/compare/refs/tags/0.6.12...0.6.13 --- pkgs/applications/version-management/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 13dcac9fde6d..a3f8c5430d3e 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA="; + hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0="; + cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac="; postInstall = '' installManPage Documentation/git-absorb.1 From c944eceef4504d473e5c75297866f860cad19619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Apr 2024 13:16:24 +0000 Subject: [PATCH 08/26] linuxKernel.packages.linux_6_8.facetimehd: 0.6.8 -> 0.6.8.1 --- pkgs/os-specific/linux/facetimehd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 30d232f6eb88..ceba075758a6 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "0.6.8"; + version = "0.6.8.1"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "patjak"; repo = "facetimehd"; rev = version; - sha256 = "sha256-Tze85Hx1YmStAKenmF/S1JuMDq5eVjBcs3LSWXjyE7w="; + sha256 = "sha256-h5Erga2hlDIWdDKQbkmkLY1aNCibFM7SVSnxVcoToaM="; }; preConfigure = '' From fd50e9893a41a7b217315aec8781346eb096efc8 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 3 Apr 2024 18:00:23 +0200 Subject: [PATCH 09/26] chromium: 123.0.6312.86 -> 123.0.6312.105 https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop.html This update includes 3 security fixes. CVEs: CVE-2024-3156 CVE-2024-3158 CVE-2024-3159 --- .../networking/browsers/chromium/upstream-info.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 908442e2cb80..f6989b585f41 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2024-02-19"; }; }; - hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro="; - hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o="; - version = "123.0.6312.86"; + hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68="; + hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU="; + version = "123.0.6312.105"; }; ungoogled-chromium = { deps = { From 22143317c12b6a8ea90d1f873b8c423dd40ed2cd Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 3 Apr 2024 18:32:36 +0200 Subject: [PATCH 10/26] mozillavpn: add qtwayland to build inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the app not launching in a wayland environment. ❯ mozillavpn Aborted (core dumped) ~/.local/share/mozillavpn.log showed: Warning: Could not find the Qt platform plugin "wayland" in "" Error: This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. Available platform plugins are: linuxfb, minimal, eglfs, minimalegl, vkkhrdisplay, xcb, vnc, offscreen. --- pkgs/tools/networking/mozillavpn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 4974c873894c..49a3894cd49d 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -16,6 +16,7 @@ , qtnetworkauth , qtsvg , qttools +, qtwayland , qtwebsockets , rustPlatform , rustc @@ -74,6 +75,7 @@ stdenv.mkDerivation { qtbase qtnetworkauth qtsvg + qtwayland qtwebsockets ]; nativeBuildInputs = [ From 2792969bd1de6ca2ed1c78cc59067606c6918151 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Apr 2024 09:34:19 -0700 Subject: [PATCH 11/26] spdk: use elfutils instead of abandoned libelf --- pkgs/development/libraries/spdk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index c62f54b14091..46ee5600a4da 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -11,9 +11,10 @@ , openssl , pkg-config , zlib +, zstd , libpcap , libnl -, libelf +, elfutils , jansson , ensureNewerSourcesForZipFilesHook }: @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { jansson libaio libbsd - libelf + elfutils libuuid libpcap libnl @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { openssl ncurses zlib + zstd ]; patches = [ From 5b17986c928ecf33097a504d53e15d7e8b6796fb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Apr 2024 10:00:02 -0700 Subject: [PATCH 12/26] frr: use elfutils instead of abandoned libelf --- pkgs/servers/frr/clippy-helper.nix | 5 +++-- pkgs/servers/frr/default.nix | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/frr/clippy-helper.nix b/pkgs/servers/frr/clippy-helper.nix index bb5887bda0f3..c2b4b918ceca 100644 --- a/pkgs/servers/frr/clippy-helper.nix +++ b/pkgs/servers/frr/clippy-helper.nix @@ -8,7 +8,7 @@ , flex , bison , pkg-config -, libelf +, elfutils , perl , python3 @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libelf python3 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; configureFlags = [ diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d588fee00483..d4adb5ed34fa 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -16,7 +16,7 @@ , c-ares , json_c , libcap -, libelf +, elfutils , libunwind , libyang , net-snmp @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { buildInputs = [ c-ares json_c - libelf libunwind libyang openssl @@ -132,6 +131,8 @@ stdenv.mkDerivation rec { libcap ] ++ lib.optionals snmpSupport [ net-snmp + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; # otherwise in cross-compilation: "configure: error: no working python version found" From 5d22fdc929912d9a72eaa7fca4e3412e26c5f87b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 3 Apr 2024 09:21:57 -0700 Subject: [PATCH 13/26] suricata: use elfutils instead of abandoned libelf --- pkgs/applications/networking/ids/suricata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index efa946606c3e..5789e29263fc 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -5,12 +5,12 @@ , llvm , pkg-config , makeWrapper +, elfutils , file , hyperscan , jansson , libbpf , libcap_ng -, libelf , libevent , libmaxminddb , libnet @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { ; buildInputs = [ + elfutils jansson libbpf libcap_ng - libelf libevent libmagic libmaxminddb From ca00c542b24151ad8d2e50f333b053c2c8cd088b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 3 Apr 2024 20:46:12 +0200 Subject: [PATCH 14/26] incus.ui: 0.6 -> 0.7 --- pkgs/by-name/in/incus/ui.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix index 705d715f0cfd..ec7518ef83ad 100644 --- a/pkgs/by-name/in/incus/ui.nix +++ b/pkgs/by-name/in/incus/ui.nix @@ -11,25 +11,25 @@ stdenv.mkDerivation rec { pname = "incus-ui"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; + hash = "sha256-DJLkXZpParmEYHbTpl6KFC9l9y5DqzUTrC0pb2dJXI4="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; + hash = "sha256-ckTWE/czzvxbGOF8fsJ3W1sal7+NaHquoSjZSPjkGj4="; }; zabbly = fetchFromGitHub { owner = "zabbly"; repo = "incus"; - rev = "3eabc1960e99e7e515916e3ea7068a412a8c420b"; - hash = "sha256-Kw53Qjurc6WPswB38v6wuRhuuGE34uYxNoAKH4UmTBE="; + rev = "c83023587eb0e3b01c99ba26e63f757ac15c6f9c"; + hash = "sha256-cWKp4ALrae6nEBLvWcOM1T+Aca7eHLwsRguH9aSb10Y="; }; patchPhase = '' From 2d975504f285ab23bfc6bc0cf2f2aba2987d4e34 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:18:31 +1000 Subject: [PATCH 15/26] go_1_21: 1.21.8 -> 1.21.9 Changelog: https://go.dev/doc/devel/release#go1.21 --- pkgs/development/compilers/go/1.21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 8250cf9515b9..a03f87c2e7b7 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.8"; + version = "1.21.9"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-3IBs91qH4UFLW0w9y53T6cyY9M/M7EK3r2F9WmWKPEM="; + hash = "sha256-WPDFztRaABK84v96nfA+Eoq8yIGOur5QJ7uSuv4g5CE="; }; strictDeps = true; From 05dd2c62ec955216958b4d190a3f37daab1a589e Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 4 Apr 2024 01:13:47 +0200 Subject: [PATCH 16/26] ungoogled-chromium: 123.0.6312.86-1 -> 123.0.6312.105-1 https://chromereleases.googleblog.com/2024/04/stable-channel-update-for-desktop.html This update includes 3 security fixes. CVEs: CVE-2024-3156 CVE-2024-3158 CVE-2024-3159 --- .../networking/browsers/chromium/upstream-info.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index f6989b585f41..d6f71c277692 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -28,12 +28,12 @@ version = "2024-02-19"; }; ungoogled-patches = { - hash = "sha256-ET/fAQCpCx1wadA52mcEA3lBlIZPIK/DX2r2vhGf79o="; - rev = "123.0.6312.86-1"; + hash = "sha256-81SoZBOAAV0cAVzz3yOzBstRW3vWjmkFoFNjYdPnme4="; + rev = "123.0.6312.105-1"; }; }; - hash = "sha256-b72MiRv4uxolKE92tK224FvyA56NM3FcCjijkc9m3ro="; - hash_deb_amd64 = "sha256-JsEJw8aEptesRiCtIrfHRQu1xq27TzHSmUr+dsvnV7o="; - version = "123.0.6312.86"; + hash = "sha256-C17TPDVFW3+cHO1tcEghjI6H59TVPm9hdCrF2s5NI68="; + hash_deb_amd64 = "sha256-zmnBi4UBx52fQKHHJuUaCMuDJl7ntQzhG6h/yH7YPNU="; + version = "123.0.6312.105"; }; } From a46ea22b3b86af9ca2a48a04fd33280ff4b3b619 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:27:19 +0200 Subject: [PATCH 17/26] python312Packages.aioairzone-cloud: 0.4.6 -> 0.4.7 Diff: https://github.com/Noltari/aioairzone-cloud/compare/refs/tags/0.4.6...0.4.7 Changelog: https://github.com/Noltari/aioairzone-cloud/releases/tag/0.4.7 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index f2ab45f2ddbc..eb9bd5619961 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-EcvHwBSHjKvPqwGCPPpannuSZcDI2Lt2hT5NSgkwfq8="; + hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts="; }; nativeBuildInputs = [ From 295b923006855cc81ac2866f82e3792a6498486d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:27:46 +0200 Subject: [PATCH 18/26] python312Packages.aioairzone-cloud: refactor --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index eb9bd5619961..f99919af7786 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp ]; From a5e0ce69b1b27d2ed66b16ae977af9cfb04f0f08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:28:17 +0200 Subject: [PATCH 19/26] python312Packages.aioairzone-cloud: use nixfmt --- .../aioairzone-cloud/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index f99919af7786..c6c6e11e293f 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -1,9 +1,10 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,17 +21,11 @@ buildPythonPackage rec { hash = "sha256-DIWRYGDdK/wq1TrPSo9I1oZv5jX4rY4z+u7CTwJtyts="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; - pythonImportsCheck = [ - "aioairzone_cloud" - ]; + pythonImportsCheck = [ "aioairzone_cloud" ]; # Module has no tests doCheck = false; From ef46c920b58a2615350f1975940ec96d9c53f78c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:29:18 +0200 Subject: [PATCH 20/26] python312Packages.aioopenexchangerates: 0.4.8 -> 0.4.9 Diff: https://github.com/MartinHjelmare/aioopenexchangerates/compare/refs/tags/v0.4.8...v0.4.9 Changelog: https://github.com/MartinHjelmare/aioopenexchangerates/blob/v0.4.9/CHANGELOG.md --- .../python-modules/aioopenexchangerates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 668274ff85df..ecd6c5982537 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.8"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-qwqhbHp4JPsbA6g7SI2frtqhayCmA1s3pTW2S4r6gmw="; + hash = "sha256-goOzp5nPkQCtGV7U71ek1LQ93Ko5BdEvawYb/feGRQQ="; }; postPatch = '' From 775475671f508e2aa17c5e2f0d56be5bba0bbb24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:30:50 +0200 Subject: [PATCH 21/26] python312Packages.aioopenexchangerates: refactor --- .../aioopenexchangerates/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index ecd6c5982537..54803ccfd8cd 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -27,19 +27,22 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "pydantic" ]; - propagatedBuildInputs = [ + build-system = [ + poetry-core + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + dependencies = [ aiohttp pydantic ]; From b7ce74df557a6119594f96192f161687320999f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:31:40 +0200 Subject: [PATCH 22/26] python312Packages.aioopenexchangerates: use nixfmt --- .../aioopenexchangerates/default.nix | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 54803ccfd8cd..34948ce7b78d 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -1,14 +1,15 @@ -{ lib -, aiohttp -, aioresponses -, pydantic -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pytest-aiohttp -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + aiohttp, + aioresponses, + pydantic, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { @@ -30,17 +31,11 @@ buildPythonPackage rec { --replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" ''; - pythonRelaxDeps = [ - "pydantic" - ]; + pythonRelaxDeps = [ "pydantic" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ aiohttp @@ -53,9 +48,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "aioopenexchangerates" - ]; + pythonImportsCheck = [ "aioopenexchangerates" ]; meta = with lib; { description = "Library for the Openexchangerates API"; From 74569b7d4a7a1fcb6f9512cd3bc11b8f630330df Mon Sep 17 00:00:00 2001 From: krovuxdev <62192487+krovuxdev@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:59:34 -0500 Subject: [PATCH 23/26] bun: 1.0.36 -> 1.1.0 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index dc91e8c6939b..152059eb9958 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.36"; + version = "1.1.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-NYsCwYdYL8cw5uPaViCA+fcaP1znNzvRCJuhnFixx84="; + hash = "sha256-ggODKY9y8J0xY1SImiQq0qVepi6ywXB95kyg6zPoaLw="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-ztRE4MxrAkSvORTGU5veDj5qhchYbsY4BxP6duZLeoQ="; + hash = "sha256-QFA1MjtBAt3a/HAe2Mdv8LA2Iv5ayO279gOOuFqEZ/E="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-p8YqXW1iShvTX2bB0UrD9yh5PMpcaoiUJ5ZfCrEZmsI="; + hash = "sha256-Dwv5Osqel0wWuzprXOXiIq87259REPs5ZSczhXDG23k="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-+AR0EYOVOgvElDzQjCtlCg5oZFBtLfdEmrL1jFWDAfQ="; + hash = "sha256-WhfqYTVkdaSjoN7zRcRodfLPK2K579tluSEEXTVzOFM="; }; }; updateScript = writeShellScript "update-bun" '' From 65e42f1289b83e019817226ceabd89211476430c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 00:12:18 +0000 Subject: [PATCH 24/26] typeshare: 1.8.0 -> 1.9.0 --- pkgs/development/tools/rust/typeshare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 85880dca6571..8f784bc72d6c 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk="; + hash = "sha256-20IaTC0fMt6ADSwyQh9yBn3i3z6cmQ1j/wy1KNB3Dog="; }; - cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo="; + cargoHash = "sha256-5jY4GO/EbBokE9p9e68bTKj6nJ0LhtWYHtFGfTIf9Po="; nativeBuildInputs = [ installShellFiles ]; From 1f30735a90165ea357ffdb02d14ef097dcff2b24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 00:47:40 +0000 Subject: [PATCH 25/26] buf: 1.30.0 -> 1.30.1 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 814e13417471..c9ce9386a844 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-SHwmX9/9qqhpTDVKf+0HAJqPvSKKoUyxHqCe8WXhMUc="; + hash = "sha256-1He9Vei2OXiBszZvATk1ALGWAneC4yucPohp/O6gsTo="; }; - vendorHash = "sha256-4ccctJ5C4/Ff+wLrZPR1oS0tjqkULAsTjKm3X8WDr6o="; + vendorHash = "sha256-OXzEcpEYnYndYHRhKm2oYsm463ZWeujOvQpIj0zz7+g="; patches = [ # Skip a test that requires networking to be available to work, From 163402aa53666419eaac639df0797a4355fbca2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 01:59:13 +0000 Subject: [PATCH 26/26] xiu: 0.12.5 -> 0.12.6 --- pkgs/by-name/xi/xiu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index a7551bd24332..c6088ed389e8 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xiu"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "harlanc"; repo = "xiu"; rev = "v${version}"; - hash = "sha256-JST8nxsT+w524VzNeIW38Oct/n7VJ/nvrmgks2Vff30="; + hash = "sha256-53fVb5c9uS92/rPvZDWXxZX42p4cHqumGe6Dw+/hLvk="; }; - cargoHash = "sha256-te60gZdDmbgOF6rLDAnvDx6vUbmCz3pC/wbu/iXgxAw="; + cargoHash = "sha256-ICZQ+UJ4LPNSeT9SjdcCUXgam40hMAOrJmLIwPEfqs4="; nativeBuildInputs = [ cmake