From 71e70e3aad8f0238ebe2bdaa72a7355cd0823aaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Dec 2023 12:33:14 +0000 Subject: [PATCH 01/22] lilypond-unstable: 2.25.10 -> 2.25.11 --- pkgs/misc/lilypond/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 0285a72393c7..77ac8c3e8d36 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.10"; + version = "2.25.11"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-j1XeQRkcBtrGMJQaFIbp/XktYREEL6ODGXnKt/RtwSA="; + hash = "sha256-DDvo1LBTnDVSDyRDYF0aEToFsmvW1dlTaMHdpBEOdMI="; }; passthru.updateScript = { From 199dda40ae24cf410c93d2e0b37613d8c34d48b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 10:59:10 +0000 Subject: [PATCH 02/22] opencl-headers: 2023.02.06 -> 2023.12.14 --- pkgs/development/libraries/opencl-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 211a8b6b22e9..50169b1f91bb 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opencl-headers"; - version = "2023.02.06"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; rev = "v${version}"; - sha256 = "sha256-BJDaDokyHgmyl+bGqCwG1J7iOvu0E3P3iYZ1/krot8s="; + sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; }; nativeBuildInputs = [ cmake ]; From 55a7977b4c10e8a3bf9e12deb16ca57d906256ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 04:20:00 +0000 Subject: [PATCH 03/22] opencl-headers: add reverse dependencies to passthru.tests --- pkgs/development/libraries/opencl-headers/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 50169b1f91bb..60399c7d4ee0 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,6 +2,9 @@ , stdenv , fetchFromGitHub , cmake +, hashcat +, ocl-icd +, tesseract }: stdenv.mkDerivation rec { @@ -17,6 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + passthru.tests = { + inherit ocl-icd tesseract hashcat; + }; + meta = with lib; { description = "Khronos OpenCL headers version ${version}"; homepage = "https://www.khronos.org/registry/cl/"; From fc7686495f4b075cbb0e8821103c4f3a7411f8d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 04:20:00 +0000 Subject: [PATCH 04/22] squawk: 0.24.2 -> 0.26.0 Diff: https://github.com/sbdchd/squawk/compare/v0.24.2...v0.26.0 Changelog: https://github.com/sbdchd/squawk/blob/v0.26.0/CHANGELOG.md --- pkgs/development/tools/squawk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 417c66ea3a6f..5f82d401e325 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-gFJaW7Mb3HKN6D/qnpfNQVxBOKbxIBZOVWJ63wiGoeU="; + hash = "sha256-ibgtgzpdNwQk/X5xz3XOM6Wi9xA8v4DAnj/86UKnXXk="; }; - cargoHash = "sha256-a1kAVIyGnVF3IWkDQbmV3L9cfY+1564RW6eWfBHbTZ8="; + cargoHash = "sha256-d2txSyTVU6CAnItpRttgOcDeH/8mVuPL636h/g67qgg="; nativeBuildInputs = [ pkg-config From 3572dd8dc64664cf9f3a80d807b1d76886dbfc8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 04:20:00 +0000 Subject: [PATCH 05/22] opencl-headers: add pkg-config tester --- .../libraries/opencl-headers/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 60399c7d4ee0..6a00c86105a8 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -5,16 +5,17 @@ , hashcat , ocl-icd , tesseract +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencl-headers"; version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; }; @@ -22,12 +23,17 @@ stdenv.mkDerivation rec { passthru.tests = { inherit ocl-icd tesseract hashcat; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "OpenCL-Headers" ]; + }; }; meta = with lib; { - description = "Khronos OpenCL headers version ${version}"; + description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = [ ]; }; -} +}) From ea210cb88ed95113b53dcc034252f8f41773383b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 14 Dec 2023 07:59:31 +0100 Subject: [PATCH 06/22] cargo-llvm-cov: 0.5.37 -> 0.5.38 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 0da95637741f..f6198ec18c3c 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.5.37"; + version = "0.5.38"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-UJXZ7FhbkIcVAv4PymO4sCqhJ0KFORCCO3w0w9W46qQ="; + sha256 = "sha256-Q9r/2o5CAoMhldZWGL08BVHc93eESBjyQBG/8S8BQA8="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-aJIMG2gaotu1XdNxcE2xJS78qAqlNzF3p2RMvqBraTk="; + sha256 = "sha256-7sKoixjwfED1iwIeAgvmMDSy8kNNLBQtURBWdg3DM9U="; leaveDotGit = true; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-dbC8OcH/Ae98SUx9d4rsBdhYQfzsWZpiGqJoIGPDSbY="; + cargoSha256 = "sha256-RbDNDxfs9GOWAHAIEjBFugZ7weVC05vD9JFJHCGeM2c="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests From c4da1f410c7969b80a23195f2cba509fc847f961 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 Dec 2023 09:19:07 +0100 Subject: [PATCH 07/22] cargo-llvm-cov: 0.5.38 -> 0.5.39 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index f6198ec18c3c..cf8858271d2d 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.5.38"; + version = "0.5.39"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-Q9r/2o5CAoMhldZWGL08BVHc93eESBjyQBG/8S8BQA8="; + sha256 = "sha256-iaY4whQ/w6jpQ3utebtV87mCJiawI0G8ud45SVTb39o="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-7sKoixjwfED1iwIeAgvmMDSy8kNNLBQtURBWdg3DM9U="; + sha256 = "sha256-aKUVOaVv3tlWKwPbmGmK0wEAudg6tSnXh4Tty9aGctk="; leaveDotGit = true; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-RbDNDxfs9GOWAHAIEjBFugZ7weVC05vD9JFJHCGeM2c="; + cargoSha256 = "sha256-/x3ZjPJWCsuzyOPPeJ+ZulTTBrftoAkPRDrMqqUOq/8="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests From dba7b7f4bfe2c7d7e379293f33c0c7978b836e4a Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 20:45:48 -0300 Subject: [PATCH 08/22] lilypond-with-fonts: fix build of some fonts --- pkgs/misc/lilypond/fonts.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index f1c80ad761b2..d87e06235717 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -17,7 +17,11 @@ let local fontsdir="$out/share/lilypond/${lilypond.version}/fonts" install -m755 -d "$fontsdir/otf" - for font in {otf,supplementary-fonts}/**.{o,t}tf; do + + shopt -s globstar + + for font in {otf,supplementary-fonts,supplementary-files}/**/*.{o,t}tf; do + echo $font install -Dt "$fontsdir/otf" -m755 "$font" done From 213eabf52c5d9db2fe759ca96bdedb7a322d9930 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 20:49:38 -0300 Subject: [PATCH 09/22] lilypond-with-fonts: fix font's permissions --- pkgs/misc/lilypond/fonts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index d87e06235717..a23f7125f385 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -22,12 +22,12 @@ let for font in {otf,supplementary-fonts,supplementary-files}/**/*.{o,t}tf; do echo $font - install -Dt "$fontsdir/otf" -m755 "$font" + install -Dt "$fontsdir/otf" -m644 "$font" done install -m755 -d "$fontsdir/svg" for font in svg/**.{svg,woff}; do - install -Dt "$fontsdir/svg" -m755 "$font" + install -Dt "$fontsdir/svg" -m644 "$font" done ''; From d3ee01357620a3b0d7eec68a2622ccbcfda8869f Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 21:13:52 -0300 Subject: [PATCH 10/22] lilypod-with-fonts: add missing fonts' directory --- pkgs/misc/lilypond/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index a23f7125f385..b624498f0920 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -26,7 +26,7 @@ let done install -m755 -d "$fontsdir/svg" - for font in svg/**.{svg,woff}; do + for font in {svg,woff}/**.{svg,woff}; do install -Dt "$fontsdir/svg" -m644 "$font" done ''; From 9af669c9db2f6ba4f4c5d38bb00213ef33f1dc63 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Tue, 19 Dec 2023 23:57:25 +0100 Subject: [PATCH 11/22] wolfssl: 5.6.4 -> 5.6.6 --- pkgs/development/libraries/wolfssl/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index d43571247476..60a6e10c8334 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , Security , autoreconfHook , util-linux @@ -15,23 +14,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wolfssl-${variant}"; - version = "5.6.4"; + version = "5.6.6"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "refs/tags/v${finalAttrs.version}-stable"; - hash = "sha256-a9a3ca4Zb/XTS5YfPJwnXPYbDjmgD8qylhPQg5pjzJM="; + hash = "sha256-HXl8GgngC1J8Dlt7fXBrVRa+IV7thVr+MIpeuf3Khcg="; }; - patches = [ - (fetchpatch { - name = "fix-expected-test-response.patch"; - url = "https://github.com/wolfSSL/wolfssl/commit/ca694938fd053a8557f9f08b1b4265292d8bef65.patch"; - hash = "sha256-ETxszjjEMk0WdYgXHWTxTaWZPpyDs9jdko0jtkjzgwI="; - }) - ]; - postPatch = '' patchShebangs ./scripts # ocsp stapling tests require network access, so skip them From 2c4ab07378e21e0a5d0f851aa1f7aeb9171d08d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 05:12:01 +0000 Subject: [PATCH 12/22] atlas: 0.15.0 -> 0.16.0 --- pkgs/development/tools/database/atlas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 7afa8b43a855..30824da948be 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-qEui+Y7auNFJwLSUT90jJH7IPgNW06phbJel9y3C1bk="; + hash = "sha256-v+LhyuUSKyZtCkNE/IBJs3dk3vkqKHvCNyaW+Wxp8oY="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-BJB+ZwrfZsYlyVX0G3qNQW8KexxMmc1Y9m2TRbOX6Tc="; + vendorHash = "sha256-vkMZ7yscLg+y3tvU4AGR+L70xwqYsKVvE+Oe4+aUlv8="; nativeBuildInputs = [ installShellFiles ]; From 5098005a85388f61ccd53f8aa7e5f5804f7ec934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 06:12:02 +0000 Subject: [PATCH 13/22] lean4: 4.3.0 -> 4.4.0 --- pkgs/applications/science/logic/lean4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 0f3d9c99ba88..26f5dd2911eb 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-2F6sibGMG1U5By/aKGluLgkXIlMpZ7m06gVEG2Uz4RQ="; + hash = "sha256-lU67wjl6yJP2r97lHYxrJqn+JhqMcBIbz/+qlCgY3/o="; }; postPatch = '' From 538455a3409a4ee565c2c019d59209a20693ca40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 14:42:37 +0000 Subject: [PATCH 14/22] python310Packages.sphinx-book-theme: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/sphinx-book-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 872df1fbb451..bb96443d3183 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.0.1"; + version = "1.1.0"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - hash = "sha256-0V+CSLNxippr4LphejLRWR+fo5xhRGm/rOd3uganO3U="; + hash = "sha256-CIvGnWX6uERq24aR7WFof3G/dQTJdAr2i8eM+TaiYRI="; }; propagatedBuildInputs = [ From eb30d1a95fb853ef724dece9197ce8cffde22d72 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 22 Dec 2023 11:11:33 -0700 Subject: [PATCH 15/22] pyqt6: 6.6.0 -> 6.6.1 --- pkgs/development/python-modules/pyqt/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 281b7d38308c..db37cab6ac1a 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.6.0"; + version = "6.6.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1BUS1mBEwt+cX1FaVqkiFw1oo3s0Bv/dyLStxXGBtXY="; + hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k="; }; patches = [ From 876ccdb37d60ba15285883c93dc8701aeda709ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 19:13:20 +0000 Subject: [PATCH 16/22] helm-ls: 0.0.7 -> 0.0.8 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 9222f9d99717..388bb0e92d4b 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-XTY32B0RkLcZxTuKWUtZlrrUARkoT2+qYkL8Amai2cE="; + hash = "sha256-q9RK7wTEbwptzNrXzifq6vUpOKD3idsG5FZKpQZ1uCc="; }; - vendorHash = "sha256-wMYrgAgAEgwfjMLP81H0cKWm/kh63ppDkSiymfsaj7U="; + vendorHash = "sha256-KyeXVS07+WUV+Q5Z9Q+SFp/q9KLLQBpuBH9kRSAh8qg="; nativeBuildInputs = [ installShellFiles ]; From bb4c8849fd057f6e7b39274558d765d9be60a6a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 19:34:54 +0000 Subject: [PATCH 17/22] kanata: 1.4.0 -> 1.5.0 --- pkgs/tools/system/kanata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 6e86812ece44..706382d3dd04 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tenh2LARajYAFHJ5gddeozY7rfySSvqFhudc/7b9cGg="; + sha256 = "sha256-ci/0Ksmi0uNHIvpZlihWvGeNabzmk+k3fUeuMDVpFeE="; }; - cargoHash = "sha256-oJVGZhKJVK8q5lgK+G+KhVupOF05u37B7Nmv4rrI28I="; + cargoHash = "sha256-IzgVF6SHJjOB48VehQ5taD5iWQXFKLcVBWTEl3ArkGQ="; buildFeatures = lib.optional withCmd "cmd"; From e299a33d58eab6ce22c7ec55eb92e5eb322047c3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 22 Dec 2023 23:06:21 +0100 Subject: [PATCH 18/22] forgejo: 1.21.2-1 -> 1.21.3-0 https://codeberg.org/forgejo/forgejo/releases/tag/v1.21.3-0 https://codeberg.org/forgejo/forgejo/src/commit/e75783cb4f185fa9a780f6450e03025c84be1ebe/RELEASE-NOTES.md#1-21-3-0 Fixes CVE-2023-48795. --- pkgs/applications/version-management/forgejo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 52a4cdcba2aa..34d2103daa0b 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-7ruJczJ2cE51UmoER8C3JsGm0p3RTwfqKx0eErB7LZs="; + npmDepsHash = "sha256-bxgkJODph88aXYYj50gNNP4gpsd18uOj0dQEX6GqEsc="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.2-1"; + version = "1.21.3-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-2dkl8QI82URhPV2f4cOUZfpAhlGwU197ZkLD9KitIiA="; + hash = "sha256-iBZIn2VGagG1RMBKm9qyg4RRscStr+PsdxOpprrInyo="; }; - vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8="; + vendorHash = "sha256-+ukS9+SxymwnMSnr/BaL4lhc83wYC6+4BWYTbBTrWy8="; subPackages = [ "." ]; From 94eabe3b3e9f9513c66ccf2dd9cdd57527115ebb Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 23 Dec 2023 00:00:00 +0100 Subject: [PATCH 19/22] pyload-ng: add 'meta.mainProgram' --- pkgs/applications/networking/pyload-ng/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index f0bb06802070..4ead723f76e1 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -50,5 +50,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/pyload/pyload"; license = licenses.agpl3Plus; maintainers = with maintainers; [ ruby0b ]; + mainProgram = "pyload"; }; } From 44961628735dcff08eeee93cfb03b4944ceb1906 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Fri, 22 Dec 2023 22:02:40 -0600 Subject: [PATCH 20/22] maintainers: add paulsmith --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d25885ed732..177cea7b88ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14122,6 +14122,12 @@ githubId = 15645854; name = "Brad Christensen"; }; + paulsmith = { + email = "paulsmith@pobox.com"; + github = "paulsmith"; + name = "Paul Smith"; + githubId = 1210; + }; paumr = { github = "paumr"; name = "Michael Bergmeister"; From 8d5b016be3b04c0a8c9ca101827ed8b866afe571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 04:33:42 +0000 Subject: [PATCH 21/22] resvg: 0.36.0 -> 0.37.0 --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 539e3faebfdc..734ac97fdc73 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-KxEeC9E1XG5ascIWzSAoNXtdJyPiEsXcQGebmhs/qkE="; + hash = "sha256-IRIyxQk0BqFufZafq7klUHAW1lculqbcH67kf3jtjwo="; }; - cargoHash = "sha256-iiPtf1xEBB80Cs31uUEbxG9YgKItdZCNGS6TTgrj4uM="; + cargoHash = "sha256-yKQRjY+aEXU5C3LhAyavtX8PazbAvAHQ7fykmK7LAQ8="; cargoBuildFlags = [ "--package=resvg" From e1d77819bbda638223d2b027b33afd1f9f90b27c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 04:46:47 +0000 Subject: [PATCH 22/22] reviewdog: 0.15.0 -> 0.16.0 --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index f2b2561cafdc..42455639bb57 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-EKDs0Xv38RLC3qDkb8QT3CMWdi7tEPRXxhlZiC/dyZo="; + hash = "sha256-aHxK1Wu6AHTYhhbW67e4Yb/uOArwsiZnW8qHXHFCu2w="; }; - vendorHash = "sha256-IKndnxeLy9hLFzs0SesRQzii9h8MX9FrEcpHaaKIq4k="; + vendorHash = "sha256-htBy+ie1RjlWkr5z3BA9us5z5VxLtl4q1pyiESsyMFY="; doCheck = false;