From 2e6f50cf31e6108cdd6293af4bf0d251e109edcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 1 Sep 2023 16:21:42 +0200 Subject: [PATCH 01/30] nixos/no-x-libs: add intel-vaapi-driver --- nixos/modules/config/no-x-libs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index b2eb46f273b1..a07217d86b78 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -44,6 +44,7 @@ with lib; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; }; libdevil = super.libdevil-nox; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; From 35248080ac286b31d0df8efd997e4dc1c751848a Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sun, 26 Nov 2023 22:49:53 +0100 Subject: [PATCH 02/30] ticktick: 1.0.80 -> 2.0.0 --- pkgs/applications/office/ticktick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index c236ba45056b..a3b333d1698c 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "1.0.80"; + version = "2.0.0"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc="; + hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08="; }; nativeBuildInputs = [ From 1a242ec25d07c9e3b18e96dc0bdfb6c166beff26 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 9 Oct 2023 01:16:00 +0200 Subject: [PATCH 03/30] darktile: 0.0.10 -> 0.0.11 --- .../terminal-emulators/darktile/default.nix | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index fc2b470178f3..d300853ee4a5 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, go , pkg-config , libX11 , libXcursor @@ -12,20 +11,23 @@ , libXxf86vm , libGL , nixosTests +, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "darktile"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "liamg"; repo = "darktile"; rev = "v${version}"; - sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18="; }; - nativeBuildInputs = [ go pkg-config ]; + vendorHash = null; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -38,25 +40,6 @@ stdenv.mkDerivation rec { libGL ]; - postPatch = '' - substituteInPlace scripts/build.sh \ - --replace "bash" "sh" - ''; - - postConfigure = '' - export GOPATH=$TMP/go - ''; - - makeFlags = [ "HOME=$TMP" ]; - - installPhase = '' - runHook preInstall - - install -Dm755 darktile -t $out/bin - - runHook postInstall - ''; - passthru.tests.test = nixosTests.terminal-emulators.darktile; meta = with lib; { @@ -65,7 +48,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; } From 953752738923f68b041e0630b048c37ee9ffef8d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 10 Dec 2023 11:00:02 +0100 Subject: [PATCH 04/30] nixos/installation-device: remove warning about mdadm --- nixos/modules/profiles/installation-device.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 52750cd472da..58f07b050b5c 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -105,6 +105,8 @@ with lib; ]; boot.swraid.enable = true; + # remove warning about unset mail + boot.swraid.mdadmConf = "PROGRAM ${pkgs.coreutils}/bin/true"; # Show all debug messages from the kernel but don't log refused packets # because we have the firewall enabled. This makes installs from the From 3bff45aac60acab116d35195aa9f53390bf401a1 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:07:21 +0100 Subject: [PATCH 05/30] darktile: add aarch64-linux to badPlatforms --- pkgs/applications/terminal-emulators/darktile/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index d300853ee4a5..2aaa68801cb7 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -48,6 +48,8 @@ buildGoModule rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; From c45fb30b2fc38c34df80e0517e49681e33db3015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Dec 2023 08:09:59 +0000 Subject: [PATCH 06/30] python310Packages.aioguardian: 2023.11.0 -> 2023.12.0 --- pkgs/development/python-modules/aioguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 3b72b53045b0..cd4247b4c9b3 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "aioguardian"; rev = "refs/tags/${version}"; - hash = "sha256-hTV6P9J7SS5lnV/9eFUCFPZu1GIeshytWQvNTbGs52w="; + hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o="; }; nativeBuildInputs = [ From e028a52d6f26cc2b9aad598fd941717b1b2b125c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:07:55 +0100 Subject: [PATCH 07/30] php81: 8.1.26 -> 8.1.27 --- pkgs/development/interpreters/php/8.1.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 5f5be6b3d1d8..3082f8b85b62 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.26"; - hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA="; + version = "8.1.27"; + hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From 9d236a8acee7227c25574b7bc8ee6c7f4cf50347 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:12 +0100 Subject: [PATCH 08/30] php82: 8.2.13 -> 8.2.14 --- pkgs/development/interpreters/php/8.2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 20aa6aaa0bc0..b934647d9b8c 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.13"; - hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o="; + version = "8.2.14"; + hash = "sha256-+HHhMTM9YK5sU3sa3dvCrqVMQ2xWKvmG+4MJwGAEC54="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath From ee3e7ac1800f08c8cdab393be0c7428b8555f298 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 21 Dec 2023 21:08:26 +0100 Subject: [PATCH 09/30] php83: 8.3.0 -> 8.3.1 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 6327e23504a8..942507d7d355 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -1,9 +1,9 @@ -{ callPackage, fetchurl, ... }@_args: +{ callPackage, ... }@_args: let base = callPackage ./generic.nix (_args // { - version = "8.3.0"; - hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY="; + version = "8.3.1"; + hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE="; }); in base.withExtensions ({ all, ... }: with all; ([ From 4a67cc2c36bd05516182f413da105299c03edc45 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:24:06 +0100 Subject: [PATCH 10/30] vscode-extensions.asvetliakov.vscode-neovim: 1.0.1 -> 1.5.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2c2bcecff804..52fa085311ef 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -344,8 +344,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.0.1"; - sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv"; + version = "1.5.0"; + sha256 = "1glad9xmzq58jc7js8afjmqrxgd3rqm80fk528wv5kqcmn90bgk3"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; From 2ed176b99f80cf69c6c8ed80e65b814695563bbc Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Dec 2023 09:30:46 +0000 Subject: [PATCH 11/30] txtpbfmt: unstable-2023-03-28 -> unstable-2023-10-25 --- pkgs/development/tools/txtpbfmt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 757e1e560bef..384320bb3b95 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "txtpbfmt"; - version = "unstable-2023-03-28"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "3462fbc510c07c0844c2e370719c9c18302f476f"; - hash = "sha256-vvkZWDGrId164K6jhMXNa5BtOxQSgFDhMACGAH+9F08="; + rev = "084445ff1adf0d8a27429bba65dbde5663f02d26"; + hash = "sha256-SoU1GON9avesty6FSZ+z6o2JHInUtwv+PVOzqCu+8L8="; }; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; From 5802b1d04df01eba1be34c6c580c553654a3a303 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Dec 2023 10:39:28 +0000 Subject: [PATCH 12/30] kubectx: 0.9.4 -> 0.9.5 --- .../tools/kubectx/bump-golang-x-sys.patch | 25 ------------------- pkgs/development/tools/kubectx/default.nix | 10 +++----- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/tools/kubectx/bump-golang-x-sys.patch diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch deleted file mode 100644 index ec838728410a..000000000000 --- a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/go.mod b/go.mod -index c523783..1ef8d00 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,6 +9,7 @@ require ( - github.com/imdario/mergo v0.3.9 // indirect - github.com/mattn/go-isatty v0.0.12 - github.com/pkg/errors v0.9.1 -+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - k8s.io/apimachinery v0.21.0-alpha.1 - k8s.io/client-go v0.21.0-alpha.1 -diff --git a/go.sum b/go.sum -index 8f16b5a..7426c68 100644 ---- a/go.sum -+++ b/go.sum -@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 628f6771899d..839525c30eba 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; + hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg="; }; - patches = [ - ./bump-golang-x-sys.patch - ]; - - vendorHash = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; + vendorHash = "sha256-3xetjviMuH+Nev12DB2WN2Wnmw1biIDAckUSGVRHQwM="; nativeBuildInputs = [ installShellFiles ]; From 83078b0c86cee197644a983deeedb5a08a6fb790 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sun, 24 Dec 2023 00:32:17 +0100 Subject: [PATCH 13/30] nwjs: 0.82.0 -> 0.83.0 --- pkgs/development/tools/nwjs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index f88dc1f3f905..752ec8b70188 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -85,7 +85,7 @@ let extraOutputsToInstall = [ "lib" "out" ]; }; - version = "0.82.0"; + version = "0.83.0"; in stdenv.mkDerivation { pname = "nwjs"; @@ -96,10 +96,10 @@ stdenv.mkDerivation { in fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; hash = { - "sdk-ia32" = "sha256-aIRnZDslOhoD5F0coX43VNFWGEImPU5oq9Roc4jYfsY="; - "sdk-x64" = "sha256-rKbnNAq9AVjSUjTipYze2VHiVi0RnZZsdQj1725DPd0="; - "ia32" = "sha256-pA53+A+EtS7m6026jPlC3vFxb2iheS4peDJFNkQAf/s="; - "x64" = "sha256-hRih8o8hBbYBEes3Z62PSMIC720SLRa3t2rL/5LaJAE="; + "sdk-ia32" = "sha256-Sps0XFOnnJIkDRPI+PJSjseF8cyaYvXXs4ZeVI8mcm8="; + "sdk-x64" = "sha256-qsNPfmDQK/BZzMTlX9MDaV7KZsU32YQ1B/Qh/EHIZrQ="; + "ia32" = "sha256-99+EU4Kg8lH8facRmIl2SV3GyWUw46rGYpso5QSP//k="; + "x64" = "sha256-y0oBVvVguRDe391EsQs6qYqkTRPzUfm50m6NDOZh+7o="; }."${flavor + bits}"; }; From 91b445737aa226bafbbe167960aa456263779836 Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 24 Dec 2023 12:57:30 -0800 Subject: [PATCH 14/30] librewolf-unwrapped: 120.0.1-1 -> 121.0-1 --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 65ce8374f357..89856df00ed4 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "120.0.1-1", + "packageVersion": "121.0-1", "source": { - "rev": "120.0.1-1", - "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" + "rev": "121.0-1", + "sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14" }, "settings": { - "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", - "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" + "rev": "41623492f2b6970972014f6ce196015d3d7f1b59", + "sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by" }, "firefox": { - "version": "120.0.1", - "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" + "version": "121.0", + "sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a" } } From ed528caa132bea8ee4fa72a84a3d8b7b4ef95d92 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 22 Dec 2023 12:31:27 +0800 Subject: [PATCH 15/30] backblaze-b2: add missing dependency setuptools --- pkgs/development/tools/backblaze-b2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index a29afaaea40d..ef6c30db5ffc 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -36,6 +36,7 @@ python3Packages.buildPythonApplication rec { tqdm platformdirs packaging + setuptools ]; nativeCheckInputs = with python3Packages; [ From 5ab79e192eeea36641574464e37b0f6b9eac5d14 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 22 Dec 2023 16:13:56 +0800 Subject: [PATCH 16/30] backblaze-b2: add a version test --- pkgs/development/tools/backblaze-b2/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index ef6c30db5ffc..e37fd54832c2 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchPypi, installShellFiles }: +{ lib, python3Packages, fetchPypi, installShellFiles, testers, backblaze-b2 }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; @@ -76,6 +76,15 @@ python3Packages.buildPythonApplication rec { --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) ''; + passthru.tests.version = (testers.testVersion { + package = backblaze-b2; + command = "backblaze-b2 version --short"; + }).overrideAttrs (old: { + # workaround the error: Permission denied: '/homeless-shelter' + # backblaze-b2 fails to create a 'b2' directory under the XDG config path + HOME = "$(mktemp -d)"; + }); + meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; From 870cf99aec58d784bb71f8c86f8d94b9453856a6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 17/30] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 146 +++++++++++++++---------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 54e70b1936de..7d4d220e23a8 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + sha256 = "1b1gqa90amazwnll9590m5ighywh9sacsmpyd5ihljivmvjswksk"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.5"; }; bindata = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sm8wnvxz4r9iq79s295jsrvznvjpd0pagnh1pz3xfmc9qffi7yi"; + sha256 = "1a85gisjb2n236bpay7cjqlxq07m4swc8mqnwy8c5rkxfhil194c"; type = "gem"; }; - version = "1.17.12"; + version = "1.17.13"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; @@ -965,10 +965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hr6q367ngnjjlclhjx8gma98dndmk04bj1pap5p5sqarn8ic01x"; + sha256 = "1vsqmx8pslcg1zca7hfc89vfnbcfvgyfbbxpdk2xm4cidl80zmv9"; type = "gem"; }; - version = "0.4.3"; + version = "0.6.0"; }; erubi = { groups = ["default"]; @@ -1016,10 +1016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "138gi8b95nqv8m83dynpsszz11a6c5si1pym6y0b6bfb01r33pyi"; + sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q"; type = "gem"; }; - version = "0.105.0"; + version = "0.108.0"; }; execjs = { groups = ["default"]; @@ -1037,10 +1037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.12"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -1324,10 +1324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i6xmglna30galqdsq7iq0pwxxwyrs57ymwmxhash4jhnsk7wk7z"; + sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf"; type = "gem"; }; - version = "6.2.3"; + version = "6.3.0"; }; hashie = { groups = ["default"]; @@ -1509,10 +1509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; irb = { dependencies = ["rdoc" "reline"]; @@ -1520,10 +1520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0appka5sbafafn4f8d285skxw3qkhbap28vn9ms0pf7pbp7s2449"; + sha256 = "0phrzmmxbwqmkh4dzld3pc82yml996nzfdzjipniv8wwrxwbgb3r"; type = "gem"; }; - version = "1.9.1"; + version = "1.11.0"; }; jaro_winkler = { groups = ["default"]; @@ -2010,20 +2010,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi7g6c8q0v1kahwp38mv8d526p1n2ddsr79ajx84idvih0c601i"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilnxmppz9dcwp61dbciv6nk4qsggc6l20gsxdb1flffik6q90z9"; + sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; jsonpath = { dependencies = ["multi_json"]; @@ -2105,10 +2105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + sha256 = "0kd4d5x9sxsbpbsk4xp66rxbmj2x3iglwirqws56wp7dzf7cd978"; type = "gem"; }; - version = "8.4.255.0"; + version = "8.4.255.0.1"; }; libxml-ruby = { groups = ["default"]; @@ -2125,10 +2125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc5mzk017rgi56xzy93f80v1jdcpph1ihgdhm4qq4mibfh26f27"; + sha256 = "1wp8sdrv5j89gbb68zvxlyd84q4ddyz726db76sn76bbmm9621mc"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; liquid = { groups = ["default"]; @@ -2221,10 +2221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i"; + sha256 = "0da76p1gvfabm49a0g0pppxgcdackw8f3qhljalqykd4d5mb828j"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.3"; }; matrix = { groups = ["default"]; @@ -2272,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; + sha256 = "08ja4k3yjczzz7n6rp1f3qvz4v45bc6fy04clnvdxbq3kfr7jk4c"; type = "gem"; }; - version = "3.2023.1003"; + version = "3.2023.1205"; }; mini_magick = { groups = ["default"]; @@ -2414,10 +2414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb"; + sha256 = "0bvr9q7qwbmg9jfg85r1i5l7d0yxlgp0l2jg62j921vm49mipd7v"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; ncursesw = { groups = ["default"]; @@ -2435,10 +2435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; + sha256 = "1izifdsinnfi34v2x3yavc0kxcmi1cwph11akqf949rf00sckkcp"; type = "gem"; }; - version = "0.4.7"; + version = "0.4.9"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2489,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; netrc = { groups = ["default"]; @@ -2627,10 +2627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -2731,10 +2731,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzd04pzq97rjb1a148gm0wgfb2nr89axbd16d2h6kp666fg4i00"; + sha256 = "1iavhgs7iahjz28sks5kkml9gr43fx5rpq5l0ql81pkmfv3i0cbi"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; prettier_print = { groups = ["default"]; @@ -2751,10 +2751,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172qxf1zyrhxzwbn4c7gz12zdyb1jkdqrqvb2c7863lmxp53rrxs"; + sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2795,10 +2795,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "5.1.1.1"; + version = "5.1.2"; }; public_suffix = { groups = ["default"]; @@ -2869,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11w6yd60n8ng1ncs1ajlv42dg08yks09drlsgriydgpcjwz21d40"; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; rack-test = { dependencies = ["rack"]; @@ -3028,10 +3028,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnkgnk2vli1y8bbc25qbgv6z2al44dlgcm2mx3ssm34j7xz7gqh"; + sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; type = "gem"; }; - version = "6.6.0"; + version = "6.6.2"; }; re2 = { dependencies = ["mini_portile2"]; @@ -3039,10 +3039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbh1lddqffsck99ivynjyf9n39s9as6cn9dn17xsx9vid5ysf2b"; + sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; type = "gem"; }; - version = "2.4.3"; + version = "2.5.0"; }; red-colors = { dependencies = ["matrix"]; @@ -3082,21 +3082,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "013p2968vqrr282yvxp3pyy5vn0nrgdppzqywbwbfjq2kkwx2fx9"; + sha256 = "1afyfxg5kxmrxsbsvqvk9zmqdi85wa0v164a3x3dwb3x03plp06y"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.1"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; + dependencies = ["rack-session" "redis-store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8"; + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; type = "gem"; }; - version = "2.1.4"; + version = "3.0.0"; }; redis-store = { dependencies = ["redis"]; @@ -3114,10 +3114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; + sha256 = "1xrghj2vka7girycp1m88kvl4qxkm4mj4djz4w1jzywb4v97fclm"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; reline = { dependencies = ["io-console"]; @@ -3253,10 +3253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0hzwl0ak1i455fp3hzhdn8z14jzgwbsv04f7imz7fzz89j3lpkq9"; type = "gem"; }; - version = "1.57.2"; + version = "1.59.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3275,10 +3275,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0rfg3p6bblx9gv934fdgaji0wg0xl1drhrnlifqdgkw8wbiaw0jg"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3318,10 +3318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13snp4q09vv3g7nskaza9xm50shxrdc2xxdyz6gp4vgzbvp4ihc0"; + sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.2"; }; ruby-lxc = { groups = ["default"]; @@ -3507,10 +3507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5i06vygm601822vydxniad2rhxg6xkl97r9f6pgk6pnz7spq38"; + sha256 = "148cmk9bdj6y2ax06rd5q5i322lmzn49qd1cal616hys6qd04bm1"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; sequel = { dependencies = ["bigdecimal"]; @@ -3518,10 +3518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2"; + sha256 = "1b2ypz0sgivfjzsr4igh6cm46fifzkanmz0fw8p0yq5xr4isv722"; type = "gem"; }; - version = "5.74.0"; + version = "5.75.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3644,20 +3644,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wpma2mgw82qzf1jwjalmz7nwdvn87b22wd5yy16jb67fqgrq78"; + sha256 = "0qbjgsrlrwvbywzi0shf3nmfhb52y5fmp9al9nk7c4qqwxyhz397"; type = "gem"; }; - version = "0.49.0"; + version = "0.50.0"; }; sorbet-runtime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb"; + sha256 = "0xm54yjrdz200iahvily91n0nlv9xr2yp1rjz077fq1z2pi1kadg"; type = "gem"; }; - version = "0.5.11144"; + version = "0.5.11164"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3788,10 +3788,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06fa5xpw5zrnhg0ds246l8sq49k22hpplqa1msxylnqibbsnb2y9"; + sha256 = "1fqzm5a7wf7r9jl7pxs7g6m3qpvyzpia0pid0blzc0b34n0nrb35"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; treetop = { dependencies = ["polyglot"]; From a53336ae53f6f8724880604edce172477caf8c7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:00:23 +0000 Subject: [PATCH 18/30] xsubfind3r: 0.4.0 -> 0.7.0 --- pkgs/tools/security/xsubfind3r/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/tools/security/xsubfind3r/default.nix index 6ec445696bf9..7c5470a0715a 100644 --- a/pkgs/tools/security/xsubfind3r/default.nix +++ b/pkgs/tools/security/xsubfind3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xsubfind3r"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xsubfind3r"; rev = "refs/tags/${version}"; - hash = "sha256-Xlxn9IZ9TTDzkEkyBoBwrS9AdQX21mmHngm03w+c4UM="; + hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8="; }; - vendorHash = "sha256-DkYQkuhBAYnGx9gxi2X/Coh0FYV+z5/4IX1zTfUM6uI="; + vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8="; ldflags = [ "-s" From d6ec71046837691b15c96c34d07793aecae2b19a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 06:12:25 +0000 Subject: [PATCH 19/30] xwaylandvideobridge: 0.3.0 -> 0.4.0 --- pkgs/tools/wayland/xwaylandvideobridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix index 103c92eed5a1..5614ef40d537 100644 --- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix +++ b/pkgs/tools/wayland/xwaylandvideobridge/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwaylandvideobridge"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz"; - hash = "sha256-+Npuj+DsO9XqeXr4qtj+Haqzb8PHfi02u3RDgyzfz/o="; + hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y="; }; nativeBuildInputs = [ From 93459c34828b1fc8955ada064456e854e51256ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 25 Dec 2023 10:12:24 +0100 Subject: [PATCH 20/30] python311Packages.aioguardian: update disabled --- pkgs/development/python-modules/aioguardian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index cd4247b4c9b3..4e7ec48ac585 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; From 5a85f6a490ed0c09e618542da07be3934b97dcdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 10:10:03 +0000 Subject: [PATCH 21/30] baresip: 3.6.0 -> 3.7.0 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index fd9bdf89234d..5f234ab52300 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; + hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" From 78d486bc1aba1a6b1cb87aa76ab25fc38edda2bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 13:16:58 +0200 Subject: [PATCH 22/30] hplip: add support for qtwayland Otherwise, if `QT_QPA_PLATFORM=wayland`, qt based programs will segfault. --- pkgs/misc/drivers/hplip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 0b4abe265060..854c0c39fa15 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -66,6 +66,8 @@ python3Packages.buildPythonApplication { perl zlib avahi + ] ++ lib.optionals withQt5 [ + qt5.qtwayland ]; nativeBuildInputs = [ From 3a546238f47d8979aa3071d59d17b1305323c354 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 25 Dec 2023 14:18:20 +0200 Subject: [PATCH 23/30] hplip: don't double wrap with qt env --- pkgs/misc/drivers/hplip/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 854c0c39fa15..577cb3ecf8e3 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -239,6 +239,8 @@ python3Packages.buildPythonApplication { # 1. Calling patchPythonProgram on the original script in $out/share/hplip # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; + # We also avoid double wrapping in case we add qt5 support + dontWrapQtApps = true; preFixup = '' buildPythonPath "$out $pythonPath" @@ -248,7 +250,7 @@ python3Packages.buildPythonApplication { echo "patching \`$py'..." patchPythonScript "$py" echo "wrapping \`$bin'..." - makeWrapper "$py" "$bin" \ + ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ --prefix PATH ':' "$program_PATH" \ --set PYTHONNOUSERSITE "true" \ $makeWrapperArgs @@ -266,10 +268,6 @@ python3Packages.buildPythonApplication { --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) - '' + lib.optionalString withQt5 '' - for f in $out/bin/hp-*;do - wrapQtApp $f - done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. From 49db25dccbba28ff7e10089aa4e782b7fa9da7c9 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 18 Dec 2023 23:26:33 +0800 Subject: [PATCH 24/30] rust: set sourceProvenance for bootstrap binary --- pkgs/development/compilers/rust/binary.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index efef07aba4c6..a4a82a3d619c 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -27,6 +27,7 @@ rec { meta = with lib; { homepage = "http://www.rust-lang.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; @@ -71,6 +72,7 @@ rec { meta = with lib; { homepage = "http://www.rust-lang.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; From a4544466078e39d1f298416593a5c5f80afcbe48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 15:42:00 +0000 Subject: [PATCH 25/30] cheat: 4.4.0 -> 4.4.2 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 1b85a1ec65fe..da39da86ef7b 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.4.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4="; + sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE="; }; subPackages = [ "cmd/cheat" ]; From 62266dbe341a9028d7b489972bbd39c28e8b3408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 18:38:24 +0000 Subject: [PATCH 26/30] eask: 0.8.1 -> 0.9.1 --- pkgs/development/tools/eask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix index 799a507fee35..fdd18db0210e 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/development/tools/eask/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "eask"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk="; + hash = "sha256-uQHYVhoa0wkpqV3ScQKT1XnMhJQYs/KiFUMkUG2/ll0="; }; - npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g="; + npmDepsHash = "sha256-IfuBxU4CNpMUdbGwqykoG7H9LMzrfNbmTN/8VU83ArM="; dontBuild = true; From 4d8e7dfe21c179fa03661927c79a3f4b79c79daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2023 20:51:26 +0100 Subject: [PATCH 27/30] cargo: fix description and homepage --- pkgs/development/compilers/rust/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index a4a82a3d619c..8fdc046a98e3 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -71,9 +71,9 @@ rec { inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; + homepage = "https://doc.rust-lang.org/cargo/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - description = "A safe, concurrent, practical language"; + description = "The Rust package manager"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; }; From e25b2d4e377b8db9ea2b2b86141cb588c5fab338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2023 20:52:38 +0100 Subject: [PATCH 28/30] rustc: link to https homepage --- pkgs/development/compilers/rust/binary.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 8fdc046a98e3..c546e278e7fa 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -26,7 +26,7 @@ rec { inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; + homepage = "https://www.rust-lang.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; From a5ac2d8dc26c255541bd8cd2f67dcce5c55db274 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 26 Dec 2023 04:38:25 +0800 Subject: [PATCH 29/30] kanata: mention breaking changes of v1.5.0 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c2c8f8acab65..3762f784ce3d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -50,6 +50,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes. +- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0). + - The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. From 2100a51ebdcf1373105e76f4e6b0e56f1083e53c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 25 Dec 2023 22:38:35 +0100 Subject: [PATCH 30/30] phpExtensions.apcu: remove obsolete patch --- pkgs/development/php-packages/apcu/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 737ef933a8f4..9aec7d660763 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,13 +13,6 @@ in buildPecl { sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ="; }; - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ - (fetchpatch { - url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch"; - hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I="; - }) - ]; - buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; @@ -30,8 +23,8 @@ in buildPecl { meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; description = "Userland cache for PHP"; - license = licenses.php301; homepage = "https://pecl.php.net/package/APCu"; + license = licenses.php301; maintainers = teams.php.members; }; }