From 53909a6527ea2603f56216f7b0366087897d3d4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 15:01:05 +0000 Subject: [PATCH 01/62] imgui: 1.90.2 -> 1.90.3 --- pkgs/development/libraries/imgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 244a3570c031..a9ce7358447d 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.2"; + version = "1.90.3"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-0sqV1TgidSuZQLihRTUCd46jKIgwcOJlKjRyOvopqlo="; + sha256 = "sha256-dmCQ7p9gpQiBb2hPhzX+/Y0ZiYX01cRNQYXC1KTRYck="; }; dontBuild = true; From 22f95879b31bc40354653c86fc60ce495a10a562 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 19:32:19 +0000 Subject: [PATCH 02/62] nfdump: 1.7.3 -> 1.7.4 --- pkgs/tools/networking/nfdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index cc0c9d151983..34d7db6c9760 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nfdump"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "refs/tags/v${version}"; - hash = "sha256-etmelBCZQKscuVJt5dBtwQVjiZNUFLTu11Gw0jmYcAg="; + hash = "sha256-3V6n0cAD3EG91gkbB/9kNcJhwpZBY4ovUamyaVWAAcY="; }; nativeBuildInputs = [ From abd929bb058f8821d25ec2a835f8781c2b17f4ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Feb 2024 09:08:23 +0000 Subject: [PATCH 03/62] dart: 3.2.6 -> 3.3.0 --- pkgs/development/compilers/dart/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 865a75bbff5f..5e19aba467fe 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.2.6"; in +let version = "3.3.0"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "05w5v6f302gwwpa3my8baz4spmdmqrimmc659wgki1h64ch1yrlp"; + sha256 = "1cwxvn7321444mkpcv1vix5bi2ianiadvrjib6z5irdj8pbwlkih"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1dmd70jjpfi19rmlvj2hbggw92z03jm8irrwx6r0bk7r748cj11f"; + sha256 = "1clang815wwy6szwl1rkjzl9d6zard15d1c2p6i7xpvvk3rb6m5j"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1hs1mvk90qb0nijm8wcvv6xkd79z44i2bpcv2nh933lysdys664q"; + sha256 = "00mjnzld4zbk37x7g7428by3dwpkc7nhja4p6dlhl1xj2lb4qs0r"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0j0xmyxdmzn4ii24j27yw6l3074ay4n2qjyzh967cpbg9yhr0cr5"; + sha256 = "1bdwdjjnfjrwcfg2iy76bh939kkgw25130if7fxl3jay0sj6pgry"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0ml9dvnd7f0rld3wfnnmv7arfs821zg8rqaq1c7zvqhkj3i0dwci"; + sha256 = "0r9ypqd5b0l31bklm9q3g1aw9i1qyfkxr9vdn5wwfkicvqjiffs2"; }; } From 62e4ece967bbee978a7312ce4ec51d31279dcc76 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Feb 2024 22:40:51 +0000 Subject: [PATCH 04/62] goldberg-emu: fix `gcc-13` build failure Without the change build fails on `master` as https://hydra.nixos.org/build/249156752: In file included from /build/source/dll/base.h:61, from /build/source/dll/settings.h:18, from /build/source/dll/settings.cpp:18: /build/source/dll/settings.h:26:10: error: 'string' in namespace 'std' does not name a type 26 | std::string name; | ^~~~~~ --- pkgs/applications/emulators/goldberg-emu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 5ff25efbf151..7e00ad6a5d68 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { # It attempts to install windows-only libraries which we never build patches = [ ./dont-install-unsupported.patch ]; + postPatch = '' + # Fix gcc-13 build failure due to missing include. + sed -e '1i #include ' -i dll/settings.h + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; From 5eb82cb0945a6a1af8a62deee16b77358712f1f7 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Mon, 19 Feb 2024 12:45:56 +0100 Subject: [PATCH 05/62] outline: 0.74.0 -> 0.75.0 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index c1ea00484db9..1af9b6ae7a73 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-fF//SgcBYcJmPDaev8G1s+svCW1bU9CmN3uWEoEeMUk="; + hash = "sha256-u4WDD0HRaNHdknHaoPYprebUaHt8EmESjBG0N6NZpIk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-T5FrtPN0CxLjF5KkQyH6dA61kvzIOj1Fe5rIY7l+aFE="; + hash = "sha256-V+1lqZh68T3C9VAFETHehv9iCt1j24ZeY9ErbnRGIrk="; }; configurePhase = '' From ad52ea800b989a4637fa1a145cb26a4250ea79c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Feb 2024 23:47:36 +0000 Subject: [PATCH 06/62] kuma-cp: 2.5.1 -> 2.6.1 --- pkgs/applications/networking/cluster/kuma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index adcd6dcfff70..9b8c8a2e1a3f 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.5.1"; + version = "2.6.1"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-7r5nD4m8qxU5C/Q3aT+MWXk6FbBNqsMQxV3sXcd34Lw="; + hash = "sha256-jSBuEDnb2KHAOhOldAzpxgqnDXH1N267Axs+clpo2uo="; }; - vendorHash = "sha256-pyjfTqUhfcuHshLzH5q/gA+HLQuqgZ4Tbgw40OcRQwg="; + vendorHash = "sha256-gvB3e9C5KnQwvn2eJPm0WYKlKSnOO9opGikgVA3WJN0="; # no test files doCheck = false; From ed3f734373ac3bde61d09f9a854cd42d6fcdbbfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 07:37:28 +0000 Subject: [PATCH 07/62] tamzen: 1.11.5 -> 1.11.6 --- pkgs/data/fonts/tamzen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index f589455e9811..e8706c1971c6 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tamzen-font"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "sunaku"; repo = "tamzen-font"; rev = "Tamzen-${version}"; - sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; + sha256 = "sha256-W5Wqsm5rpzzcbJl2lv6ORAznaAwLcmJ2S6Qo2zIoq9I="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From 65f6e5e665c6e855f306ae925619233aa82d093c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 20 Feb 2024 12:13:21 +0000 Subject: [PATCH 08/62] libsForQt5.konsole: add missing meta.mainProgram --- pkgs/applications/kde/konsole.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 1ef8da3d385d..e063743186dc 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -14,6 +14,7 @@ mkDerivation { description = "KDE terminal emulator"; license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = with lib.maintainers; [ ttuegel ]; + mainProgram = "konsole"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ From 16d7d76e256448961eec81cb34ca0f3aaff33fda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 18:48:46 +0000 Subject: [PATCH 09/62] cartridges: 2.7.2 -> 2.7.3 --- pkgs/applications/misc/cartridges/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index c0ed598b653a..ff06da875d61 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - hash = "sha256-+18TWtxKT87CZ8vTtYac9aQ0wIbhJEXbXFZrSj5BmjI="; + hash = "sha256-N1Ow2lkBOSnrxI0qLaaJeqgdU2E+jRYxj5Zu/wzS6ds="; }; pythonPath = with python3Packages; [ From 4fda6331d15187b5499ab0aa062fd02b2793fea5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 21:48:23 +0000 Subject: [PATCH 10/62] nco: 5.2.0 -> 5.2.1 --- pkgs/development/libraries/nco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 87f0b8b3a031..74f6c21d86e9 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-eYGGIf7OXaLFu4XleCMw1Y4rCjGkWhOnvqixGExk1kk="; + hash = "sha256-6j9gBvhNTww9nOKMcCvOxoLJwU/3RtS6OvofjrpZhmk="; }; nativeBuildInputs = [ From f57178aedcc71d4a1312d26f4d0a59c6793cf9aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 11:56:02 +0000 Subject: [PATCH 11/62] functionalplus: 0.2.22 -> 0.2.23 --- pkgs/development/libraries/functionalplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index af25030ab560..6d3092e53c35 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-y0IRmgG9lhWO4IR4G9/VP2a3B+ORTnF7MCf4FU5EuMk="; + sha256 = "sha256-WDufVO0vQyu7O3w9tq+19JioRUFgYlnTbO/AQzg0FnM="; }; nativeBuildInputs = [ cmake ]; From d4b69dac58d604339779a0fde14501be72f574ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 20:31:45 +0000 Subject: [PATCH 12/62] signalbackup-tools: 20240220 -> 20240221 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index d4e26b9845f0..ec44ba5625d6 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240220"; + version = "20240221"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-lIw8BrEKdqmBt6v4/OI2kJLvMEPVswhwVqEQeJMHn4M="; + hash = "sha256-KIeTGPNGfWyyvh0dEdM7ir4+Gu6+hgQdiBG9/THXj8I="; }; postPatch = '' From 4dc637a216c2fa0a1d17e880549f60f40d913782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 04:09:12 +0000 Subject: [PATCH 13/62] natural-docs: 2.2 -> 2.3 --- pkgs/applications/misc/natural-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/applications/misc/natural-docs/default.nix index 2995eba5787b..05a752ab465d 100644 --- a/pkgs/applications/misc/natural-docs/default.nix +++ b/pkgs/applications/misc/natural-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "natural-docs"; - version = "2.2"; + version = "2.3"; src = fetchzip { url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip"; - sha256 = "sha256-W0E9wamzABnPleVhHHXTIdWJk8kWnrUHojM+pcsowy8="; + sha256 = "sha256-yk9PxrZ6+ocqGLB+xCBGiQKnHLMdp2r+NuoMhWsr0GM="; }; dontPatch = true; From ebb0f85830d7005a4a5e5e7b3414ee4fcfd142ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 22 Feb 2024 04:20:00 +0000 Subject: [PATCH 14/62] gifski: 1.13.1 -> 1.14.4 Diff: https://github.com/ImageOptim/gifski/compare/1.13.1...1.14.4 Changelog: https://github.com/ImageOptim/gifski/releases/tag/1.14.4 --- pkgs/tools/graphics/gifski/Cargo.lock | 312 ++++++++++++++----------- pkgs/tools/graphics/gifski/default.nix | 9 +- 2 files changed, 186 insertions(+), 135 deletions(-) diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index bc840dec7f1f..178b72975ef0 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -45,36 +45,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -117,9 +117,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "cc" @@ -147,9 +147,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -158,18 +158,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -200,46 +200,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "dunce" @@ -264,9 +255,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "6.0.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60" +checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" dependencies = [ "bitflags", "ffmpeg-sys-next", @@ -275,8 +266,8 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "6.0.1" -source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=94d5496d88900bdc0cad66733138134d0ea3cf31#94d5496d88900bdc0cad66733138134d0ea3cf31" +version = "6.1.0" +source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=fd5784d645df2ebe022a204ac36582074da1edf7#fd5784d645df2ebe022a204ac36582074da1edf7" dependencies = [ "bindgen", "cc", @@ -298,18 +289,18 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "weezl", ] [[package]] name = "gif-dispose" -version = "4.0.1" +version = "5.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347afae04a03ca25a3a76d130abb63e7e6e7367b895470fdc3d996aec916c3d7" +checksum = "b0d20a3802e15ff705c260e39152ff1987145a1c5ae016bc3d510abceb45b9ed" dependencies = [ "gif", "imgref", @@ -318,7 +309,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.13.1" +version = "1.14.4" dependencies = [ "clap", "crossbeam-channel", @@ -333,6 +324,7 @@ dependencies = [ "loop9", "natord", "num-traits", + "ordered-channel", "pbr", "quick-error", "resize", @@ -357,15 +349,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "imagequant" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d51957ac48371e8e2eaaeb4eba56150ff2109c1c8c200002afb7dd6e2d260f" +checksum = "85a7f142d232ccbdc00cbef49d17f45639aeb07d9bfe28e17c21dea3efac64e5" dependencies = [ "arrayvec", "once_cell", @@ -376,9 +368,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d944e334f00f4449c9640b440a171f816be0152305c12ef90424fc35fd035c" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "lazy_static" @@ -394,25 +386,25 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "lodepng" -version = "3.9.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" +checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" dependencies = [ "crc32fast", "fallible_collections", @@ -423,27 +415,18 @@ dependencies = [ [[package]] name = "loop9" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a837f917de41d61ab531ba255d1913208d02325cab0d6a66a706e0dbaa699d" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" dependencies = [ "imgref", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "minimal-lexical" @@ -453,9 +436,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -478,9 +461,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -497,9 +480,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-channel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" +dependencies = [ + "crossbeam-channel", +] [[package]] name = "pbr" @@ -520,15 +512,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -541,18 +533,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -560,9 +552,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -570,9 +562,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -582,9 +574,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -599,9 +591,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "resize" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce43c0220eff4793a20c120ff89ee01499ba3c882957021dcdc12f5e4ca97c8" +checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" dependencies = [ "rayon", "rgb", @@ -609,9 +601,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -622,23 +614,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" @@ -653,9 +639,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -698,15 +684,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wild" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" +checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" dependencies = [ "glob", ] @@ -739,7 +725,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -748,13 +743,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -763,36 +773,72 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -800,21 +846,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "zerocopy" -version = "0.7.11" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.11" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 312388a9742f..2427027fa2d2 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -7,20 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.13.1"; + version = "1.14.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; - # rev = version; - rev = "1.31.1"; # upstream tagged incorrectly - hash = "sha256-JzQReCX1AfFhbVbSPOIAKAVvNoddrWFHaJ1AxlsIPA0="; + rev = version; + hash = "sha256-Yhcz3pbEsSlpxQ1couFgQuaS8Eru7PLiGFNHcKmiFak="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ffmpeg-sys-next-6.0.1" = "sha256-/KxW57lt9/qKqNUUZqJucsP0cKvZ1m/FdGCsZxBlxYc="; + "ffmpeg-sys-next-6.1.0" = "sha256-RB9sDQoP68Dzqk8tIuYlOX3dZcS64hKI5KpTGq/7xbM="; }; }; From e65f390d3279433edab995b7838fdcf36d721cfc Mon Sep 17 00:00:00 2001 From: "\"Haseeb Majid\"" <"hello@haseebmajid.dev"> Date: Sun, 4 Feb 2024 17:25:32 +0000 Subject: [PATCH 15/62] vimPlugins.animation-nvim: init at 2022-09-18 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8edaa88adb13..4565ca91925a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -50,6 +50,7 @@ https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, https://github.com/goolord/alpha-nvim/,HEAD, +https://github.com/anuvyklack/animation.nvim/,HEAD, https://github.com/Olical/aniseed/,, https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, From 998fdbed6194277be298341366f296b526b3da66 Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Sun, 4 Feb 2024 17:32:44 +0000 Subject: [PATCH 16/62] vimPlugins: update on 2024-02-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3a378180d311..2551a90f96b4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -617,6 +617,18 @@ final: prev: meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; + animation-nvim = buildVimPlugin { + pname = "animation.nvim"; + version = "2022-09-18"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "animation.nvim"; + rev = "fb77091ab72ec9971aee0562e7081182527aaa6a"; + sha256 = "0yaxp3l33af1k6na0jikwmr0nxk862ihpq8r0042mll1ily7689b"; + }; + meta.homepage = "https://github.com/anuvyklack/animation.nvim/"; + }; + aniseed = buildVimPlugin { pname = "aniseed"; version = "2023-07-06"; From 0b52d7ec90a82abd69496b1b76e3fa89aa152609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 21:01:54 +0000 Subject: [PATCH 17/62] inkscape-extensions.textext: 1.10.1 -> 1.10.2 --- .../graphics/inkscape/extensions/textext/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index bb7ccd3e1896..c3ad003cc1b2 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -20,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "textext"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "textext"; repo = "textext"; - rev = version; - sha256 = "sha256-FbUfZfVOYEyQVL1YMyNwb/sIUxJ+VhevatjuJI/ocIw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE="; }; patches = [ From 85ee3198c75bbc5d853ee16b664691b32935251a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Thu, 22 Feb 2024 21:10:36 +0900 Subject: [PATCH 18/62] atuin: Allow setting database.uri to null When a password is required to connect to postgres using services.atuin.database.uri directly would make the password be written in the nix store, which is suboptimal. Instead we can have the password in a file accessible only to root by having systemd read an EnvironmentFile directly, but we must ensure that this file has priority over the environment set. Not setting the variable in this case is more straightforward. --- nixos/modules/services/misc/atuin.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index 2d6ffc510ce5..2c06f62c5a6e 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -52,10 +52,13 @@ in }; uri = mkOption { - type = types.str; + type = types.nullOr types.str; default = "postgresql:///atuin?host=/run/postgresql"; example = "postgresql://atuin@localhost:5432/atuin"; - description = mdDoc "URI to the database"; + description = mdDoc '' + URI to the database. + Can be set to null in which case ATUIN_DB_URI should be set through an EnvironmentFile + ''; }; }; }; @@ -132,9 +135,10 @@ in ATUIN_PORT = toString cfg.port; ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength; ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration; - ATUIN_DB_URI = cfg.database.uri; ATUIN_PATH = cfg.path; ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables + } // lib.optionalAttrs (cfg.database.uri != null) { + ATUIN_DB_URI = cfg.database.uri; }; }; From 5ede2692b7c7afde638e64f9e0263b3796415e36 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 23 Feb 2024 06:23:42 +0900 Subject: [PATCH 19/62] atuin: disable check-updates feature --- pkgs/by-name/at/atuin/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index db9bc233cb9a..e196974a5a22 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -25,6 +25,13 @@ rustPlatform.buildRustPackage rec { then "sha256-lHWgsVnjSeBmd7O4Fn0pUtTn4XbkBOAouaRHRozil50=" else "sha256-LxfpllzvgUu7ZuD97n3W+el3bdOt5QGXzJbDQ0w8seo="; + # atuin's default features include 'check-updates', which do not make sense + # for distribution builds. List all other default features. + buildNoDefaultFeatures = true; + buildFeatures = [ + "client" "sync" "server" "clipboard" + ]; + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ From 7fb6269882a7c0b12cbab60087a9df7dbf0dd2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 23:23:55 +0000 Subject: [PATCH 20/62] codeql: 2.16.2 -> 2.16.3 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index ea256fa59508..2d67f6211f19 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.16.2"; + version = "2.16.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-Zz0j3N1E7KnWigG+PadB7NSTLCAqhLWy5Eg163Q8OFM="; + hash = "sha256-jpmnT3Knr/0Pk9Z0zRi3zyB8CH31z3kJxU0nBXg8iXY="; }; nativeBuildInputs = [ From f1b8a68dc8f3f481813ef49fcd03e0a5f57d8e11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 04:19:42 +0000 Subject: [PATCH 21/62] questdb: 7.3.9 -> 7.3.10 --- pkgs/servers/nosql/questdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 454a48beefd7..01d86bdb02ef 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.9"; + version = "7.3.10"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-kbpLeFOLzVPnoNlnFAPmPhfuNmEEkrrE4QLN3GXMZ1M="; + hash = "sha256-diltorfAnyrXZwohrsZHA91AXuSZolxDUajfmOaD5lM="; }; nativeBuildInputs = [ From ea6a2334b609916b85dca3ebb1bf8f3f9f66a7d1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Feb 2024 04:20:00 +0000 Subject: [PATCH 22/62] luau: 0.613 -> 614 Diff: https://github.com/luau-lang/luau/compare/0.613...614 Changelog: https://github.com/luau-lang/luau/releases/tag/614 --- pkgs/development/interpreters/luau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index a3f368d77f48..2341f8a5c70e 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.613"; + version = "614"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-L7D3NsTvPVf/s7FCljdrkHK3uSX12FIOpzZ66ullDIk="; + hash = "sha256-pM+KSb5jsoPLu2paQYNSdqly0ndbw98Sj2dvMZ7XqhQ="; }; nativeBuildInputs = [ cmake ]; From dddc87e337955be1b9cb1be378a867165ee31baf Mon Sep 17 00:00:00 2001 From: Siddhartha Date: Fri, 23 Feb 2024 00:00:31 -0500 Subject: [PATCH 23/62] zfs: 2.2.2 -> 2.2.3 --- pkgs/os-specific/linux/zfs/stable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 5f879320b4dc..df06ea9a3285 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -17,20 +17,20 @@ callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.7" + then kernel.kernelOlder "6.8" else kernel.kernelOlder "6.2"; latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_6 + then linuxKernel.packages.linux_6_7 else linuxKernel.packages.linux_6_1; # this package should point to the latest release. - version = "2.2.2"; + version = "2.2.3"; tests = [ nixosTests.zfs.installer nixosTests.zfs.stable ]; - hash = "sha256-CqhETAwhWMhbld5ib3Rz1dxms+GQbLwjEZw/V7U/2nE="; + hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg="; } From 8ba6c289e12c44ef278b6aae7ff720cb595594e9 Mon Sep 17 00:00:00 2001 From: Shayon <7rat13@gmail.com> Date: Fri, 23 Feb 2024 07:32:44 +0100 Subject: [PATCH 24/62] narrowlink: 0.1.4 -> 0.2.4 --- .../networking/narrowlink/Cargo.lock.patch | 170 ------------------ pkgs/tools/networking/narrowlink/default.nix | 22 +-- 2 files changed, 9 insertions(+), 183 deletions(-) delete mode 100644 pkgs/tools/networking/narrowlink/Cargo.lock.patch diff --git a/pkgs/tools/networking/narrowlink/Cargo.lock.patch b/pkgs/tools/networking/narrowlink/Cargo.lock.patch deleted file mode 100644 index 71e87a95c93d..000000000000 --- a/pkgs/tools/networking/narrowlink/Cargo.lock.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 2d5af9d..920b315 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -952,7 +952,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-agent" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "clap_lex", - "dirs", -@@ -961,8 +961,8 @@ dependencies = [ - "futures-util", - "hmac", - "log", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_json", - "serde_yaml", -@@ -976,7 +976,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-client" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "chrono", - "clap_lex", -@@ -988,8 +988,8 @@ dependencies = [ - "futures-util", - "hmac", - "log", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand", - "regex", - "serde", -@@ -1006,7 +1006,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-gateway" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "askama", - "async-trait", -@@ -1016,8 +1016,8 @@ dependencies = [ - "futures-util", - "hyper", - "instant-acme", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "pem 3.0.2", - "rcgen", - "rustls", -@@ -1037,7 +1037,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-network" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "bytes", - "chacha20poly1305", -@@ -1045,7 +1045,30 @@ dependencies = [ - "futures-util", - "hyper", - "log", -- "narrowlink-types", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", -+ "serde_json", -+ "tokio", -+ "tokio-native-tls", -+ "tokio-rustls", -+ "tokio-tungstenite", -+ "tungstenite", -+ "webpki-roots", -+] -+ -+[[package]] -+name = "narrowlink-network" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53a3e0af078492420b410b56ffeccd77e2c0d5ac31d53cc404e6b2f14ebde31b" -+dependencies = [ -+ "bytes", -+ "chacha20poly1305", -+ "env_logger", -+ "futures-util", -+ "hyper", -+ "log", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_json", - "tokio", -@@ -1058,19 +1081,38 @@ dependencies = [ - - [[package]] - name = "narrowlink-token-generator" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "clap_lex", - "dirs", - "jsonwebtoken", -- "narrowlink-types", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_yaml", - ] - - [[package]] - name = "narrowlink-types" --version = "0.1.3" -+version = "0.1.4" -+dependencies = [ -+ "chrono", -+ "hmac", -+ "ipnet", -+ "jsonwebtoken", -+ "regex", -+ "serde", -+ "serde_json", -+ "sha3", -+ "uuid", -+ "validator", -+ "wildmatch", -+] -+ -+[[package]] -+name = "narrowlink-types" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06a2e4b95bcc18504b455bff0e8d23321c8fa3bd68526f7bf1567f918f36925f" - dependencies = [ - "chrono", - "hmac", -@@ -1661,18 +1703,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.185" -+version = "1.0.186" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" -+checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.185" -+version = "1.0.186" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" -+checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" - dependencies = [ - "proc-macro2", - "quote", diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/tools/networking/narrowlink/default.nix index 68732b518ca9..226dd15b1c9e 100644 --- a/pkgs/tools/networking/narrowlink/default.nix +++ b/pkgs/tools/networking/narrowlink/default.nix @@ -9,35 +9,31 @@ rustPlatform.buildRustPackage rec { pname = "narrowlink"; - version = "0.1.4"; + version = "0.2.4"; src = fetchFromGitHub { owner = "narrowlink"; repo = "narrowlink"; rev = version; - hash = "sha256-vef7ctauSl0xfYNqjvl8wLGbqzzkMItz1O7sT1UZ4b0="; + hash = "sha256-priVl44VSxV+rCy/5H704I3CbNXDMP2BUguknl5Bguk="; }; - # Cargo.lock is outdated - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoHash = "sha256-craOunscE6o8PXtZFCYpkFH/amkuLOK7SrV+XHbS2GM="; + cargoHash = "sha256-q15T0/2Xf8L6ZEphIjZzzcqcnkWMbv3zvBAd/Ofvnfg="; nativeBuildInputs = [ - pkg-config + rustPlatform.bindgenHook ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Security + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security ]; meta = { - description = "Narrowlink securely connects devices and services together, even when both nodes are behind separate NAT"; + description = "A self-hosted solution to enable secure connectivity between devices across restricted networks like NAT or firewalls"; homepage = "https://github.com/narrowlink/narrowlink"; license = with lib.licenses; [ agpl3Only mpl20 ]; # the gateway component is AGPLv3, the rest is MPLv2 maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "narrowlink"; }; } From 827f0443cfb3950a411381282f49f736b1853cb8 Mon Sep 17 00:00:00 2001 From: Gregor Grigorjan Date: Fri, 23 Feb 2024 11:45:42 +0200 Subject: [PATCH 25/62] wleave: add missing resources --- pkgs/tools/wayland/wleave/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/wayland/wleave/default.nix b/pkgs/tools/wayland/wleave/default.nix index e90fed24f7fc..94fd6e123792 100644 --- a/pkgs/tools/wayland/wleave/default.nix +++ b/pkgs/tools/wayland/wleave/default.nix @@ -36,7 +36,18 @@ rustPlatform.buildRustPackage rec { glib ]; + postPatch = '' + substituteInPlace style.css \ + --replace-fail "/usr/share/wleave" "$out/share/${pname}" + + substituteInPlace src/main.rs \ + --replace-fail "/etc/wleave" "$out/etc/${pname}" + ''; + postInstall = '' + install -Dm644 -t "$out/etc/wleave" {"style.css","layout"} + install -Dm644 -t "$out/share/wleave/icons" icons/* + for f in man/*.scd; do local page="man/$(basename "$f" .scd)" scdoc < "$f" > "$page" From 477b4d07a2f469f92863ea714fbba69058fbdfd8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 17 Feb 2024 18:49:09 +0400 Subject: [PATCH 26/62] =?UTF-8?q?osm2pgsql:=201.10.0=20=E2=86=92=201.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/misc/osm2pgsql/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 59ea5afb0e93..0ddfb737fcee 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -5,6 +5,7 @@ , fmt , proj , bzip2 +, cli11 , zlib , boost , postgresql @@ -22,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-IFAQ7iA37QXnWOSxUjh9EW7ss85k0h948JGuuUcpr5w="; + hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; }; postPatch = '' @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost bzip2 + cli11 expat fmt libosmium @@ -56,10 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ - "-DEXTERNAL_LIBOSMIUM=ON" - "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON" - ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + (lib.cmakeBool "EXTERNAL_LIBOSMIUM" true) + (lib.cmakeBool "EXTERNAL_PROTOZERO" true) + (lib.cmakeBool "EXTERNAL_FMT" true) + (lib.cmakeBool "WITH_LUAJIT" withLuaJIT) + ]; installFlags = [ "install-gen" ]; From a88d8e9ecbfea86cd6d7b709cec2dc1c95aace07 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 17 Feb 2024 23:45:06 +0400 Subject: [PATCH 27/62] osm2pgsql: migrate to by-name --- .../osm2pgsql/default.nix => by-name/os/osm2pgsql/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/osm2pgsql/default.nix => by-name/os/osm2pgsql/package.nix} (100%) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/by-name/os/osm2pgsql/package.nix similarity index 100% rename from pkgs/tools/misc/osm2pgsql/default.nix rename to pkgs/by-name/os/osm2pgsql/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 561247510148..f605789664a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33868,8 +33868,6 @@ with pkgs; opsdroid = callPackage ../applications/networking/opsdroid { }; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { protobuf = protobuf_21; }; From a118964872418b3ce092174dbe2ddb0cbb29837d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 23 Feb 2024 16:00:54 +0400 Subject: [PATCH 28/62] =?UTF-8?q?orbiton:=202.65.8=20=E2=86=92=202.65.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/orbiton/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 266e6cf3b3aa..413af1ab5c54 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.65.8"; + version = "2.65.10"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-1g2D79yUHeFz9jpmz1N5qDmpe1DA8xV82t78ZUVOhBE="; + hash = "sha256-z81Xled6OFs9tKVJgUnws81C86Vle5XR85f3z96N2Gw="; }; vendorHash = null; @@ -41,7 +41,7 @@ buildGoModule rec { meta = with lib; { description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://github.com/xyproto/orbiton"; + homepage = "https://orbiton.zip"; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; mainProgram = "o"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 561247510148..3a18fb3dc5f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31083,7 +31083,9 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - orbiton = callPackage ../applications/editors/orbiton { }; + orbiton = callPackage ../applications/editors/orbiton { + buildGoModule = buildGo122Module; + }; oed = callPackage ../applications/editors/oed { }; From 64a8fc11a566d96671c081de7e49f7b2cd48ddcb Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 23 Feb 2024 20:31:32 +0800 Subject: [PATCH 29/62] eartag: 0.5.1 -> 0.6.0 --- pkgs/applications/audio/eartag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index a40ea62403be..63a46628b11e 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.5.1"; + version = "0.6.0"; format = "other"; src = fetchFromGitLab { @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - hash = "sha256-tHBEz4sZsWOxDkdUd/3zMta8vOhuzv4G01dtjKBX/D0="; + hash = "sha256-MfffIqxfelwP+9wsFvQfEIMkav7j5LJEHjLPOsuYdtQ="; }; postPatch = '' From 64ffd9069f30e807922abedce89ef6d62e9128d6 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 23 Feb 2024 20:34:32 +0800 Subject: [PATCH 30/62] eartag: add meta.mainProgram --- pkgs/applications/audio/eartag/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 63a46628b11e..cb5a650a2191 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -77,6 +77,7 @@ python3Packages.buildPythonApplication rec { # since ICU license is a modified version of MIT and to prevent it from # being incorrectly identified as unfree software. license = licenses.mit; + mainProgram = "eartag"; maintainers = with maintainers; [ foo-dogsquared ]; }; } From 9ce9840119fdd88f72d00468323cb0fd5dfc121b Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Fri, 23 Feb 2024 16:57:14 +0800 Subject: [PATCH 31/62] fastfetch: 2.8.3 -> 2.8.5 Diff: https://github.com/fastfetch-cli/fastfetch/compare/2.8.3...2.8.5 Changelog: https://github.com/fastfetch-cli/fastfetch/releases/tag/2.8.5 --- pkgs/tools/misc/fastfetch/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 91d9844fd1f6..bcfbdfa9becb 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-W6SmKyTBR0cXAkgcbbM1lEiHFanqCaa2lhAb+zQP/mg="; + hash = "sha256-aIGT2NwtkKJ1uTgy4rvFegzJadRuGkki63gpnVCPKbw="; }; outputs = [ "out" "man" ]; @@ -131,11 +131,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_XRANDR" x11Support) ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=uninitialized" - ]; - postInstall = '' wrapProgram $out/bin/fastfetch \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" From 27afd966dd7dff5488f22f3c72262debb2a2a59b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 15:42:00 +0000 Subject: [PATCH 32/62] monophony: 2.6.0 -> 2.6.1 --- pkgs/by-name/mo/monophony/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 1aede92ae5bd..7589c172af0e 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,7 +12,7 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.6.0"; + version = "2.6.1"; format = "other"; sourceRoot = "source/source"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-dLv1zdhWXOimxhoyf0T8oM5dF4fKepcIED+DG6D1MH0="; + hash = "sha256-op6XUfP0EM9P5vT2nM4o+NOHxBcASIl1+6Mp/u9ub3U="; }; pythonPath = with python3Packages; [ From 110e8da1a6dcf0fa9fd8ea911530b72b3dfa468a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 16:09:26 +0000 Subject: [PATCH 33/62] satty: 0.9.0 -> 0.10.0 --- pkgs/by-name/sa/satty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 98f5d92d7ee5..bcb3e37433df 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-640npBvOO4SZfQI5Tq1FY+B7Bg75YsaoGd/XhWAy9Zs="; + hash = "sha256-aE0hQla/FwUAUSVodfQz3s8hdYF6tQSIHl6p5gEtONU="; }; - cargoHash = "sha256-H+PnZWNaxdNaPLZmKJIcnEBTnpeXCxGC9cXnzR2hfoc="; + cargoHash = "sha256-vARrc49+T813uCzIlB1tSS3eNyNeeCvC+G+LFYAsYx8="; nativeBuildInputs = [ copyDesktopItems From 94e55276f8cb3ee93acc15c493a728f2519c691b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 16:25:20 +0000 Subject: [PATCH 34/62] goldwarden: 0.2.12 -> 0.2.13 --- pkgs/by-name/go/goldwarden/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index 2f4db352bcfd..b972ebe1bcc8 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "goldwarden"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "quexten"; repo = "goldwarden"; rev = "v${version}"; - hash = "sha256-W6dqxHGZGHuVOUNYWMpfswzG2bSCRyY58ya/ZqAMxyY="; + hash = "sha256-4KxPtsIEW46p+cFx6yeSdNlsffy9U31k+ZSkE6V0AFc="; }; vendorHash = "sha256-IH0p7t1qInA9rNYv6ekxDN/BT5Kguhh4cZfmL+iqwVU="; From 2b9cc007e929a5e77e2ccb0ab97e3779f05653f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 17:19:15 +0000 Subject: [PATCH 35/62] opensnitch: 1.6.5 -> 1.6.5.1 --- pkgs/by-name/op/opensnitch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 795050cdc6d6..1ba7f6e65dc4 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.5"; + version = "1.6.5.1"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-2HHyecgiodWhQkkn3eo0RJNroD7HaK6Je/+x9IqZfWE="; + hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; }; postPatch = '' From 73a42b47db22336c926568b1333bc96528c4cb33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 17:51:13 +0000 Subject: [PATCH 36/62] oculante: 0.8.8 -> 0.8.9 --- pkgs/applications/graphics/oculante/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index eabeac36f70a..52374eb65c0c 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-LfMun9eG/76wqm2SADYIjWXOHbCl5yikkdK2FoavSWY="; + hash = "sha256-BkvY7ASTEbOs6y6ehWEIGmfLGJVg/4q0e4PKFEzjmWU="; }; - cargoHash = "sha256-UALmfUD0+n4d/oYDgeX5mStOYw7QRftfCIE3AKezrQQ="; + cargoHash = "sha256-MLsqLcz7nxOZeLWwB6Qr4ycgKO4rTIDkJZjI+2cY9HU="; nativeBuildInputs = [ cmake From dec3b9ac113df5e6d912f13dd08229b2545766ba Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 23 Feb 2024 16:20:42 -0300 Subject: [PATCH 37/62] electrum: 4.5.0 -> 4.5.3 --- pkgs/applications/misc/electrum/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 91820ce964dd..986681d5a819 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -12,7 +12,7 @@ }: let - version = "4.5.0"; + version = "4.5.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -29,11 +29,11 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-IEKuHUlH+dg+8w+n7XV7hdDOPOFZ/lpUsIlYldwR44Y="; + sha256 = "sha256-Lr6ynHAbyaiaxYAWU5j5Wh5acxO5HkP1/jpnFrL4j68="; postFetch = '' mv $out ./all - mv ./all/electrum/tests $out + mv ./all/tests $out ''; }; @@ -45,12 +45,12 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-s4FH8FtPg4wepU/5XI062dAN9fCYR1xJGwrxftCSKzw="; + sha256 = "sha256-kej0msc7SB+51ad5xZrT8MMEY5rfYOGqum6RO1gBH5s="; }; postUnpack = '' # can't symlink, tests get confused - cp -ar ${tests} $sourceRoot/electrum/tests + cp -ar ${tests} $sourceRoot/tests ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; @@ -85,6 +85,10 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; + checkInputs = with python3.pkgs; lib.optionals enableQt [ + pyqt6 + ]; + postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ @@ -115,7 +119,7 @@ python3.pkgs.buildPythonApplication { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; - pytestFlagsArray = [ "electrum/tests" ]; + pytestFlagsArray = [ "tests" ]; postCheck = '' $out/bin/electrum help >/dev/null From ad5464deab151e4b9bc407a442116f0e2d7ff1ca Mon Sep 17 00:00:00 2001 From: qubitnano Date: Fri, 23 Feb 2024 19:11:35 -0500 Subject: [PATCH 38/62] vscode-extensions.moshfeu.compare-folders: init at 0.24.2 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b0196c29b133..ca9408a0c123 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2600,6 +2600,23 @@ let }; }; + moshfeu.compare-folders = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "compare-folders"; + publisher = "moshfeu"; + version = "0.24.2"; + sha256 = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; + }; + + meta = { + changelog = "https://github.com/moshfeu/vscode-compare-folders/releases"; + description = "The extension allows you to compare folders, show the diffs in a list and present diff in a splitted view side by side"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders"; + homepage = "https://github.com/moshfeu/vscode-compare-folders"; + license = lib.licenses.mit; + }; + }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-docker"; From c74bfa05e22bc8ac255a3ed1e04eeab9407d9671 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 23 Feb 2024 06:40:13 +0900 Subject: [PATCH 39/62] atuin: backport fix for bash-preexec --- pkgs/by-name/at/atuin/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index e196974a5a22..88e9609075fe 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , installShellFiles , rustPlatform , libiconv @@ -19,6 +20,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fuVSn1vhKn2+Tw5f6zBYHFW3QSL4eisZ6d5pxsj5hh4="; }; + patches = [ + # atuin with bash-preexec wasn't recording history properly after searching, + # backport recent fix until next release + (fetchpatch { + url = "https://github.com/atuinsh/atuin/commit/cb11af25afddbad552d337a9c82e74ac4302feca.patch"; + sha256 = "sha256-cG99aLKs5msatT7vXiX9Rn5xur2WUjQ/U33nOxuon7I="; + }) + ]; + # TODO: unify this to one hash because updater do not support this cargoHash = if stdenv.isLinux From 3c07b83a3b0872f601bb65a4a2bd27be6fb2c76b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 04:49:07 +0000 Subject: [PATCH 40/62] simdjson: 3.6.4 -> 3.7.0 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 768587534778..cf56180551fd 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-yIZKlKp4p1HJBAdba+57sGl0ri0gGtjSgZQ16/vDE34="; + sha256 = "sha256-0fizP+j06NAp4CJynjzHG25OBmTa7wjkLZ2MBs1NxG4="; }; nativeBuildInputs = [ cmake ]; From b2938a8fb75d5d67743c7a7eb4b6be44456f105a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 04:50:41 +0000 Subject: [PATCH 41/62] neo4j: 5.16.0 -> 5.17.0 --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f7eff31691eb..3bf736bdc238 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.16.0"; + version = "5.17.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-XelRjO74bT6HrrUTy5lvbz9NzhHbW7HSMIyrMn3rmJA="; + hash = "sha256-l1t5RI5KfgzT9ynDQxSbUtIEdPs1BVCdY4396GHJxEA="; }; nativeBuildInputs = [ makeWrapper ]; From bb331a8c654b06aaebebc23ed3ea6682fcf1c63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 05:21:03 +0000 Subject: [PATCH 42/62] fishPlugins.pure: 4.8.0 -> 4.11.0 --- pkgs/shells/fish/plugins/pure.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 04334f14fa99..25ea8aea89b8 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "pure"; - version = "4.8.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; + hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4="; }; nativeCheckInputs = [ git ]; From 575651fe65a94ebb052d22d90a9139740e3f802f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 08:10:21 +0000 Subject: [PATCH 43/62] php82Packages.php-cs-fixer: 3.49.0 -> 3.50.0 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 611e5f263091..04eb66e86f19 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.49.0"; + version = "3.50.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-cnH6SEEaEh7X9zlHgHD8eOpaSUDnqhL2SMnNGSj1nJQ="; + sha256 = "sha256-bJd/bsb2mJbQi4J1Z2uN4A2oLG+wqyq32rNDwcLC8gc="; }; dontUnpack = true; From 50f953be9b5b4cb01a665f8ea3cade97dc7906f3 Mon Sep 17 00:00:00 2001 From: yellowhat Date: Fri, 23 Feb 2024 07:59:33 +0100 Subject: [PATCH 44/62] cri-o: 1.29.1 -> 1.29.2 Update pkgs/applications/virtualization/cri-o/default.nix Co-authored-by: Pol Dellaiera --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index edf4f1f60d4a..50e49fd192ac 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-RL4JkEJMVduG06udIVlVdr+bj9wIGbun3rpeTCUehhk="; + hash = "sha256-il28u2+Jv2gh6XqRV4y6u0FDZ4flmcp+bOj9aibL+ro="; }; vendorHash = null; From 088e4ab51b5373fc8f0785e5eb266ac0ba4cd5db Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 24 Feb 2024 11:38:25 +0100 Subject: [PATCH 45/62] broot: 1.33.1 -> 1.34.0 https://github.com/Canop/broot/releases/tag/v1.34.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 17090d28ca93..ee907902ada8 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.33.1"; + version = "1.34.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-k8rBf1kSeumtOHixJR9g90q+u5eIL0584fvTK/Qg/FU="; + hash = "sha256-5CWcc55OunZwCTqODQnvPUnn5cJET83PfIyDyzmpOkA="; }; - cargoHash = "sha256-MxWtPc1C+L5ZSPOyXwxzdAWe5WbZiPW+Zfv1P1j73JQ="; + cargoHash = "sha256-kNZPAU8QSR9hDwalvsRqRL4gaKTyvUA2gZ/bBB6/YDU="; nativeBuildInputs = [ installShellFiles From abd34e0b2f03328d8df576743c8043d5ee2edfc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 10:58:49 +0000 Subject: [PATCH 46/62] obs-studio-plugins.obs-3d-effect: 0.0.2 -> 0.1.0 --- pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index c17cd1ec502b..d897af9a8b8c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-3d-effect"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-3d-effect"; rev = version; - sha256 = "sha256-1frLQo+0/HxTIkZ57rnQjVOos5+bv2cLojslSCGo+gU="; + sha256 = "sha256-CAWx1wgk6G+9O7PkplrTg7uCmb8Yt6U3Z6YMVsq7IrQ="; }; nativeBuildInputs = [ cmake ]; From 64b4038c5519a222fb5742dc3c9ff3114c475835 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 24 Feb 2024 14:05:40 +0000 Subject: [PATCH 47/62] python3Packages.jwcrypto: 1.5.1 -> 1.5.4 --- .../development/python-modules/jwcrypto/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 7bd3126b093e..489458d5c778 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -4,23 +4,30 @@ , cryptography , deprecated , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "jwcrypto"; - version = "1.5.1"; - format = "setuptools"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SLub9DN3cTYlNXnlK3X/4PmkpyHRM9AfRaC5HtX08a4="; + hash = "sha256-CBX7q2E9uZuthWkdpfE2+IYEIzlmZ3KKJkvPpuHbNrA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography deprecated + typing-extensions ]; pythonImportsCheck = [ From 4165614b55931d530d04f4975c85e97491a975ad Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 24 Feb 2024 14:06:03 +0000 Subject: [PATCH 48/62] python3Packages.jwcrypto: enable tests --- pkgs/development/python-modules/jwcrypto/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 489458d5c778..4a10cd9fad2a 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -3,6 +3,7 @@ , fetchPypi , cryptography , deprecated +, pytestCheckHook , pythonOlder , setuptools , typing-extensions @@ -30,6 +31,8 @@ buildPythonPackage rec { typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jwcrypto" ]; From 2c27aae178371bb66009cb164d1fdc3c120db5f1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 24 Feb 2024 10:38:26 -0500 Subject: [PATCH 49/62] sing-box: 1.8.5 -> 1.8.6 Diff: https://github.com/SagerNet/sing-box/compare/v1.8.5...v1.8.6 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index f2c0b85980b2..b98f1c4b492a 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-fW96Hh0eBK8pKkrQP+uA2uaqnZFvZszX2d+VOxKo5Zk="; + hash = "sha256-t7P1W1iw5nCdACrByZormeq3r2KGAnZRFoXTRNjGztg="; }; - vendorHash = "sha256-4PauMcKpjXtXHJds8MJPH9L+UYPu2fFltP2uUEXtb+o="; + vendorHash = "sha256-J6+b0uZwBoxwc43+5PXFwztXC1abHvtK4ejg5vA757E="; tags = [ "with_quic" From ee280e8b45d44327070dff4bdb3a10e776c2f1a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 16:57:18 +0100 Subject: [PATCH 50/62] python312Packages.motionblinds: 0.6.21 -> 0.6.23 Diff: https://github.com/starkillerOG/motion-blinds/compare/refs/tags/0.6.21...0.6.23 Changelog: https://github.com/starkillerOG/motion-blinds/releases/tag/0.6.23 --- pkgs/development/python-modules/motionblinds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index f6b2fc5fb241..7d8aa5a78400 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.21"; + version = "0.6.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-zWEVgBEjxc0mg9KhlU1UvAd7HzQ2Rvsnsa2Q+/KxrHw="; + hash = "sha256-f5R58p6tMVqmXAjybae8qjeNI3vxtGJ7qxZOl9H5iKw="; }; nativeBuildInputs = [ From 52148b48050b06037e14041393af8cef38a1d0ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 16:57:53 +0100 Subject: [PATCH 51/62] python312Packages.pylutron-caseta: 0.19.0 -> 0.20.0 Diff: https://github.com/gurumitts/pylutron-caseta/compare/refs/tags/v0.19.0...v0.20.0 Changelog: https://github.com/gurumitts/pylutron-caseta/blob/v0.20.0/CHANGELOG.md --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index c95a36aa8eca..0abbd2eaa517 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-/xTHtzXEFGL2/oP1oVxJj7GO3fSZ5CwjXDdp6OLhlzM="; + hash = "sha256-7uUNLlVrMEgah2YvTECC4S2WArAQjeAyfgDd62sQsYA="; }; nativeBuildInputs = [ From d1f91f61bb909d293f0ad2cc7b5ee499e22819a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 17:01:40 +0100 Subject: [PATCH 52/62] trufflehog: 3.68.0 -> 3.68.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.68.0...v3.68.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.68.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 0a7c9c396875..fabf645f7e73 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.68.0"; + version = "3.68.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-BwBegJ5niGeKUbevzrHQ5CxQXDXWmXHON/iBy5eeBT0="; + hash = "sha256-KHMQnAI0t532YGOh7jtuuLCfRrXkzPuWOBEWaJ45HCs="; }; - vendorHash = "sha256-QXpPfi2SFr2hc7fKp2MQmhvgZhfWeBQRpT2j5384qI0="; + vendorHash = "sha256-D58WqqDwQo7fRubkGNRhD6g9ooKS9peb2qJJDRXgLtk="; ldflags = [ "-s" From a629de5ab9a817e5f3d890a11dfb67126c4b6124 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 17:22:49 +0100 Subject: [PATCH 53/62] python311Packages.pipdeptree: 2.15.0 -> 2.15.1 Diff: https://github.com/tox-dev/pipdeptree/compare/refs/tags/2.15.0...2.15.1 Changelog: https://github.com/tox-dev/pipdeptree/releases/tag/2.15.1 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 749b60ae8a37..0d2e5f1f2938 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.15.0"; + version = "2.15.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-ol5+icJAWW3+A8BEAt1MfoPeMnD/CivqSw0cPvSx2nU="; + hash = "sha256-25KcmBHoKfJoTE/GSa//QlKCNrYGSAFzTuASRIv0b+w="; }; nativeBuildInputs = [ From caf4d7bb6f231dfa1b08ef39e6d1cff461a4f386 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Feb 2024 18:04:08 +0000 Subject: [PATCH 54/62] vertcoin: fix `gcc-13` build Without the change the build fails on `master` as https://hydra.nixos.org/build/249126465: support/lockedpool.cpp: In member function 'void Arena::free(void*)': support/lockedpool.cpp:102:20: error: 'runtime_error' is not a member of 'std' 102 | throw std::runtime_error("Arena: invalid or double free"); | ^~~~~~~~~~~~~ --- .../applications/blockchains/vertcoin/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index 90e4dd14a685..097b5711da32 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , openssl , boost , libevent @@ -29,6 +30,20 @@ stdenv.mkDerivation rec { sha256 = "ua9xXA+UQHGVpCZL0srX58DDUgpfNa+AAIKsxZbhvMk="; }; + patches = [ + # Fix build on gcc-13 due to missing headers + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://github.com/vertcoin-project/vertcoin-core/commit/398768769f85cc1b6ff212ed931646b59fa1acd6.patch"; + hash = "sha256-4nnE4W0Z5HzVaJ6tB8QmyohXmt6UHUGgDH+s9bQaxhg="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://github.com/vertcoin-project/vertcoin-core/commit/af862661654966d5de614755ab9bd1b5913e0959.patch"; + hash = "sha256-4hcJIje3VAdEEpn2tetgvgZ8nVft+A64bfWLspQtbVw="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config From 4dbe5e70abe5f35508ef34060eac49cf73d1083a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 18:14:59 +0000 Subject: [PATCH 55/62] python312Packages.oelint-parser: 3.2.1 -> 3.2.2 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index e8ab9a2802cb..daf2a58fc5ed 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.2.1"; + version = "3.2.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-UHBr6O0eV4A2yS04/gtPplp5rI+YfizQhYMUE2AZ41I="; + hash = "sha256-pjdPiM23jITqYW5dklJJN5X8C8OmetIDvpN/RCLMWoE="; }; buildInputs = [ pip ]; From c456ff1d92c4b3a4b96bb07d00bf50ccf10372ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Feb 2024 19:42:30 +0100 Subject: [PATCH 56/62] qrcp: unmark broken on darwin Closes #291088 --- pkgs/tools/networking/qrcp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index edd2a9b21633..f45c053c9662 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -42,7 +42,6 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; - broken = stdenv.isDarwin; # needs golang.org/x/sys bump mainProgram = "qrcp"; }; } From 9a452c304c0d621f584daeb324593c3d59236a71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 19:47:39 +0000 Subject: [PATCH 57/62] obs-studio-plugins.obs-vertical-canvas: 1.4.0 -> 1.4.1 --- .../video/obs-studio/plugins/obs-vertical-canvas.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 2e4190f6d010..c6e9f450b990 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-80yqyfbSFBDLgGzSC8ktJRHFhbD5REWH0Rwrghcu6KY="; + sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; }; nativeBuildInputs = [ cmake ]; From e5973f6d4909ba788f547f149d6b12fb38e87de8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 20:44:13 +0000 Subject: [PATCH 58/62] discord-ptb: 0.0.69 -> 0.0.71 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index dfd9752e8ac0..721d976e8f4e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.43"; - ptb = "0.0.69"; + ptb = "0.0.71"; canary = "0.0.278"; development = "0.0.13"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-xAfKqWopvrosogQ43feMJlM3mMx+vbdhNe7jo6cpkW0="; + hash = "sha256-VeCthWbZSfugwwLGrFz7/VqPy0gGUbu2pK/j4HHr16k="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 6fc5152989bea4c35af9135edc6c1314d4ec5126 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 21:20:13 +0000 Subject: [PATCH 59/62] actionlint: 1.6.26 -> 1.6.27 --- pkgs/development/tools/analysis/actionlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index b953aea0bb2d..79cf031d14d6 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.26"; + version = "1.6.27"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-BCja8twbPwYI41JuQs2LHMCXlTbY5FAjHhZvn5mIlkg="; + hash = "sha256-v8RuSsayIVA31ADLiAOcWwXY3HKjG15FZ/PHnY651Ac="; }; - vendorHash = "sha256-sBwI2L9tNg8Q/vIhhp0eIxetklytvJj+O1mWjrHkH24="; + vendorHash = "sha256-DhZHfcnLm700i0M4pcvwlPdynbLRnG5rYsp5CrIDybw="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; From 68b55a5096ca8a212c428a0005c00d77deaaccc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 21:56:43 +0000 Subject: [PATCH 60/62] signal-desktop: 6.48.0 -> 6.48.1 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 0afae86b7e05..94ba7a3c08fa 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix {} rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.48.0"; + version = "6.48.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-hQhMl3ArIZK+0u90uIw0mERv9z4aL1Nny9Qx/Cvsfl4="; + hash = "sha256-3FJdgWmpfHAy5Hd97bH1DAbXYLsabom22tUKNK2bF2c="; } From cc817dc759d5679ae2189cd94e35c6bcd768985f Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Sat, 24 Feb 2024 23:15:56 +0100 Subject: [PATCH 61/62] vimPlugins.nvim-treesitter: don't replace existing passthru (#290707) --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 8875c8da1057..8e3b39e6c177 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -48,7 +48,7 @@ in rm -r parser ''; - passthru = { + passthru = (super.nvim-treesitter.passthru or { }) // { inherit builtGrammars allGrammars grammarToPlugin withPlugins withAllGrammars; grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations; From 738b1457d92f56078d9e0e40c1611b6bfded5dde Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 24 Feb 2024 10:10:43 -0500 Subject: [PATCH 62/62] terraform-providers.virtualbox: init at 0.2.2-alpha.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a31e49964824..13bedc388d8d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1288,6 +1288,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" }, + "virtualbox": { + "hash": "sha256-Oijdx22s7wIDC+Sms097rFVNRF9tzMlUNlPMV7GSsiI=", + "homepage": "https://registry.terraform.io/providers/terra-farm/virtualbox", + "owner": "terra-farm", + "repo": "terraform-provider-virtualbox", + "rev": "v0.2.2-alpha.1", + "spdx": "MIT", + "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE=" + }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin",