From 532c089362dad27783e3ed315d173f74bc648501 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 14 Jul 2023 15:34:33 +0800 Subject: [PATCH 01/31] jamesdsp: 2.5.1 -> 2.6.0 --- pkgs/applications/audio/jamesdsp/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index ef0385d5114e..24aec647c5d4 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, mkDerivation , fetchFromGitHub , pipewire , pulseaudio @@ -20,18 +19,16 @@ assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable one and only one of pulseaudio or pipewire support"; -let - pluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]); -in - mkDerivation rec { +stdenv.mkDerivation rec { pname = "jamesdsp"; - version = "2.5.1"; + version = "2.6.0"; + src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = version; - hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4="; + hash = "sha256-pogBpmGlqQnkXMdp5HbMYISjwMJalSPvEV9MDHj8aec="; }; nativeBuildInputs = [ @@ -54,7 +51,9 @@ in gst_all_1.gstreamer ]; - qtWrapperArgs = lib.optionals usePulseaudio [ "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${pluginPath}" ]; + preFixup = lib.optionals usePulseaudio '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ]; From 3b4473b04d9ef01bc4dc8f885efeb34bbfbed850 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 15:29:16 +0000 Subject: [PATCH 02/31] memos: 0.13.1 -> 0.13.2 --- pkgs/servers/memos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/memos/default.nix b/pkgs/servers/memos/default.nix index 1c2a17fd638c..dd7366e8a64a 100644 --- a/pkgs/servers/memos/default.nix +++ b/pkgs/servers/memos/default.nix @@ -1,12 +1,12 @@ { fetchFromGitHub, buildGoModule, jq, buildNpmPackage, lib, makeWrapper }: let - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${version}"; - sha256 = "VUY81ir7cPtuHodJhkSz3bmnoIeQH20kbg+duDcjfwM="; + sha256 = "lcOZg5mlFPp04ZCm5GDhQfSwE2ahSmGhmdAw+pygK0A="; }; frontend = buildNpmPackage { @@ -32,7 +32,7 @@ buildGoModule rec { # check will unable to access network in sandbox doCheck = false; - vendorSha256 = "sha256-OztHMpOj7Ewmxu+pzPmzmtHBDe1sbzj805In37mFjzU="; + vendorSha256 = "sha256-UM/xeRvfvlq+jGzWpc3EU5GJ6Dt7RmTbSt9h3da6f8w="; # Inject frontend assets into go embed prePatch = '' From fe2a3e5e353bf87f514c24fc6e0ac2a35ef99f37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jul 2023 19:42:39 +0000 Subject: [PATCH 03/31] minimacy: 1.0.0 -> 1.1.0 --- pkgs/development/compilers/minimacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/development/compilers/minimacy/default.nix index 0442e6a040f8..7e14f9a91de4 100644 --- a/pkgs/development/compilers/minimacy/default.nix +++ b/pkgs/development/compilers/minimacy/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "minimacy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ambermind"; repo = pname; rev = version; - hash = "sha256-cpxKZ77Noe/2et3ROAQwG2LJxrlsEfi+bmUj+QaPkk0="; + hash = "sha256-VqcMdlptoMJEsPTny/E6ly7/xmHKcljIsSeZDzaA+ig="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From c020eb255c84892e3c219359142c658658bf72c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jul 2023 22:12:49 +0000 Subject: [PATCH 04/31] moon: 1.10.0 -> 1.10.1 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 2e487efef6f9..34de18d47163 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-QwU7gzQUS+w2kSIhvTxTksJrNiVjaQ4M1CCfyc+3V7A="; + hash = "sha256-JLCxG4iWm+yJ9WUqQxOeBnOLAugeTrM3bl79zKYBs6w="; }; - cargoHash = "sha256-pVwarRhS+PGOeIV1jjWjOdXUc8fuEGRocd/hT0Y1yKQ="; + cargoHash = "sha256-4PHc0BkK/QXrafOoeUS0XicKb/JDdJkLhbDAziYgZh4="; env = { RUSTFLAGS = "-C strip=symbols"; From 38f7d6a98aa2891aad0ba265e13764f3432cab06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jul 2023 22:32:55 +0000 Subject: [PATCH 05/31] opengrok: 1.12.11 -> 1.12.12 --- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 12ddea4d3315..7c899e614ed9 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.11"; + version = "1.12.12"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-cJfBv1I8zw9Qtn9APb7+JbSahrzYYI8dkFM8fMnDVl0="; + hash = "sha256-0ppkexmVchHL+lCfB+xtLcDCZ24Sv0Opr5RNLILKg2M="; }; nativeBuildInputs = [ makeWrapper ]; From d93aa8ce7921f707bfb47ea0a316e2c04a0e077a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jul 2023 23:38:28 +0000 Subject: [PATCH 06/31] bookstack: 23.06.1 -> 23.06.2 --- pkgs/servers/web-apps/bookstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 8a48ec4fc7a5..cd78e6baa557 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.06.1"; + version = "23.06.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "0947rnapk7xv10a12fzymjlvj8j7drjlqjm61fckshif9c1q5r6j"; + sha256 = "sha256-1Ap/imfzoezT0bcyyBrYOLlVJWqah8TZDKcAjqMm4VQ="; }; meta = with lib; { From 58d4cfb4fa142c6a03f855cdcb728219ce4092f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 16 Jul 2023 15:58:19 +0800 Subject: [PATCH 07/31] vscodium: 1.80.0.23188 -> 1.80.1.23194 https://github.com/VSCodium/vscodium/releases/tag/1.80.1.23194 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index def268c8fa58..dabd413632db 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0y9gs7w330l8x21l2qr5ki46aqmz22v17kmaisj5z5lgyfqyyf97"; - x86_64-darwin = "1i1c0axlipp12b3y3sl6liq4cs7ybjflm8jnrwf9wrrvq7d911bn"; - aarch64-linux = "03894hcjsvskp3s1gl1cmnvy7s7x8iz4z6pz5wk7aayw0j03f3zh"; - aarch64-darwin = "0n59dpc18abq42y1sb5wdrbv9n8pwnyhlcsrjx41r9ykmfk8cvih"; - armv7l-linux = "0iiw5rdw2gsr5y45i00ri858ylm6q4jdk3vh7g0f0vv4csprx5c3"; + x86_64-linux = "1sfy6rcrayx661m96pyh96caycf6banjs5ksib48qsl6hxp76ks0"; + x86_64-darwin = "0xkzvi7y45rxwnjxplg6wfs4994n6vdfqk6q7wjr96fgiymbpg5y"; + aarch64-linux = "09qlmqnvq1bcal56kingn6wkzg83dhxkkj2p3gqlikz6s5klqrql"; + aarch64-darwin = "17giphsqkxdfrz68vxkic84q4hn94plgr1lh72vy0q5pz5bbcpy2"; + armv7l-linux = "1cp739i5002j2kmdh3rhh7p88gyvjrfwcr430g5dvhdp7mgkbwn1"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.80.0.23188"; + version = "1.80.1.23194"; pname = "vscodium"; executableName = "codium"; From c253a1f717ffee624a2a7a64755b561425661889 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 16 Jul 2023 19:57:29 +0300 Subject: [PATCH 08/31] python3Packages.hid-parser: init at 0.0.3 --- .../python-modules/hid-parser/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/hid-parser/default.nix diff --git a/pkgs/development/python-modules/hid-parser/default.nix b/pkgs/development/python-modules/hid-parser/default.nix new file mode 100644 index 000000000000..56aeb503b49c --- /dev/null +++ b/pkgs/development/python-modules/hid-parser/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytestCheckHook +, hypothesis +}: + +buildPythonPackage rec { + pname = "hid-parser"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-zbm+h+ieDmd1K0uH+9B8EWtYScxqYJXVpY9bXdBivA4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ "hid_parser" ]; + + meta = with lib; { + description = "Typed pure Python library to parse HID report descriptors"; + homepage = "https://github.com/usb-tools/python-hid-parser"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 828108c74c8f..99d86fcc7b05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4692,6 +4692,8 @@ self: super: with self; { inherit (pkgs) udev libusb1; }; + hid-parser = callPackage ../development/python-modules/hid-parser { }; + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; hijri-converter = callPackage ../development/python-modules/hijri-converter { }; From 65cd6dc03e441ec29d5b495e42f357cd51f367e2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 16 Jul 2023 16:59:51 +0300 Subject: [PATCH 09/31] solaar: 1.1.8 -> 1.1.9 Diff: https://github.com/pwr-Solaar/Solaar/compare/refs/tags/1.1.8...1.1.9 --- pkgs/applications/misc/solaar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index de787ca669d0..be0d29ee507d 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-2LD1vMmQvibcnAgBwjfSBJysTnUGptGzPHfi/7tZ0hg="; + hash = "sha256-MdPZ9uLQYwgZ6xXWinzFg5A2gJ3ihTS9CbEmXnaNEkI="; }; outputs = [ "out" "udev" ]; @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { pyudev pyyaml xlib + hid-parser ]; # the -cli symlink is just to maintain compabilility with older versions where From 3e74a1e2cb197083542982e729435c0d343c45db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 15 Jul 2023 17:23:34 +0000 Subject: [PATCH 10/31] python310Packages.nvidia-ml-py: 11.525.131 -> 12.535.77 --- pkgs/development/python-modules/nvidia-ml-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index f4c085d02c56..8894de41d561 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "11.525.131"; + version = "12.535.77"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-K39NrSXEv0mrnQqaPW4lq9FouRtd6OK23uRwN1bBuuU="; + hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; }; patches = [ From c0e69cd146bb741505733a29bef4c35ff19b888b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 16 Jul 2023 21:26:05 +0200 Subject: [PATCH 11/31] nvitop: relax version for dependency python3Packages.nvidia-ml-py --- pkgs/tools/system/nvitop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index 8e3f3766ce4b..494d6a200aa2 100644 --- a/pkgs/tools/system/nvitop/default.nix +++ b/pkgs/tools/system/nvitop/default.nix @@ -14,6 +14,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-+Yq/UHjrR2nT+TLXEDbNP2yMy4+LZGgbMrDLmWcrxqg="; }; + pythonRelaxDeps = [ "nvidia-ml-py" ]; + + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; + propagatedBuildInputs = with python3Packages; [ cachetools psutil From 14a355b0a3f44fc0e69c9db459446a0b9e395b2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jul 2023 20:40:37 +0000 Subject: [PATCH 12/31] ipv6calc: 4.0.2 -> 4.1.0 --- pkgs/tools/networking/ipv6calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index ad52d9929318..9bc655943e0a 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ipv6calc"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "pbiering"; repo = pname; rev = version; - sha256 = "sha256-p/er/Ehyu7PqmikMIKPQBQ0/F81d8iiKdmLXLz+8pus="; + sha256 = "sha256-zpV3RpFPYICntNLVTC4FpkrxJ7nDh/KEzmNpg0ORWZQ="; }; buildInputs = [ From 5187d5731a465b1388893b98eccde58d2acf0945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 00:20:35 +0000 Subject: [PATCH 13/31] system76-keyboard-configurator: 1.3.7 -> 1.3.8 --- .../misc/system76-keyboard-configurator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1002fb13ae89..fe39f3afb7b6 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-73D24g3jvPPregR/bLSpWzSGQRlhjp2/0kHuDDSqSBY="; + sha256 = "sha256-fjuX/fOQMdJvqpZCfyUkYS/NRPFymAvMrD3/+ntwXGc="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-AGWrMMJ5FihIVc7HvzpsL1Vmi/fvuFowX+ijgwGRJCo="; + cargoHash = "sha256-Cav2W8iUq1GYUOnXb/ECwwKQ8uzQRW/7r5EzV7IS2Nc="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; From 3a10a26e3ed94b71f4544e798dfd5b94f48de5c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 03:11:16 +0000 Subject: [PATCH 14/31] questdb: 7.2 -> 7.2.1 --- pkgs/servers/nosql/questdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index a76dac6681c4..995053da9b18 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "questdb"; - version = "7.2"; + version = "7.2.1"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz"; - sha256 = "sha256-37pmNeN02sHt2Cpyjk3FpBFscBw2Zqm4nNmOlyiX6H0="; + sha256 = "sha256-PtVY1cZl/2RQ3YaEBVXpAoZrMRQbv7d1BDFdTwXI+Uk="; }; nativeBuildInputs = [ makeWrapper ]; From 81bd52e5b9c55f260819344c347db6b9717ecc61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 05:02:37 +0000 Subject: [PATCH 15/31] temporal: 1.21.1 -> 1.21.2 --- pkgs/applications/networking/cluster/temporal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 72a8f8c23ff2..de33dd062626 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-fa8UQk3E1XhMqd7E9VRYOv6RLQW8smSUw48FeYBqmSU="; + hash = "sha256-4iosKxGjH2O2y2wkAs/tuCH+SXTj6FhrPqS9qgL+vTQ="; }; vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; From 1af806231f4adc4cbede9981f60f631693f1a5b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 05:13:18 +0000 Subject: [PATCH 16/31] pdfhummus: 4.5.8 -> 4.5.9 --- pkgs/development/libraries/pdfhummus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index 61c4d7b134c2..3264469340bb 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.8"; + version = "4.5.9"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-aL/icjoP0SQIWXiR0pCrSevkQYDdzPfZGx4xjmPr0AU="; + hash = "sha256-2Q49+T1RH0DaQ8u0ypbvFdcPrLoO1G+XpVuYn9/4jRk="; }; nativeBuildInputs = [ From a01b86cfada1e89d43307ef5868fed5187450051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 06:30:37 +0000 Subject: [PATCH 17/31] pcm: 202302 -> 202307 --- pkgs/os-specific/linux/pcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index d9b93eafdb0e..fc5902e719ba 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202302"; + version = "202307"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-69wdA6/bRN5gYl02GgA8mXnXxVZlHIGkhtC8vFKZVcA="; + hash = "sha256-GeLiJT5AwsMWw0ErdwD6C1jtUZjUxGw5GRSvenu3W18="; }; nativeBuildInputs = [ cmake ]; From 76f5020eb9c26e8d3ab6a946386d24b05136b89b Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 17 Jul 2023 08:56:33 +0200 Subject: [PATCH 18/31] rke2: 1.27.2+rke2r1 -> 1.27.3+rke2r1 (#243712) * rke2: 1.27.2+rke2r1 -> 1.27.3+rke2r1 * rke2: fix embedded versions Use the provided scripts to build the project, in order to minimize the differences between the Nix and the upstream distribution. Among other things, our build wasn't embedding the docker image tags in the binary, and that resulted in the binary trying to load "latest" images, failing in the process. * rke2: add zimbatm as a maintainer --- .../networking/cluster/rke2/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index c9ce55b0b19e..66b1324a6b0e 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -2,26 +2,38 @@ buildGoModule rec { pname = "rke2"; - version = "1.27.2+rke2r1"; + version = "1.27.3+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-jzm2tYwsomLifAfmb0w1+/FpCgtOk+O8DRmy1OgzfmE="; + hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU="; }; - vendorHash = "sha256-VVc1IgeR+LWEexTyIXtCcF6TtdDzsgP4U4kqArIKdU4="; + vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro="; - subPackages = [ "." ]; + postPatch = '' + # Patch the build scripts so they work in the Nix build environment. + patchShebangs ./scripts - ldflags = [ "-s" "-w" "-X github.com/k3s-io/k3s/pkg/version.Version=v${version}" ]; + # Disable the static build as it breaks. + sed -e 's/STATIC_FLAGS=.*/STATIC_FLAGS=/g' -i scripts/build-binary + ''; + + buildPhase = '' + DRONE_TAG="v${version}" ./scripts/build-binary + ''; + + installPhase = '' + install -D ./bin/rke2 $out/bin/rke2 + ''; meta = with lib; { homepage = "https://github.com/rancher/rke2"; description = "RKE2, also known as RKE Government, is Rancher's next-generation Kubernetes distribution."; changelog = "https://github.com/rancher/rke2/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ zygot ]; + maintainers = with maintainers; [ zimbatm zygot ]; }; } From 7a09421c37be3a51e3cd09a9f43069d7d8a0e2b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:00:28 +0000 Subject: [PATCH 19/31] kubepug: 1.5.0 -> 1.5.1 --- pkgs/development/tools/kubepug/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index 1e3c63983b04..7cab20594516 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - hash = "sha256-/VkJSZdiU93+GnLxIPPE2ewlm52tp7Wqry0TvjyeqhI="; + hash = "sha256-HjnkGEzTobtILqML5xcjpYVtg6a5PqMKYyaGTYrqEDo="; }; - vendorHash = "sha256-fPyXOMJ0rRssGzOca54A5l8ZWixOC58Xtb3SOYSibCo="; + vendorHash = "sha256-w2WwJa8qaXmgFwZJo2r2TowcTehgQY0nGY4u1UROaxM="; ldflags = [ "-s" From d2e92fc0885abe0216ade960834957381ff3a04e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:14:04 +0000 Subject: [PATCH 20/31] mackerel-agent: 0.77.0 -> 0.77.1 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index f95c4555f630..ba061dbd93c8 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.77.0"; + version = "0.77.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OlrV1mcqDE4Ck7iBg0SrPza+ZGVwqIIYjUPo3XVkJmc="; + sha256 = "sha256-BPLAAl4V3LN0I+ReiQX3hJcgdZZ6/7lLfBdwl9HzTHc="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-3HWb+fXJO8dn9TrtC8NzagO3I0uwsPINXqJhWZhbDhk="; + vendorHash = "sha256-K+T6DxOvVotvTZE8WhWZ0v/T6UqJ5N6xxsdJrr8DQt4="; subPackages = [ "." ]; From e40f81daee7eafdf57760f5a05ff2f13bade727b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:24:04 +0000 Subject: [PATCH 21/31] civo: 1.0.59 -> 1.0.60 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index ccc5777286fb..732871c0ea50 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.59"; + version = "1.0.60"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b0KoSPPwxW/r1LHooZWWyZBuP9v4Xl5zK0GxYubTeCI="; + sha256 = "sha256-f6r82rZ5PMjBLdeuz1vbyWuCMy73NAYt4+0w7fICTQ0="; }; - vendorHash = "sha256-8lIVFlz9Zt9+GDVc0MxrwdyC/0G4q5LU2IwSiFu9Bqg="; + vendorHash = "sha256-ER7QcDlts/Dt8FimDu87IE3hihMRNGHpyuvAXRI3QR8="; nativeBuildInputs = [ installShellFiles ]; From a2d01ab246ad5c88e6fbf6e9df18b08c659a1015 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:24:29 +0000 Subject: [PATCH 22/31] treesheets: unstable-2023-07-15 -> unstable-2023-07-16 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 4fcd3ebe0be5..8e44c1bd3b74 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-07-15"; + version = "unstable-2023-07-16"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "65855787063b62ca048aa1cb9b5e6e42a009a150"; - sha256 = "Hb+fP5hL2x9BH16jRPMjGDz8EelI1n4Scl3tWheyeh8="; + rev = "95709ed796bc1df558aa7ba3728b6eb9b6385fea"; + sha256 = "wNGVvIQkAburH37GumSZX09V++MVCNvXee5Gw7YQHtc="; }; nativeBuildInputs = [ From 5cd933887c4acaf0b5b1b13c808d960de72c3395 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:34:00 +0000 Subject: [PATCH 23/31] kubernetes-controller-tools: 0.12.0 -> 0.12.1 --- .../development/tools/kubernetes-controller-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index c3aefd37da5d..bdafbc3ed8cf 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2nRsaHCqZUF3M1Z0e//IjhYELHRxR6fSCfkWyC1fog4="; + sha256 = "sha256-OqBTlzHqnwu6GaNFS6cdcOoBNdSGus/piR4tXRfzpn0="; }; patches = [ ./version.patch ]; From d74cf634b7f4db1475294adf149f86b9d5c0f389 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 17 Jul 2023 09:36:47 +0200 Subject: [PATCH 24/31] ugrep: 3.12.2 -> 3.12.3 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 6bbe4fac2a31..9ec13678f2d1 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "3.12.2"; + version = "3.12.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-h5BMqv8gv+e7pBSyQva5lmH83lxSnu86BF3KwziFdps="; + hash = "sha256-KP8SpeHGOdIKnA+xavdkoj3XRU572RZtFH0DaW28m+k="; }; buildInputs = [ From 7e3c16938a31ebe5a51b0c9a9a05b6cc59e3686e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 07:53:28 +0000 Subject: [PATCH 25/31] cmark-gfm: 0.29.0.gfm.11 -> 0.29.0.gfm.12 --- pkgs/development/libraries/cmark-gfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index 4cf7dec674f3..8c24853e4b07 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.11"; + version = "0.29.0.gfm.12"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-2jkMJcfcOH5qYP13qS5Hutbyhhzq9WlqlkthmQoJoCM="; + sha256 = "sha256-C/aqoifxKWj+VXdsnNTHuAR/cFns0kGpSLstZ/6XPqU="; }; nativeBuildInputs = [ cmake ]; From be25742af91a797efcefcf8283a06630e9dbb1ad Mon Sep 17 00:00:00 2001 From: meppu Date: Mon, 17 Jul 2023 08:40:36 +0300 Subject: [PATCH 26/31] gleam: 0.30.0 -> 0.30.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5dd4a2e4a49d..fad9601333dd 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-74QYiT67Xn2nBZx5R3f3qGSI2pDD09bEuDy98tf0Bsg="; + hash = "sha256-x/Wb65UIVzuIBwbJmTNVpCzNBu/0bIDL5UD98Bo8n4Q="; }; nativeBuildInputs = [ git pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoHash = "sha256-42N9bmoLh6XUwpJTG5ZJ4iepYdW91baF9OqsBKgp/WI="; + cargoHash = "sha256-IKCrIATDALS4Bvl26dzVlHtj90U+XR3n7+Lu772sy1I="; meta = with lib; { description = "A statically typed language for the Erlang VM"; From d77d48074020b16884211af0b47ef55c7c7da146 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 17 Jul 2023 16:37:43 +0800 Subject: [PATCH 27/31] v2ray-domain-list-community: 20230707041058 -> 20230717050659 Diff: https://github.com/v2fly/domain-list-community/compare/20230707041058...20230717050659 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 24d51100887d..a7232c08ef3c 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230707041058"; + version = "20230717050659"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-Utfi5eoFukpnB/JP9bsiVYBvh3REPt4CZUW+BRCiCpo="; + hash = "sha256-HmP5V02TUL48vlQ9bFRePV5l1J0ECszVzQ48UENDvuQ="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { From b8e27780849944891f34def632cc25b4ab70addb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 10:27:20 +0000 Subject: [PATCH 28/31] steampipe: 0.20.8 -> 0.20.9 --- pkgs/tools/misc/steampipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 0c43ac74ec07..f4b3910b9fa5 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.20.8"; + version = "0.20.9"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-neHcLO64Ik61P6R6rFL3kuKi9qRQ64f1xEqUrgUKeCg="; + sha256 = "sha256-kPgyWXPHGfvZ+ne6tumy6NGn1Tl4J+toZ983YaMFi6k="; }; vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; From d914f16b33f3019f0c1dbe91330586388c74b20f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 10:57:09 +0000 Subject: [PATCH 29/31] scaleway-cli: 2.17.0 -> 2.18.0 --- pkgs/tools/admin/scaleway-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index c63ef78fa204..bba79f7cb5bc 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-bTpJ3/78GdqiQZOMyYmaX4d66MSIVbUt5mf4ckU3XtA="; + sha256 = "sha256-ytnYrvvfO8L+TI1x0ydDBnh5lurWL1avCPVAlK/cOuI="; }; - vendorHash = "sha256-5V4RxKFVx3Z+TLD9yPqdWXbJvMOau/yHCjy59mSFm90="; + vendorHash = "sha256-UWWnT6ft/eGCn/6T1IDQSdfgv8htxDL2cFl4reAx51k="; ldflags = [ "-w" From 5e73f0c1c96cd09f1961d0d102d12c2641d0ac62 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 17 Jul 2023 11:13:14 +0100 Subject: [PATCH 30/31] nixos/lxd: fix default ui package --- nixos/modules/virtualisation/lxd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 22e336c895f9..e22ba9a0ae2c 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -91,7 +91,7 @@ in { Enables the (experimental) LXD UI. ''); - package = mkPackageOption pkgs.lxd "ui" { }; + package = mkPackageOption pkgs.lxd-unwrapped "ui" { }; }; }; }; From e75ee0e29ca2da0bbbe1d210244e829286a04ba1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 11:12:45 +0000 Subject: [PATCH 31/31] clash-geoip: 20230612 -> 20230712 --- pkgs/data/misc/clash-geoip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index f057531790b9..8faeef9d0045 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230612"; + version = "20230712"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-uD+UzMjpQvuNMcIxm4iHLnJwhxXstE3W+0xCuf9j/i8="; + sha256 = "sha256-QXxY/WruYY09LL+OEKhd/EUb+GOI49KFnG75mbwMWoU="; }; dontUnpack = true;