From b4e8d24d24b94b73f20d56a06b20e1a92db01ad7 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 26 Oct 2023 15:44:05 +0800 Subject: [PATCH 01/94] opendht: 2.5.5 -> 3.1.4 --- pkgs/development/libraries/opendht/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 64cf84e36c3f..e972fa3fb14f 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.5.5"; + version = "3.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; + hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ asio + fmt nettle gnutls msgpack @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { restinio http-parser openssl - fmt ] ++ lib.optionals stdenv.isDarwin [ Security ]; From 1a3c37c91aa8e394dd33c8a5ecad3789f9dd9819 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 26 Oct 2023 15:44:49 +0800 Subject: [PATCH 02/94] jami: 20230619.1 -> 20231201.0 --- .../instant-messengers/jami/default.nix | 86 ++++++++++++------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 87f65e6d05aa..5dac8dfe703a 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,7 +2,6 @@ , lib , pkg-config , fetchFromGitLab -, fetchpatch , gitUpdater , ffmpeg_6 @@ -66,14 +65,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230619.1"; + version = "20231201.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0="; + hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y="; fetchSubmodules = true; }; @@ -82,24 +81,16 @@ stdenv.mkDerivation rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0"; + version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; + hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ - (fetchpatch { - name = "CVE-2023-27585.patch"; - url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; - hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; - }) - ]; - - patchFlags = [ "-p1" "-l" ]; + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -110,6 +101,52 @@ stdenv.mkDerivation rec { enablePushNotifications = true; }; + dhtnet = stdenv.mkDerivation { + pname = "dhtnet"; + version = "unstable-2023-11-23"; + + src = fetchFromGitLab { + domain = "git.jami.net"; + owner = "savoirfairelinux"; + repo = "dhtnet"; + rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535"; + hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + asio + fmt + gnutls + http-parser + jsoncpp + libupnp + msgpack + opendht-jami + openssl + pjsip-jami + restinio + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=Off" + "-DBUILD_BENCHMARKS=Off" + "-DBUILD_TOOLS=Off" + "-DBUILD_TESTING=Off" + ]; + + meta = with lib; { + description = "Lightweight Peer-to-Peer Communication Library"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.linsui ]; + }; + }; + daemon = stdenv.mkDerivation { pname = "jami-daemon"; inherit src version meta; @@ -125,6 +162,7 @@ stdenv.mkDerivation rec { alsa-lib asio dbus + dhtnet sdbus-cpp fmt ffmpeg_6 @@ -154,13 +192,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; - postPatch = '' - substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \ - --replace 'required property string placeholderText' 'property string placeholderText: ""' - ''; - preConfigure = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + # Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX + # This can be removed in future versions when JAMICORE_AS_SUBDIR is on + mkdir -p $out + ln -s ${daemon} $out/daemon ''; nativeBuildInputs = [ @@ -172,7 +209,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - daemon ffmpeg_6 libnotify networkmanager @@ -189,10 +225,7 @@ stdenv.mkDerivation rec { qtwebengine ]; - cmakeFlags = [ - "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami" - "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ + cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; @@ -201,11 +234,6 @@ stdenv.mkDerivation rec { "--set-default QT_QPA_PLATFORM xcb" ]; - postInstall = '' - # Make the jamid d-bus services available - ln -s ${daemon}/share/dbus-1 $out/share - ''; - passthru.updateScript = gitUpdater { rev-prefix = "stable/"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98b3688b0388..d4efe0940560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41954,7 +41954,6 @@ with pkgs; btcdeb = callPackage ../applications/blockchains/btcdeb { }; jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { - fmt = fmt_9; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; From a70fb29f4e8cae3b011981c79b2f9a793e753225 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Thu, 7 Dec 2023 20:58:41 -0500 Subject: [PATCH 03/94] joplin-desktop: 2.12.18 -> 2.13.9 --- pkgs/applications/misc/joplin-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index e993b085aec3..f34776906b0e 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.12.18"; + version = "2.13.9"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; - x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; - aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; + x86_64-linux = "sha256-1po4i+SG5o28uBtgmIXxnCP8/ZvFgTXxrdKVTSA7ndE="; + x86_64-darwin = "sha256-4NeFVj+RB3CyCQxrMM7ZfFahBMa0WumY1YPslJ2votc="; + aarch64-darwin = "sha256-pxlato6AQYduTCXouGVNSGr5awhGwlC8jTkG9nB2U+4="; }.${system} or throwSystem; }; From 935e329186b687e55549f8387967aecee1bc3940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Dec 2023 08:18:35 +0000 Subject: [PATCH 04/94] freetds: 1.4.8 -> 1.4.10 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index c30f69f18fdf..df7328b2b043 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.8"; + version = "1.4.10"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k="; + hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg="; }; buildInputs = [ From ccbc56db1376800059daafb40389fe212743da43 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 16 Dec 2023 08:28:17 -0300 Subject: [PATCH 05/94] vcluster: 0.17.0 -> 0.18.1 Release: https://github.com/loft-sh/vcluster/releases/tag/v0.18.1 Changelog: https://github.com/loft-sh/vcluster/compare/v0.17.0...v0.18.1 * Add version test * Add fish shell completion --- .../networking/cluster/vcluster/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 8256d04d6b97..ab44da15a8d0 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,14 +1,14 @@ -{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }: buildGoModule rec { pname = "vcluster"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU="; + hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ="; }; vendorHash = null; @@ -36,9 +36,15 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd vcluster \ --bash <($out/bin/vcluster completion bash) \ + --fish <($out/bin/vcluster completion fish) \ --zsh <($out/bin/vcluster completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = vcluster; + command = "vcluster --version"; + }; + meta = with lib; { description = "Create fully functional virtual Kubernetes clusters"; downloadPage = "https://github.com/loft-sh/vcluster"; From 5e1281845bb4a9618131d0b78eaeda3bd32a16b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Dec 2023 06:26:39 +0000 Subject: [PATCH 06/94] netmaker-full: 0.21.1 -> 0.21.2 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 086c9325f565..c2967e0f3588 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM="; + hash = "sha256-0KyBRIMXGqg4MdTyN3Kw1rVbZ7ULlfW6M9DSfAUQF8A="; }; - vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM="; + vendorHash = "sha256-B9r+p9kL/8h5qGmJ2WChnU3qKFf9z76YFqn6M2dXsDg="; inherit subPackages; From 6fcb715fa384ea917fda04ae47ec70be7ec904c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Dec 2023 07:46:55 +0000 Subject: [PATCH 07/94] cntr: 1.5.1 -> 1.5.2 --- pkgs/applications/virtualization/cntr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 3cfd905bc560..becc0308c469 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; + sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY="; }; - cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; + cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4="; passthru.tests = nixosTests.cntr; From 69899afa52cf8bac0ba736347e50e8db3213e411 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 Dec 2023 22:53:18 +0100 Subject: [PATCH 08/94] home-assistant-custom-lovelace-modules.mini-media-player: 1.16.6 -> 1.16.8 https://github.com/kalkih/mini-media-player/releases/tag/v1.16.7 https://github.com/kalkih/mini-media-player/releases/tag/v1.16.8 --- .../custom-lovelace-modules/mini-media-player/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix index 749b15398f4b..96decc53eeb4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.6"; + version = "1.16.8"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-1cC9dyZ9+7dXSL/dmFD0HV7SgsBW2zA7a+eOKVwbzg8="; + hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M="; }; - npmDepsHash = "sha256-/7roW1xkZmGuB/8nFaQz0Yeuai6yJ+cH7Uqa/zxfa5w="; + npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg="; installPhase = '' runHook preInstall From 2431c94db91de36dc464276a4f12b798c75bc946 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 Dec 2023 23:21:42 +0100 Subject: [PATCH 09/94] evcc: 0.122.1 -> 0.123.0 https://github.com/evcc-io/evcc/releases/tag/0.123.0 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 650b0c0c6c53..c9ccd3b6ab20 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.1"; + version = "0.123.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; + hash = "sha256-jqlGjDwi+QGh5gmYVoSlxQjyKvNrE9nmSfh1cOlwnoM="; }; - vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; + vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; + hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY="; }; nativeBuildInputs = [ From 31f611d22aa02e70988645c8856c10f490930eab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 10:20:35 +0000 Subject: [PATCH 10/94] snappymail: 2.29.4 -> 2.31.0 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 1c53154d924d..88f99923b411 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.29.4"; + version = "2.31.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-dWWwBee7pfYMo8trX9KnqNaMw+CZe8svj/pjmZnl/qo="; + sha256 = "sha256-5fDHXoa8ra+VDrViG7Xu9yQSAN/a3lL+rz0rVAmCD/0="; }; sourceRoot = "snappymail"; From 41ae0bfafe51bf5b48b0931ace3fb3d517b900f8 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 23 Dec 2023 22:20:05 +0800 Subject: [PATCH 11/94] cagebreak: 2.2.1 -> 2.2.3 --- pkgs/applications/window-managers/cagebreak/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index f070b1fd062c..2f3add0356a9 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI="; + hash = "sha256-ppNzc6ojxF9FkgsqSWBSbtmI9aRc+RGN1R1RQLwCtv0="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 251218ab9faa..b301b53c58c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41990,7 +41990,7 @@ with pkgs; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; psftools = callPackage ../os-specific/linux/psftools { }; From 953efa78c8e35a4060866bb9983e3cab77250812 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 00:29:38 +0000 Subject: [PATCH 12/94] python311Packages.trimesh: 4.0.6 -> 4.0.8 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 510956cb9c86..3199218ef659 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.6"; + version = "4.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wbcNtIErAOS2IHKNa+EfSEmxZulQ2TarBdO8SmtefU0="; + hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I="; }; nativeBuildInputs = [ setuptools ]; From 9343003c0b7d9e7c3cd60fec6f096515917fe84b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Dec 2023 04:20:00 +0000 Subject: [PATCH 13/94] postgresqlPackages.pg_repack: 1.4.8 -> 1.5.0 Diff: https://github.com/reorg/pg_repack/compare/ver_1.4.8...ver_1.5.0 --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index fd07b4e10544..eae95a3ed9d6 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.8"; + version = "1.5.0"; buildInputs = [ postgresql openssl zlib readline ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "reorg"; repo = "pg_repack"; rev = "ver_${version}"; - sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="; + sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; installPhase = '' From 42bb0d0d161b16d1a0c310f36339169634bb7a95 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 24 Dec 2023 04:20:00 +0000 Subject: [PATCH 14/94] postgresqlPackages.pg_repack: add testers --- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 45 ++++++++++++++++--- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index eae95a3ed9d6..e29918373c77 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, postgresql +, postgresqlTestHook +, readline +, testers +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pg_repack"; version = "1.5.0"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "ver_${version}"; + owner = "reorg"; + repo = "pg_repack"; + rev = "ver_${finalAttrs.version}"; sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; installPhase = '' install -D bin/pg_repack -t $out/bin/ install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension + install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + extension = stdenv.mkDerivation { + name = "plpgsql-check-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;" + runHook postCheck + ''; + installPhase = "touch $out"; + }; + }; + meta = with lib; { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' @@ -31,5 +61,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ danbst ]; inherit (postgresql.meta) platforms; + mainProgram = "pg_repack"; }; -} +}) From 257a21a56b57dcd26bde0fce72442451a29dc055 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 24 Dec 2023 20:43:05 +0100 Subject: [PATCH 15/94] python3Packages.gst-python: stop using meta.homepage in fetcher --- pkgs/development/python-modules/gst-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index e8d286b9cb72..03062ea264be 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; + url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48="; }; From 8326f42345bebc328315a4b4edf7811c4864fb12 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 24 Dec 2023 22:49:26 +0100 Subject: [PATCH 16/94] blas-reference: 3.11.0 -> 3.12.0 --- pkgs/development/libraries/science/math/blas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index ed899a02aa78..4431ab63c7b7 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM="; + sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0="; }; passthru = { inherit blas64; }; From 7e573feffadf341bf92820dcc930d6ff245984a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Dec 2023 21:53:14 +0000 Subject: [PATCH 17/94] freshrss: 1.22.1 -> 1.23.0 --- pkgs/servers/web-apps/freshrss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 8a8502ad823b..e7eee6515fb7 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; + hash = "sha256-X7MYPn1OFmzMWGGlZZ67EHEaRJRKGrdnw6nCzuUfbgU="; }; passthru.tests = { From 6fc02c6c6f1c45eccc3fc2a450fcc2e1e85f4748 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 25 Dec 2023 01:01:20 +0100 Subject: [PATCH 18/94] nixos/freshrss: fix test http-auth --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0ef5c4d8d3cb..87a64990501d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -317,6 +317,7 @@ in { freetube = discoverTests (import ./freetube.nix); freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; + freshrss-http-auth = handleTest ./freshrss-http-auth.nix {}; frigate = handleTest ./frigate.nix {}; frp = handleTest ./frp.nix {}; frr = handleTest ./frr.nix {}; From 97a6fa437fed870c22e6910852c58375a341cde3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 19/94] python311Packages.pglast: 5.6 -> 5.7 Changelog: https://github.com/lelit/pglast/blob/v5.7/CHANGES.rst --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index d6db6b08c865..764162a13c58 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.6"; + version = "5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WHFc8rXzdcRrp1U6tAuepQYagFYo8+0WQr8783w/Ql8="; + hash = "sha256-5JYygEthxFvjjbKpzw2CJNAvtrnCqdnR0sbJHhNRYFw="; }; propagatedBuildInputs = [ From fd0bc2781abb69b9a483d4be5b8eb1ae63a26fdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Dec 2023 04:20:00 +0000 Subject: [PATCH 20/94] python311Packages.xhtml2pdf: 0.2.11 -> 0.2.13 Diff: https://github.com/xhtml2pdf/xhtml2pdf/compare/refs/tags/v0.2.11...v0.2.13 Changelog: https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v0.2.13 --- .../python-modules/xhtml2pdf/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 931d08e12c1c..f1c0d836bf74 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.11"; - format = "setuptools"; + version = "0.2.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L/HCw+O8bidtE5nDdO+cLS54m64dlJL+9Gjcye5gM+w="; + hash = "sha256-K7gsTLYcXmKmEQzOXrJ2kvvLzKaDkZ/NRLRc0USii5M="; }; propagatedBuildInputs = [ @@ -42,8 +42,15 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Tests requires network access + "test_document_cannot_identify_image" + "test_document_with_broken_image" + ]; + pythonImportsCheck = [ "xhtml2pdf" + "xhtml2pdf.pisa" ]; meta = with lib; { @@ -52,5 +59,6 @@ buildPythonPackage rec { changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "xhtml2pdf"; }; } From 0e2f9be8dd5b31469d3e3cbf25471304f84c4400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 08:56:13 +0000 Subject: [PATCH 21/94] arkade: 0.10.17 -> 0.10.20 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 6f5827a7552b..39f5f70988c5 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.17"; + version = "0.10.20"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Ubj2jrQFmMTSY2+Z4pqDIQ+K8JycX+NOpgcuyCrD4uo="; + hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk="; }; CGO_ENABLED = 0; From 4c18de526b8b1c1d7411e6d6e14dd0a65f8ff348 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Mon, 25 Dec 2023 16:09:07 +0530 Subject: [PATCH 22/94] kotlin{-native}: 1.9.20 -> 1.9.22 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 50b9d0fadee7..fee4889e1add 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.20"; + version = "1.9.22"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; + sha256 = "1rn3rabwyqqhs6xgyfwl326hrzpfpc3qqd2nzwbchck5a09r5cw8"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 16599c9b96c8..bc2018665ca7 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.20"; + version = "1.9.22"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-Yw6IO8pj0C9XHfzVshcovkoFBUXJ3KixhGoybBRFL2U="; - "macos-x86_64" = "sha256-mnDi8dMCDzGsdPdD1dw4YMBxAfo5FvwDJVU/ew70z9U="; - "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; + "macos-aarch64" = "1pf81rplikbp194pjrm2la101iz8vz3jv55109nipd26xghc15ca"; + "macos-x86_64" = "1r7dmk8cc7f3iwaxamlnlcjl4mbvx443nwvsp8141a21ibrvrmx9"; + "linux-x86_64" = "1m77qld44gbarjxm99gsdscncx4v0cf6ca3h9bdh2m7d3i4adc62"; }.${arch}; in fetchurl { From 9db06dbb85225f9dc6ee7a95cd4026f40b390080 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 12:52:16 +0000 Subject: [PATCH 23/94] cargo-swift: 0.4.0 -> 0.5.1 --- pkgs/by-name/ca/cargo-swift/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index e98dab10b058..f9f1f6baa2f9 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-dW0/h7uS0BEstiochACIySSKXsz+E6Tj5MaLtdin7gw="; + hash = "sha256-v7ZZ3tMM8KmRk6y3uSw8ZBEcByQ95XQv3XPTUtDGUQ0="; }; - cargoHash = "sha256-LsjDeKfAvgVYM4qYyWq9MoXB4jIh870urrFHpiGCGPc="; + cargoHash = "sha256-K3xZytJJ9/CaHWHL1fX0vKYpzH9yz3xOs2J5PoZWWv0="; meta = with lib; { description = "A cargo plugin to easily build Swift packages from Rust code"; From c0f720d3b1e48e036770adeb65459ae427af50d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 14:01:48 +0000 Subject: [PATCH 24/94] cilium-cli: 0.15.17 -> 0.15.19 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 4c123c0f4ef2..80f67b3a1bde 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.17"; + version = "0.15.19"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-Gb3S3R9gt/4sCOxjiIEXDnVEUEt7Zgz0GJZFEP9D+h8="; + hash = "sha256-52i3Ek/rXFF9rMMiXNMnRjT2HYsknGKvVtCRrVDmo9U="; }; vendorHash = null; From 909b7cfa7f8e1cf109b1c69c89c009262ceacf25 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 25 Dec 2023 08:37:28 -0600 Subject: [PATCH 25/94] wttrbar: 0.6.0 -> 0.7.0 --- pkgs/applications/misc/wttrbar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 7e2f72e31ded..0de4ca92d37c 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE="; + hash = "sha256-AGIUMw4lvYiUJol4VYS+ozNMsCDNGPCsg+fwMlpWEJY="; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA="; + cargoHash = "sha256-3FDY0SUl1lb9jUjUj14j/5gF5NoSpS1PMj1AtXr/4Hk="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; From ad729ac62ec7517b0ebda1fe6d348ab79f6d83eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 16:30:07 +0000 Subject: [PATCH 26/94] devbox: 0.8.4 -> 0.8.5 --- pkgs/development/tools/devbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 683848220c5a..8bfef1ff6303 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-B+7c27xq+JNhP6s9mS5t7AURPV9/HFf5o1jtqyH4x2g="; + hash = "sha256-Vgke4CTVU5KW7iDyzk6P1ab5nOyICblvJtUQTISc2jg="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-4HdBTOTQGMAez5gg1R7+M3EqrP0cv8iNjD7ayZD95aU="; + vendorHash = "sha256-rP3vktCfmUeZhc0DaU2osVryNabsnaWWyfFYFy7W1pc="; nativeBuildInputs = [ installShellFiles ]; From 0f7b4aee1b08e1de308073ed39cc6a286a96c5cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 17:27:00 +0000 Subject: [PATCH 27/94] droidcam: 2.1.1 -> 2.1.2 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index aba2c45bb015..4909fe6fa786 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-NdVnls1DvcaI/bVrc5gN96+KQZDgt0M8zkNn93QJYG0="; + sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0="; }; nativeBuildInputs = [ From 7b4fd0568fc87f5212361357f42c5379e4624d87 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 25 Dec 2023 18:47:28 +0100 Subject: [PATCH 28/94] maintainers: added new pgp key to anpin --- maintainers/maintainer-list.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 59770def79fc..6f76c6885e6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1281,9 +1281,11 @@ githubId = 6060545; matrix = "@anpin:matrix.org"; name = "Pavel Anpin"; - keys = [{ - fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; - }]; + keys = [ + { fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; } + # compare with https://keybase.io/anpin/pgp_keys.asc + { fingerprint = "DADF F3EA 06DC 8C1B 100A 24DB 312E 8F17 91C5 DA8C"; } + ]; }; anpryl = { email = "anpryl@gmail.com"; From 0c1987100aeb36dc1bb5190200b2f5fe920a704b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 25 Dec 2023 13:03:17 -0500 Subject: [PATCH 29/94] python311Packages.remotezip: 0.12.1 -> 0.12.2 Diff: https://github.com/gtsystem/python-remotezip/compare/da62e115bdb2071ad08a8c91f7ae48f2c1827e0c...3723724d6d877d3166d52f4528ffa7bd5bf6627f --- pkgs/development/python-modules/remotezip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 5a79b68e6b85..6581fc6189be 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { pname = "remotezip"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; src = fetchFromGitHub { @@ -17,8 +17,8 @@ buildPythonPackage { repo = "python-remotezip"; # upstream does not tag releases, determined with git blame # pypi archive lacks files for tests - rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; - hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f"; + hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4="; }; propagatedBuildInputs = [ From 8966a102909907d691b0c7a21bcf991580bfd596 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 19:32:23 +0000 Subject: [PATCH 30/94] cargo-workspaces: 0.2.44 -> 0.3.0 --- pkgs/development/tools/rust/cargo-workspaces/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index ccbddf3706c1..a4e796381cd9 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.2.44"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM="; + hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug="; }; - cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM="; + cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ="; nativeBuildInputs = [ pkg-config From 63a41e7312925d92a039ff15e43ee94f046387c9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 19:47:45 +0000 Subject: [PATCH 31/94] ofono: fix digest Without the change build of `ofono` on `staging-next` fails as: $ nix build --no-link -f. ofono.src error: hash mismatch in fixed-output derivation '/nix/store/yjggdjyrczbm1mc73zd31l0v0nzcmrl9-source.drv': specified: sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA= got: sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg= I think it started after merge conflict fix. --- pkgs/tools/networking/ofono/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 6ef0fc6ec0ad..f4631f06dc79 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${version}.tar.gz"; - sha256 = "sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA="; + sha256 = "sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg="; }; patches = [ From 79f6fb1ff8a0376a51aacad3af4eacdd2b4d9633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 19:52:09 +0000 Subject: [PATCH 32/94] flashprint: 5.8.1 -> 5.8.3 --- pkgs/applications/misc/flashprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 893ae8aed005..affc8c5ad2be 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.1"; + version = "5.8.3"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk="; + hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; From 0f993830f5f191eecdaf2a2a5db63cbfa1b2952a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 20:41:46 +0000 Subject: [PATCH 33/94] freedv: 1.9.5 -> 1.9.6 --- pkgs/applications/radio/freedv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index a337470664af..245e29fdb58a 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; + hash = "sha256-2TqlBlbMhBqe8WqoyYLJ9B82sAy3MdoaYvvk+XB5CdQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 52f8a4caad3e07466d9f882e214d273e261a477a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 20:44:16 +0000 Subject: [PATCH 34/94] helmfile: 0.159.0 -> 0.160.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 8967550b4d0e..f623ed21e31b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.159.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-7RFDa8Yw2tPjVvJLVPb7VbDNhrHNxzqmE0uogm7X/HY="; + sha256 = "sha256-sPHEYhKiKzB5MYylWeHKpVjjXbDsWbg99TKqT/d3uJ0="; }; - vendorHash = "sha256-kVr6h5u71RimRER6tNxZUewSqqjaAPptriD5bfsE85U="; + vendorHash = "sha256-LkmPytmXrense/M0erBkxeQ7XXGlHDLY1yedsOxk4+E="; doCheck = false; From 36d19bc398634ba0d91f44f6b8b85bce27ba0ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 21:02:07 +0000 Subject: [PATCH 35/94] kubecm: 0.25.0 -> 0.26.0 --- pkgs/applications/networking/cluster/kubecm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index bdb9ce1a5c85..6283b8387ddb 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-8Y8JChZxjbN/nOw2tzDfJvYSMAtAadf6QMsDFK4IIOg="; + hash = "sha256-53diz+TNGRmNbSZJAIKPFi0x/BdL02Tjb847I/XdhW0="; }; - vendorHash = "sha256-HjMgXEDX9pDpK+1Hm0xI0wYRfpj7K6xkZJXCUBqbE3Y="; + vendorHash = "sha256-QPd7gUEY6qNdl96slKvY7+Av6fCU9q+XdjKNKUXz2Wo="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; From 51bbafd6a7e1df7317d8df9d9d85d3bd6c482398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 21:14:28 +0000 Subject: [PATCH 36/94] python311Packages.jaraco-logging: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/jaraco-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 5e5e60b39624..e87d01a869a6 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; + hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs="; }; pythonNamespaces = [ From 2dc30cae79baac0848ca5d8228154479721f0c8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 21:14:57 +0000 Subject: [PATCH 37/94] libtraceevent: 1.7.3 -> 1.8.0 --- pkgs/os-specific/linux/libtraceevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 5b8aa329b783..25b96fe00a5f 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.7.3"; + version = "1.8.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo="; + sha256 = "sha256-l1x9tiHKhfdetlnn9S/EfpcHDzZqiTOrdFhHQtOC6Do="; }; postPatch = '' From 7da4af6d7274e0c29b03ad1ad3622a65b4668ced Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 22:07:43 +0000 Subject: [PATCH 38/94] bacon: 2.13.0 -> 2.14.1 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index b7f4f7c5d95c..92249df9eeca 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA="; + hash = "sha256-fhAKTZk+51KYjEnVWNLwpUWx+Quj3tmvmIvULQTbGf8="; }; - cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10="; + cargoHash = "sha256-eBWmb6YaGZX31K3jKNKXgTGOOQm/WiSupckkpi49dWI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 76cd213e1eadfb172be69b1bfd25ca21e766c8a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 22:38:49 +0000 Subject: [PATCH 39/94] ligolo-ng: 0.4.4 -> 0.4.5 --- pkgs/tools/networking/ligolo-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index d4b4dca3326f..63e2d450ad10 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8="; + hash = "sha256-T+SBGAE+hzHzrYLTm6t7NGh78B1/84TMiT1odGSPtKo="; }; - vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs="; + vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI="; postConfigure = '' export CGO_ENABLED=0 From d2fa06b609085385a43afc81251af98b7bab0434 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Dec 2023 23:22:19 +0000 Subject: [PATCH 40/94] python311Packages.mysqlclient: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/mysqlclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 05387cd0a6d3..e43129a94fcf 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; + hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI="; }; meta = with lib; { From 8cd60f251eba14ef68b28d7a3fde3dd3d0d23a56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 22 Dec 2023 23:32:17 +0100 Subject: [PATCH 41/94] esphome: 2023.11.6 -> 2023.12.5 https://github.com/esphome/esphome/releases/tag/2023.12.0 https://github.com/esphome/esphome/releases/tag/2023.12.1 https://github.com/esphome/esphome/releases/tag/2023.12.2 https://github.com/esphome/esphome/releases/tag/2023.12.3 https://github.com/esphome/esphome/releases/tag/2023.12.4 https://github.com/esphome/esphome/releases/tag/2023.12.5 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 6e8c3a91e278..489250776213 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.11.6"; + version = "2023.12.5"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9LqZlhCt+7p6tnSHFhbnUzkEOJQDsg/Pd/hgd/Il0ZQ="; + hash = "sha256-ajpYwquVyznIngZKcWxI9Pyiqf4VYcWtGFRZSpi6+3I="; }; nativeBuildInputs = with python.pkgs; [ From c21d0c384484712202bb9f5a69858739f31742f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Dec 2023 01:06:27 +0100 Subject: [PATCH 42/94] anydesk: use desktopItems, move passthru before meta --- .../networking/remote/anydesk/default.nix | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 66b8f8d59bd8..1f60abbcf970 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,44 +1,22 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems , pulseaudio }: let description = "Desktop sharing application, providing remote support and online meetings"; - - desktopItem = makeDesktopItem { - name = "AnyDesk"; - exec = "@out@/bin/anydesk %u"; - icon = "anydesk"; - desktopName = "AnyDesk"; - genericName = description; - categories = [ "Network" ]; - startupNotify = false; - }; - in stdenv.mkDerivation rec { pname = "anydesk"; version = "6.3.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; - passthru = { - updateScript = genericUpdater { - versionLister = writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' - ''; - }; - }; - buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL minizip freetype @@ -48,7 +26,19 @@ in stdenv.mkDerivation rec { libXrandr libXtst libXt libICE libSM libXrender ]); - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + desktopItems = [ + (makeDesktopItem { + name = "AnyDesk"; + exec = "${placeholder "out"}/bin/anydesk %u"; + icon = "anydesk"; + desktopName = "AnyDesk"; + genericName = description; + categories = [ "Network" ]; + startupNotify = false; + }) + ]; installPhase = '' runHook preInstall @@ -57,7 +47,6 @@ in stdenv.mkDerivation rec { install -m755 anydesk $out/bin/anydesk cp copyright README $out/share/doc/anydesk cp -r icons/hicolor/* $out/share/icons/hicolor/ - cp ${desktopItem}/share/applications/*.desktop $out/share/applications runHook postInstall ''; @@ -75,11 +64,19 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/anydesk \ --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} - - substituteInPlace $out/share/applications/*.desktop \ - --subst-var out ''; + passthru = { + updateScript = genericUpdater { + versionLister = writeShellScript "anydesk-versionLister" '' + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; From 9d95ddfac4de893bf3b01d577e7622a4c5ef4a73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 01:48:39 +0000 Subject: [PATCH 43/94] spleen: 2.0.1 -> 2.0.2 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 0c114b176abd..e97d8416610c 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-N9kJrWaQN9eeNoOVJu9UN2+jcEbHqRWxV+X0DXNJLuA="; + hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From a44afba8444dfa8642e4225accd36585d094001b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 02:24:48 +0000 Subject: [PATCH 44/94] aliyun-cli: 3.0.189 -> 3.0.190 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index fd0737a848c8..970d7f8933dc 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.189"; + version = "3.0.190"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-XSFIf2/k6uRHTSpvSpFApU+RjS5WlYVFoVJiyOU7Lvg="; + sha256 = "sha256-16mHIvrXtFHmH6Uc2qcBTSltuHDs5jfZ2+hHvUpOjOQ="; }; - vendorHash = "sha256-5Pmd1gQ0nS3h43YXGP4s8uZNQAH30o1s8y8r1nuh6b0="; + vendorHash = "sha256-ZcW0Ab7uPx8XUpo3tSSt2eKjUlRlbiMvrLGJK2StKf8="; subPackages = [ "main" ]; From 9329efeadc238dc9c169751403611481086f2d10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 02:24:58 +0000 Subject: [PATCH 45/94] xdg-desktop-portal-hyprland: 1.2.5 -> 1.2.6 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 6a067878f22f..9e17bbb61b9c 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE="; + hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4="; }; nativeBuildInputs = [ From 251c448e7859d1ff36f2dc603ba94a2eaf12e733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 02:46:33 +0000 Subject: [PATCH 46/94] eksctl: 0.165.0 -> 0.167.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 5f9099537c36..98b53645a622 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.165.0"; + version = "0.167.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-Gx8HobnE7qAfX79ZSLaN8fki+TQYz6XLyxnoSpvFOyk="; + hash = "sha256-8CxXfjYN9i2AxuKeYmmYN0TQROGkurfmzbqU+aOMbTY="; }; - vendorHash = "sha256-niULedV/9r3PFI69AenGfk3oCTvKE/h6edjW5sgHg3Q="; + vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8="; doCheck = false; From 08041d345eb1b33f26f325df7467ed10ef6df591 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 03:40:50 +0000 Subject: [PATCH 47/94] firebase-tools: 12.4.8 -> 13.0.2 --- pkgs/development/tools/firebase-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 057f9fcea519..337de8c263b8 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "12.4.8"; + version = "13.0.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA="; + hash = "sha256-vR4WvnZjxdbebXWdVbM8vQTCo7pgRMcu9A2KygHZCMk="; }; - npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s="; + npmDepsHash = "sha256-h99Zj+yJJvLKc/B6AbKKQTOdrZCIT3BVlkxrOtOyNA4="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 33f24ac84ad42f222cb29a58b860ca0136e321e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 03:49:56 +0000 Subject: [PATCH 48/94] fits-cloudctl: 0.12.11 -> 0.12.12 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index ad661b97c68d..3c2a524c004d 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.11"; + version = "0.12.12"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-rp5iMp6Ah2JESpY8mdwez25D9GghoIMUqMNst72z2fM="; + sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s="; }; - vendorHash = "sha256-3RowPOLtEDxXFcb2KizuVP3O0uTwkuUQ8UB2AFPaVVE="; + vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From 760807bc1e72ac669247623cb9f0847de84b6a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 04:01:25 +0000 Subject: [PATCH 49/94] flow: 0.224.0 -> 0.225.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 81d0185f9546..040e44ea5bc2 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.224.0"; + version = "0.225.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-HxJRsIjNXbalqfCBnx5yfWhxdgud1nCNlx1WPUJmALU="; + hash = "sha256-tJWq2l5axnukjqJGZwrVF/UDcPdPGDyjol8fs0a777g="; }; postPatch = '' From 91b7b94bccbd67d335064fe6c25e14883124fd07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 04:03:29 +0000 Subject: [PATCH 50/94] flyctl: 0.1.134 -> 0.1.135 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1aa253775294..3078fdba3215 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.134"; + version = "0.1.135"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-dkzoSu9Aug1PyYwjVEvoAXPHa4a5tTTd6CaUjs+x9+I="; + hash = "sha256-eQqYfH/qNlUkqd82h8O7kSa/QTL+Y9vRKd3LDqCnnCI="; }; - vendorHash = "sha256-MUsZ/OXPoaHvLLabC0/MvvcYn1VcgDBjiq3kKhyvr6g="; + vendorHash = "sha256-IM4xk+KAimBBR1Mq4ptfA9LbC1YZLErP1XtSEPeGi/c="; subPackages = [ "." ]; From 9b1f47a401f231fbc014b7394eaccd454a69d271 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 04:25:23 +0000 Subject: [PATCH 51/94] frp: 0.52.0 -> 0.53.2 --- pkgs/tools/networking/frp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index d44b6b73f54f..3f81a7283170 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.52.0"; + version = "0.53.2"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8cpNKXEQI+3VaP1qwXTd5L9y0EKR2LfxrCU5i+K2ptY="; + sha256 = "sha256-/z/pZgB4PepJXXjOBuuq1wHXI2pn/KCxY9cdfANdWGQ="; }; - vendorHash = "sha256-4+qzaSdku6qSqF0eT45sJ1zxw/zXYhxhNgq3WwrBIY0="; + vendorHash = "sha256-mcgHbwdqcIu4BceuQg+Es0dsIpWG0bsIpd056IOxuiY="; doCheck = false; From d8403f1fe672b111498390d9b282e4a013ccb906 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 04:36:14 +0000 Subject: [PATCH 52/94] bento4: 1.6.0-640 -> 1.6.0-641 --- pkgs/tools/video/bento4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 5e796c82ec6b..54e5a22cc67d 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "bento4"; - version = "1.6.0-640"; + version = "1.6.0-641"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - hash = "sha256-VhlFfNYw3xpAIyWqDyhgXIv3JtpFJH0BL97dFX8diRY="; + hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY="; }; patches = [ From a08466f3b30d6f4c53ac5a541e2d6f5d17799368 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 26 Dec 2023 06:55:17 +0200 Subject: [PATCH 53/94] pacproxy: add meta.mainProgram, move to pkgs/by-name --- .../pacproxy/default.nix => by-name/pa/pacproxy/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{tools/networking/pacproxy/default.nix => by-name/pa/pacproxy/package.nix} (95%) diff --git a/pkgs/tools/networking/pacproxy/default.nix b/pkgs/by-name/pa/pacproxy/package.nix similarity index 95% rename from pkgs/tools/networking/pacproxy/default.nix rename to pkgs/by-name/pa/pacproxy/package.nix index f1fb107dd62c..9b6538b1c85c 100644 --- a/pkgs/tools/networking/pacproxy/default.nix +++ b/pkgs/by-name/pa/pacproxy/package.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; + mainProgram = "pacproxy"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a5a6f9df840..e2a0fe01d679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1090,8 +1090,6 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; - pacproxy = callPackage ../tools/networking/pacproxy { }; - pacup = callPackage ../tools/package-management/pacup { }; patcher9x = callPackage ../development/tools/patcher9x { }; From 7215f205cd6dd443a01b40cb14da04c57d930295 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 05:08:55 +0000 Subject: [PATCH 54/94] buttercup-desktop: 2.24.3 -> 2.24.4 --- pkgs/tools/security/buttercup-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 1692c246df70..a3eb00d3fe45 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.24.3"; + version = "2.24.4"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-ZSKsxlxP2jNUxEeF2Lfuj2yW0KqHozjPoioq4t0uzfo="; + sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From af486ebc8b87aaa13ea8a843e4c62e7a77395b3e Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 26 Dec 2023 10:45:20 +0530 Subject: [PATCH 55/94] dua: 2.23.0 -> 2.24.1 Diff: https://github.com/Byron/dua-cli/compare/v2.23.0...v2.24.1 Changelog: https://github.com/Byron/dua-cli/blob/v2.24.1/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 6b9aff9572ec..ffc3b7becece 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.23.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-dHtPz5TxNQyBHOuCYH1XRIeR63ghMP/moaULI++tg8Y="; + hash = "sha256-CezZ0Nse1s1jSwPoaY5Gvpfg3ztM5e8OjvW+WsMMrDM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-10etmf0eQw9nD74dJMpQGAV4cK9FnTWKSrhBT3ZJblc="; + cargoHash = "sha256-oDDQPN2bLHJFMmdKoB+0qbcVOMVnamF23Phzq7eLFJ4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation From 40d0de07e18f3e20199767d775d1770865bd41c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 05:40:29 +0000 Subject: [PATCH 56/94] codux: 15.16.1 -> 15.16.2 --- pkgs/applications/editors/codux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index ac81aea354d4..4f853593e3a8 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.16.1"; + version = "15.16.2"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-vc0lnYGOgb1uKAQlj6xc8mbSfJ6apGNSlyDRX3qHeTM="; + sha256 = "sha256-GKn8T3MEh+MnOqUnxruTqbnfxUcjGh6EAt+6LHTNCiY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From f96d4b3eec23fe2b68431b317f25376ec935237a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 07:30:35 +0000 Subject: [PATCH 57/94] git-mit: 5.12.180 -> 5.12.181 --- pkgs/applications/version-management/git-mit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 6c24ef1d3242..a2e89614b1c9 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.180"; + version = "5.12.181"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-12ZMyKIar5ck4jr7PCmyrnGWd6iv9cCwvTGSLbOCl4o="; + hash = "sha256-XXVLYKicFcYNx33eElqlZcDNZgq4FnbwvYSshZwwHls="; }; - cargoHash = "sha256-n2wsOJrQvMKI1mNYGxntz8hZt5adL3obSdIo4DqF1Fs="; + cargoHash = "sha256-PskRV+LfHjHK0WTwb9Lt2E2R9g+lyyEY7A1vvFLhPdw="; nativeBuildInputs = [ pkg-config ]; From 20de361bc4fa3a4c8bd17d9a7e8d78968593faf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 07:45:08 +0000 Subject: [PATCH 58/94] glooctl: 1.15.17 -> 1.15.18 --- pkgs/applications/networking/cluster/glooctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index e28e9ab49300..d3b7a9e1a003 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.17"; + version = "1.15.18"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-tTsiDlpjQ86CAMzyZhRKPYrEqFm8sCPoeCRzTrmfyx4="; + hash = "sha256-oHwo0I3OFfilLg2tlL0EycTo6BC7LYbzg7dxgfz/XeI="; }; - vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; + vendorHash = "sha256-MrTiZCvYUmdX4sK85jeeQpUupvitH6PfbQ+RfwELaV4="; subPackages = [ "projects/gloo/cli/cmd" ]; From bfa30dc6e824521096d61bdb7c26cbc4d083fc25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:29:44 +0100 Subject: [PATCH 59/94] python311Packages.pyenphase: 1.15.1 -> 1.15.2 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.15.1...v1.15.2 Changelog: https://github.com/pyenphase/pyenphase/blob/1.15.2/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 39916f060caa..55a23f8f8d03 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.15.1"; + version = "1.15.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-XhcCNp7iA7wTd5ldoCO9QC7o3kmL3jIlumjg8Y5mkVQ="; + hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q="; }; postPatch = '' From 0d3c51e1f2714e381d6ae5ea9e7fab6c7d8c1132 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:46:11 +0100 Subject: [PATCH 60/94] python311Packages.pyatv: 0.14.4 -> 0.14.5 Diff: https://github.com/postlund/pyatv/compare/refs/tags/v0.14.4...v0.14.5 Changelog: https://github.com/postlund/pyatv/blob/v0.14.5/CHANGES.md --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 73c843404565..d584b410d7cd 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; + hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw="; }; postPatch = '' From 529ccb0c2f3dea7156485d2c3d4b2819b05c3c5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:47:57 +0100 Subject: [PATCH 61/94] python311Packages.python-roborock: 0.36.2 -> 0.38.0 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.36.2...v0.38.0 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.38.0/CHANGELOG.md --- .../python-modules/python-roborock/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 4df822ea6f22..6bae6be92c1d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.36.2"; - format = "pyproject"; + version = "0.38.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-FyoYAXWdNANxZJ9EKyfRrywKPJmSyt8QRPBlrk9jRIw="; + hash = "sha256-jYESUMhLb5oiM3PWIIIU4dn/waGUnCAaXe0URnIq0C8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry-core==1.7.0" "poetry-core" + --replace "poetry-core==1.7.1" "poetry-core" ''; pythonRelaxDeps = [ From 2d73c0b3b1e29b4991d9cdba8cf6040b511b8488 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:49:29 +0100 Subject: [PATCH 62/94] python311Packages.pyvicare: 2.29.0 -> 2.30.0 Diff: https://github.com/somm15/PyViCare/compare/refs/tags/2.29.0...2.30.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 20d632456ea6..fc0165c464e6 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.29.0"; + version = "2.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-FTvlRCPajRqKLCb5x1Gz/EGZIdMhXow4nP+WlWbjLko="; + hash = "sha256-jcnA5qxS4eq1nZ0uo8NGPoSGTI/JrrH02MJPFxL3hQM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ca6dbf534a0dc3aee0409df3fff67a4921eb58d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 08:54:26 +0000 Subject: [PATCH 63/94] granted: 0.20.3 -> 0.20.5 --- pkgs/tools/admin/granted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 0cffd8700ebb..f2ecbeeb3527 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "granted"; - version = "0.20.3"; + version = "0.20.5"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U8j1IxeBcm9aEJ8LtIxNPdz5mqkSGQ6Ldn7F3HomvGE="; + sha256 = "sha256-s1hPyvpk78MgEK+t5r9iFNHBXDnnNLNoAy0jUB9X8wU="; }; vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o="; From 1bc797b6cf816ae47581e19d741bfe832574ac90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 09:57:25 +0100 Subject: [PATCH 64/94] python311Packages.sendgrid: 6.10.0 -> 6.11.0 Diff: https://github.com/sendgrid/sendgrid-python/compare/refs/tags/6.10.0...6.11.0 Changelog: https://github.com/sendgrid/sendgrid-python/blob/6.11.0/CHANGELOG.md --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 6f3e9914243c..82f336a7fd43 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.10.0"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = "refs/tags/${version}"; - hash = "sha256-/un/m4Br0Ylk00fS/U+QKeXwM1Ix5TFedaPhCyScWvs="; + hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE="; }; propagatedBuildInputs = [ From 7ebd5b81b74e9f9ddb341473bb50059b4123f565 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:57:33 +0100 Subject: [PATCH 65/94] influxdb2-cli: remove unused buildGoPackage --- pkgs/servers/nosql/influxdb2/cli.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index dc7395a7eb7f..10a3278c101b 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -1,5 +1,4 @@ { buildGoModule -, buildGoPackage , fetchFromGitHub , lib }: From 61b08e6536f06f99fe39789c0fcf9aa27253eda1 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:58:43 +0100 Subject: [PATCH 66/94] argo: remove unused buildGoPackage --- pkgs/applications/networking/cluster/argo/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6417ebca951a..27b466f2f261 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGoPackage , fetchFromGitHub , installShellFiles , pkgsBuildBuild From f4ad5cd16c6eff28e1e69ddd09b531641c30add8 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 09:59:56 +0100 Subject: [PATCH 67/94] gotify-server: remove unused buildGoPackage --- pkgs/servers/gotify/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 57004b66b03a..45311b60232e 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,5 +1,4 @@ { lib -, buildGoPackage , fetchFromGitHub , buildGoModule , sqlite From 86c73ad2221c85ee39b26052a4a0dfde962d6ace Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:00:19 +0100 Subject: [PATCH 68/94] python311Packages.stdlibs: 2023.11.2 -> 2023.12.15 Diff: https://github.com/omnilib/stdlibs/compare/refs/tags/v2023.11.2...v2023.12.15 Changelog: https://github.com/omnilib/stdlibs/blob/2023.12.15/CHANGELOG.md --- pkgs/development/python-modules/stdlibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 1b2f80da245d..443dc56aee11 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2023.11.2"; + version = "2023.12.15"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; + hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI="; }; nativeBuildInputs = [ From 678dffb6d8a0fbb83282d6d913c41c47e88ac967 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:00:55 +0100 Subject: [PATCH 69/94] python311Packages.types-awscrt: 0.19.18 -> 0.20.0 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.20.0 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 94810408f0ca..d35cfcc2afe9 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.18"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-T1pZyHwFgraev5lNYU4Pt2zC0KXsPzLk0dscCRhnzdM="; + hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk="; }; nativeBuildInputs = [ From 9fa84672bdb4520093e622cc77db98875e0c2508 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:03:25 +0100 Subject: [PATCH 70/94] python311Packages.whois: 0.99.27 -> 0.99.3 Diff: https://github.com/DannyCork/python-whois/compare/refs/tags/0.99.27...0.99.3 Changelog: https://github.com/DannyCork/python-whois/releases/tag/0.99.3 --- pkgs/development/python-modules/whois/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 184e5fe4c53d..9d317c92323f 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , inetutils , pythonOlder }: buildPythonPackage rec { pname = "whois"; - version = "0.9.27"; - format = "setuptools"; + version = "0.99.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,15 +17,19 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; + hash = "sha256-uKAqpxb72fo0DiaChuJvDizq0z/oFSDHWJuK4vuYIzo="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ # whois is needed inetutils ]; - # tests require network access + # Tests require network access doCheck = false; pythonImportsCheck = [ From 2314f8dfe29af7d16f4204059a1da797a2afbae8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:05:19 +0100 Subject: [PATCH 71/94] python311Packages.types-s3transfer: 0.8.2 -> 0.10.0 --- pkgs/development/python-modules/types-s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 5e87bd726bf7..eb90a554174e 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.8.2"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-LkF1b8+Ud1qZSa+oVkiaxFcDCGCbBJPfvXtNMz60I+Y="; + hash = "sha256-NeSZjCXff4mFrWne3I5IYOivO0O3YV6UDVPADUE73Gk="; }; nativeBuildInputs = [ From 9bbc992a7b0f1b2d9b79f3bc3302339958558666 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Dec 2023 10:05:56 +0100 Subject: [PATCH 72/94] python311Packages.ttls: 1.8.1 -> 1.8.2 Diff: https://github.com/jschlyter/ttls/compare/refs/tags/v1.8.1...v1.8.2 Changelog: https://github.com/jschlyter/ttls/blob/v1.8.2/CHANGES.md --- pkgs/development/python-modules/ttls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index b4e5dcc1ec2e..e2bfe61504af 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ttls"; - version = "1.8.1"; + version = "1.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k="; + hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE="; }; nativeBuildInputs = [ From 181393b02daa12f9c11946c54b1a93847766ba68 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 10:19:31 +0100 Subject: [PATCH 73/94] govendor: remove --- pkgs/development/tools/govendor/default.nix | 22 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/govendor/default.nix diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix deleted file mode 100644 index b24afebb3aa3..000000000000 --- a/pkgs/development/tools/govendor/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "govendor"; - version = "1.0.9"; - - goPackagePath = "github.com/kardianos/govendor"; - - src = fetchFromGitHub { - owner = "kardianos"; - repo = "govendor"; - rev = "v${version}"; - sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; - }; - - meta = with lib; { - homepage = "https://github.com/kardianos/govendor"; - description = "Go vendor tool that works with the standard vendor file"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b9881eea3b5f..51882ab98b68 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -342,6 +342,7 @@ mapAliases ({ google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 + govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d40000bb20e..cfeea6ab1ab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28473,8 +28473,6 @@ with pkgs; govers = callPackage ../development/tools/govers { }; - govendor = callPackage ../development/tools/govendor { }; - goverview = callPackage ../tools/security/goverview { }; go-tools = callPackage ../development/tools/go-tools { }; From a324818224fa385350fafc6fabf2d4b84d91cb95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 10:10:16 +0000 Subject: [PATCH 74/94] gtop: 1.1.3 -> 1.1.5 --- pkgs/tools/system/gtop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gtop/default.nix b/pkgs/tools/system/gtop/default.nix index 327f09a91fb3..5d882740e1a0 100644 --- a/pkgs/tools/system/gtop/default.nix +++ b/pkgs/tools/system/gtop/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "gtop"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aksakalli"; repo = "gtop"; rev = "v${version}"; - hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4="; + hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4="; }; - npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k="; + npmDepsHash = "sha256-QKMLFalaOQjhgVkv8lIDnKyH7+GOqOKIl3zoLwrHIF4="; dontNpmBuild = true; From 662f6cfde25fb6f42089943b0137d25f82b36a6a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:27:37 +0100 Subject: [PATCH 75/94] dep: remove --- pkgs/development/tools/dep/default.nix | 26 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/development/tools/dep/default.nix diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix deleted file mode 100644 index 2c7345d7cc56..000000000000 --- a/pkgs/development/tools/dep/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "dep"; - version = "0.5.4"; - rev = "v${version}"; - - goPackagePath = "github.com/golang/dep"; - subPackages = [ "cmd/dep" ]; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "dep"; - sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; - }; - - ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ]; - - meta = with lib; { - homepage = "https://github.com/golang/dep"; - description = "Go dependency management tool"; - license = licenses.bsd3; - maintainers = with maintainers; [ carlsverre rvolosatovs ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b9881eea3b5f..5b71bee60dd3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -193,6 +193,7 @@ mapAliases ({ deltachat-electron = deltachat-desktop; # added 2021-07-18 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d40000bb20e..c7cce1b0d5df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28399,8 +28399,6 @@ with pkgs; delve = callPackage ../development/tools/delve { }; - dep = callPackage ../development/tools/dep { }; - dep2nix = callPackage ../development/tools/dep2nix { }; easyjson = callPackage ../development/tools/easyjson { }; From 4aa388695e8daba3fdb914442c0063d3800d0ccc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 10:47:40 +0000 Subject: [PATCH 76/94] hcloud: 1.41.0 -> 1.41.1 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 3d5a359ff794..51d3c6f35385 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.41.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-NcEJgC3FtGgv0m7qisCB8vaHvD5Yw/UIHsOFBYiID4c="; + hash = "sha256-ZC71++aC0fUkUG0h5aRxU0FpR1eNruFWAB1e2e5c/Vo="; }; - vendorHash = "sha256-qAgKotc+ypm0pHcbKCgpFmTY5W1b8Oq3XrrP6RVulig="; + vendorHash = "sha256-T407Y4IZlJnrCGSWpuN1wv8Dng2F7++2cMfLGjYC2vM="; ldflags = [ "-s" From 68c90094fcf0161f65b500f6b6cf826887873e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 11:02:23 +0000 Subject: [PATCH 77/94] hsd: 6.0.0 -> 6.1.1 --- pkgs/tools/misc/hsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix index ebbba1de07d8..a1e82076cca4 100644 --- a/pkgs/tools/misc/hsd/default.nix +++ b/pkgs/tools/misc/hsd/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "hsd"; - version = "6.0.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "handshake-org"; repo = "hsd"; rev = "v${version}"; - hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo="; + hash = "sha256-T57kDEQwHIyW7xVXrzjJdUcocST9ks4x3JR8yytH8P4="; }; - npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc="; + npmDepsHash = "sha256-EBrCuRckBg42k6ZUoB25xObv3lULnSPNJ2nO9l/TWvA="; nativeBuildInputs = [ python3 From 17d827c75334fdf35ab9edab6aec3a8ef71649b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 11:13:21 +0000 Subject: [PATCH 78/94] httplib: 0.14.2 -> 0.14.3 --- pkgs/development/libraries/httplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 22c81d57e9df..a65440848bee 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-JfxeXHo34MKtAkMO3pNWiPorh3f8s4SVrdAaydVYdrY="; + hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE="; }; nativeBuildInputs = [ cmake ]; From 85ac3a4bc64fd1f3db41e3f4c2c32d98cfd7cad0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 21 Jul 2023 20:34:39 +0400 Subject: [PATCH 79/94] =?UTF-8?q?nanomq:=200.18.2=20=E2=86=92=200.20.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/mqtt/nanomq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 902b5369df07..eb4bdf325e91 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.18.2"; + version = "0.20.8"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; + hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int"; # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people From ced1438d5beebeeb2649978118e2b4f4e3c7c5f5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 27 Dec 2023 02:13:06 +1300 Subject: [PATCH 80/94] maintainers/teams: remove adisbladis from podman --- .github/CODEOWNERS | 7 ------- maintainers/team-list.nix | 1 - 2 files changed, 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 53bdca8dfbfd..8c25c757fca3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -268,13 +268,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz -# Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @adisbladis -/nixos/modules/virtualisation/cri-o.nix @adisbladis -/nixos/modules/virtualisation/podman @adisbladis -/nixos/tests/cri-o.nix @adisbladis -/nixos/tests/podman @adisbladis - # Docker tools /pkgs/build-support/docker @roberth /nixos/tests/docker-tools* @roberth diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c80055f254fe..6bf83c6907d0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -767,7 +767,6 @@ with lib.maintainers; { podman = { members = [ - adisbladis saschagrunert vdemeester ]; From 1efe097292795338ba11305e0a49b623946b4d9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Dec 2023 00:49:22 +0100 Subject: [PATCH 81/94] python311Packages.usb-devices: 0.4.1 -> 0.4.5 https://github.com/Bluetooth-Devices/usb-devices/blob/v0.4.5/CHANGELOG.md --- pkgs/development/python-modules/usb-devices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix index 8a77fd8597f9..da4abcd5f8f2 100644 --- a/pkgs/development/python-modules/usb-devices/default.nix +++ b/pkgs/development/python-modules/usb-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "usb-devices"; - version = "0.4.1"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9w7YCAEpdptQC0GCnJCEyhZgcHMDIw0alj7q4Y82hmA="; + hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c="; }; postPatch = '' From ad736b8ecd5a59a98dba0a20e62edd9a475415e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Dec 2023 12:50:13 +0100 Subject: [PATCH 82/94] python311Packages.aiopurpleair: 2023.10.0 -> 2023.12.0 https://github.com/bachya/aiopurpleair/releases/tag/2023.12.0 --- pkgs/development/python-modules/aiopurpleair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index 47a27c5742d3..2fd8515b237a 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopurpleair"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-SNgdz3pnPyEH9qIi+aTBbEG6YBIXpwPYZuNJ4dEPLW8="; + hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4="; }; nativeBuildInputs = [ From 4579deae7711c30c2b5d7385ca4115b028df3cf9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Dec 2023 01:09:12 +0100 Subject: [PATCH 83/94] home-assistant: update dependency pins --- pkgs/servers/home-assistant/default.nix | 176 ++++++++++++++++++++---- 1 file changed, 153 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2cc4e666fca4..7a6d0a6e23aa 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , fetchPypi +, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -30,6 +31,16 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { + aioairzone = super.aioairzone.overridePythonAttrs (oldAttrs: rec { + version = "0.6.9"; + src = fetchFromGitHub { + owner = "Noltari"; + repo = "aioairzone"; + rev = "refs/tags/${version}"; + hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; + }; + }); + aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { version = "19.2.1"; src = fetchFromGitHub { @@ -40,16 +51,46 @@ let }; }); - # https://github.com/home-assistant/core/pull/101913 - aiohttp = super.aiohttp.overridePythonAttrs (old: rec { - version = "3.9.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-j8Sah6wmnUUp2kWHHi/7aHTod3nD0OLM2BPAiZIhI50="; + aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec { + version = "22.10.1"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = "aiogithubapi"; + rev = "refs/tags/${version}"; + hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik="; + }; + propagatedBuildInputs = with self; [ + aiohttp + async-timeout + backoff + ]; + }); + + aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec { + version = "2023.05.5"; + src = fetchFromGitHub { + owner = "bachya"; + repo = "aionotion"; + rev = "refs/tags/${version}"; + hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; + }; + patches = [ + (fetchpatch { + # clean up build dependencies; https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83 + url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; + hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; + }) + ]; + }); + + aiopvapi = super.aiopvapi.overridePythonAttrs (oldAttrs: rec { + version = "2.0.4"; + src = fetchFromGitHub { + owner = "sander76"; + repo = "aio-powerview-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M="; }; - patches = []; - doCheck = false; }); aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { @@ -60,14 +101,19 @@ let rev = "refs/tags/${version}"; hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \ + '"poetry-core"' + ''; }); - aioresponses = super.aioresponses.overridePythonAttrs (oldAttrs: rec { - pname = "aioresponses"; - version = "0.7.6"; + amberelectric = super.amberelectric.overridePythonAttrs (oldAttrs: rec { + version = "1.0.4"; src = fetchPypi { - inherit pname version; - hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE="; + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; }; }); @@ -123,6 +169,7 @@ let aenum aiohttp pydantic + requests ]; doCheck = false; # requires asynctest, which does not work on python 3.11 }); @@ -146,6 +193,16 @@ let }; }); + mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { + version = "11.0.0"; + src = fetchFromGitHub { + owner = "py-mine"; + repo = "mcstatus"; + rev = "refs/tags/v${version}"; + hash = "sha256-1jPIsFEJ17kjtCBiX4IvSf2FxYw9DkH3MrrJ85N71tc="; + }; + }); + notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { version = "0.1.5"; format = "setuptools"; @@ -168,6 +225,32 @@ let doCheck = false; # no tests }); + openai = super.openai.overridePythonAttrs (oldAttrs: rec { + version = "0.28.1"; + src = fetchFromGitHub { + owner = "openai"; + repo = "openai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + }; + nativeBuildInputs = with self; [ + setuptools + ]; + propagatedBuildInputs = with self; [ + aiohttp + requests + tqdm + ]; + disabledTestPaths = [ + # Requires a real API key + "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" + # openai: command not found + "openai/tests/test_file_cli.py" + "openai/tests/test_long_examples_validator.py" + ]; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -189,15 +272,6 @@ let }; }); - psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { - version = "5.9.6"; - src = fetchPypi { - pname = "psutil"; - inherit version; - hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; - }; - }); - py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { version = "2.1.4"; src = fetchFromGitHub { @@ -228,6 +302,16 @@ let }; }); + pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec { + version = "7.6.0"; + src = fetchFromGitHub { + owner = "jabesq"; + repo = "pyatmo"; + rev = "refs/tags/v${version}"; + hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68="; + }; + }); + pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { version = "0.0.18"; src = fetchFromGitHub { @@ -250,6 +334,16 @@ let }; }); + pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec { + version = "2023.11.0"; + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -259,6 +353,22 @@ let }; }); + pyprusalink = super.pyprusalink.overridePythonAttrs (oldAttrs: rec { + version = "1.1.0"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pyprusalink"; + rev = "refs/tags/${version}"; + hash = "sha256-XRtbb7kceiqi8pioTWStRo0drCtQfy1t62jCMihlIec="; + }; + patches = [ + (fetchpatch { + url = "https://github.com/home-assistant-libs/pyprusalink/commit/bc3a2f4a00979e7daaf783cdc1f1862087e8d4df.patch"; + hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; + }) + ]; + }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { @@ -298,6 +408,26 @@ let }; }); + screenlogicpy = super.screenlogicpy.overridePythonAttrs (oldAttrs: rec { + version = "0.9.4"; + src = fetchFromGitHub { + owner = "dieselrabbit"; + repo = "screenlogicpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg="; + }; + }); + + tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec { + version = "0.3.19"; + src = fetchFromGitHub { + owner = "jrester"; + repo = "tesla_powerwall"; + rev = "refs/tags/v${version}"; + hash = "sha256-ClrMgPAMBtDMfD6hCJIN1u4mp75QW+c3re28v3FreQg="; + }; + }); + versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec { version = "2.2.0"; src = fetchPypi { From be0c33cafc4c2a5287a3ed366fd880b75ead9c3e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:44:58 +0100 Subject: [PATCH 84/94] luaPackages.image-nvim: init at 1.2 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 32530d3ea3cd..6a70792bf02c 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -21,6 +21,7 @@ fzy,,,,,,mrcjkb gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, haskell-tools.nvim,,,,,, http,,,,0.3-0,,vcunat +image.nvim,,,,,,teto inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index cac6c55e9354..78edc3683afd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -623,6 +623,30 @@ buildLuarocksPackage { }; }) {}; +image-nvim = callPackage( +{ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, magick }: +buildLuarocksPackage { + pname = "image.nvim"; + version = "1.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec"; + sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508"; + }).outPath; + src = fetchzip { + url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip"; + sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua magick ]; + + meta = { + homepage = "https://github.com/3rd/image.nvim"; + description = "🖼️ Bringing images to Neovim."; + license.fullName = "MIT"; + }; +}) {}; + inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; From 4db68fa4fdf0cd3d6b521f2562c681ebb91bec6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:04:10 +0000 Subject: [PATCH 85/94] kaniko: 1.19.1 -> 1.19.2 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 832d98a589f8..2127ae5b3135 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-iSiVRbq6ohAXAWhHUUFUG/6rjlsmgYmy9VAzx76JIt0="; + hash = "sha256-YxOuZb1R9Orm3RTnZyzi54VzQbbmE+lO+4osvG97pwE="; }; vendorHash = null; From 3a22fbfdd26dd39702028d388d6da18b73fbd3ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:49:38 +0000 Subject: [PATCH 86/94] kubefirst: 2.3.6 -> 2.3.7 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 06d774c80bd4..c7c2b795179c 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-PFI7sBLcDIxes7fJnT1sgJbRITyoYptpupfOd6lisjs="; + hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g="; }; vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI="; From c6518b3b0b20b8b27427c1c964b38110eaadaa80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:55:46 +0000 Subject: [PATCH 87/94] kubevpn: 2.1.3 -> 2.2.0 --- pkgs/applications/networking/cluster/kubevpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 643f5daf9a81..36c377b75c54 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-KHOqVVB1QjhhPUopeZd/A/htanmIoLCNhtnWrqyEN2A="; + sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk="; }; vendorHash = null; From 0392a075113e55b636018f45d9c9e5e8981e5156 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 26 Dec 2023 15:57:49 +0100 Subject: [PATCH 88/94] nixos/lib/make-disk-image: Create build products metadata For hydra to expose built images for direct download, listing the relevant files in nix-support/hydra-build-products is required. --- nixos/lib/make-disk-image.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index e5d82f4de7c9..1a33abd01ea1 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -522,11 +522,16 @@ let format' = format; in let chmod 0644 $efiVars ''; + createHydraBuildProducts = '' + mkdir -p $out/nix-support + echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products + ''; + buildImage = pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; - postVM = moveOrConvertImage + postVM; + postVM = moveOrConvertImage + createHydraBuildProducts + postVM; QEMU_OPTS = concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" ++ lib.optionals touchEFIVars [ @@ -616,5 +621,5 @@ let format' = format; in let in if onlyNixStore then pkgs.runCommand name {} - (prepareImage + moveOrConvertImage + postVM) + (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM) else buildImage From 436509cb3113e3d2c73dcbe7ce8293d5e20a6131 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Tue, 26 Dec 2023 12:10:28 -0300 Subject: [PATCH 89/94] discord-stable: 0.0.38 -> 0.0.39 --- .../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 4eb13cb3b943..7d5b8aaa4e9d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.38"; + stable = "0.0.39"; ptb = "0.0.61"; canary = "0.0.224"; development = "0.0.1"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo="; + hash = "sha256-KZLKBzd9hdOQkp7mN0rUZ8TbMvH2G0/AfwHPLAlDpug="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From fc38d28b26904c294b33b64cdce0866e778b6bc8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Nov 2023 14:30:28 +0100 Subject: [PATCH 90/94] qemu: 8.1.3 -> 8.2.0 --- pkgs/applications/virtualization/qemu/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1dc000c3f41e..1cdd9f07337a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , pixman, vde2, alsa-lib, texinfo, flex -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool +, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson +, sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet @@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; + hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja + pkg-config flex bison dtc meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme From 98a73e1caf11c5c750cea73d9d42b25463dd70b9 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Tue, 26 Dec 2023 17:17:30 +0100 Subject: [PATCH 91/94] orca-slicer: init at 1.8.1 (#275638) * orca-slicer: init at 1.8.1 * Update pkgs/applications/misc/bambu-studio/orca-slicer.nix Co-authored-by: Sandro * Update pkgs/applications/misc/bambu-studio/orca-slicer.nix Co-authored-by: Sandro --------- Co-authored-by: Sandro --- .../misc/bambu-studio/default.nix | 1 + .../misc/bambu-studio/orca-slicer.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/bambu-studio/orca-slicer.nix diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 77a6375b1979..69a27c06d671 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -168,5 +168,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; maintainers = with maintainers; [ zhaofengli ]; mainProgram = "bambu-studio"; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix new file mode 100644 index 000000000000..17896cf5fa20 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +let + orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.8.1"; + pname = "orca-slicer"; + + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3aIVi7Wsit4vpFrGdqe7DUEC6HieWAXCdAADVtB5HKc="; + }; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + }); +in +orca-slicer diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40b3ef828de0..0dc617d58cf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35461,6 +35461,8 @@ with pkgs; }; }; + orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {}; + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; From fd41fdd34af55fe739863b233a2db94a0ebe14a4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 14:54:12 +0100 Subject: [PATCH 92/94] sox: fix build with enableOpusfile = false pkg-config seems to now always be required. --- pkgs/applications/misc/audio/sox/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 60e8a3fe029c..1b8e0541346a 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive - ] ++ lib.optionals enableOpusfile [ - # configure.ac uses pkg-config only to locate libopusfile pkg-config ]; From c31565f9b35e02d5f73300a4edeac9c9b2029bdf Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 20 Dec 2023 14:57:55 +0100 Subject: [PATCH 93/94] pkgsStatic.libao: fix build --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc617d58cf7..be69350565a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22429,7 +22429,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or stdenv.isLinux; + usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; From 7b7b4967d43eb281bc995f1debcc20911fa222e8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 00:16:39 +0100 Subject: [PATCH 94/94] lib/licenses: add missing spdxids --- lib/licenses.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index baf92007123d..8dc01e560746 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -104,6 +104,7 @@ in mkLicense lset) ({ }; arphicpl = { + spdxId = "Arphic-1999"; fullName = "Arphic Public License"; url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; }; @@ -236,6 +237,7 @@ in mkLicense lset) ({ }; cal10 = { + spdxId = "CAL-1.0"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; url = "https://opensource.org/licenses/CAL-1.0"; }; @@ -429,6 +431,7 @@ in mkLicense lset) ({ }; elastic20 = { + spdxId = "Elastic-2.0"; fullName = "Elastic License 2.0"; url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt"; free = false; @@ -598,6 +601,7 @@ in mkLicense lset) ({ # Intel's license, seems free iasl = { + spdxId = "Intel-ACPI"; fullName = "iASL"; url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; @@ -609,7 +613,7 @@ in mkLicense lset) ({ imagemagick = { fullName = "ImageMagick License"; - spdxId = "imagemagick"; + spdxId = "ImageMagick"; }; imlib2 = { @@ -803,6 +807,7 @@ in mkLicense lset) ({ }; miros = { + spdxId = "MirOS"; fullName = "MirOS License"; url = "https://opensource.org/licenses/MirOS"; }; @@ -1138,6 +1143,7 @@ in mkLicense lset) ({ }; upl = { + spdxId = "UPL-1.0"; fullName = "Universal Permissive License"; url = "https://oss.oracle.com/licenses/upl/"; }; @@ -1194,6 +1200,7 @@ in mkLicense lset) ({ }; xfig = { + spdxId = "Xfig"; fullName = "xfig"; url = "https://mcj.sourceforge.net/authors.html#xfig"; };