From 28ac9c2cf1d4a85f84a3bcf90b621b2e7dc97794 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Tue, 23 May 2023 11:30:02 +0200 Subject: [PATCH 01/39] adds mangoiv to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 047fe343043f..7ec3578c3eb2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9609,6 +9609,12 @@ githubId = 346094; name = "Michael Alyn Miller"; }; + mangoiv = { + email = "contact@mangoiv.com"; + github = "mangoiv"; + githubId = 40720523; + name = "MangoIV"; + }; manojkarthick = { email = "smanojkarthick@gmail.com"; github = "manojkarthick"; From f5c317d5ac5e1c992c84e8956994e63f78997854 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Tue, 23 May 2023 11:30:19 +0200 Subject: [PATCH 02/39] bkt: init at version 0.6.1 - packages https://github.com/dimo414/bkt - release notes for version 0.6.1 can be found at https://github.com/dimo414/bkt/releases/tag/0.6.1 --- pkgs/tools/misc/bkt/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/bkt/default.nix diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/tools/misc/bkt/default.nix new file mode 100644 index 000000000000..e359ab2fd332 --- /dev/null +++ b/pkgs/tools/misc/bkt/default.nix @@ -0,0 +1,25 @@ +{ rustPlatform +, fetchFromGitHub +, lib +}: rustPlatform.buildRustPackage rec { + + pname = "bkt"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "dimo414"; + repo = pname; + rev = version; + sha256 = "sha256-NgNXuTpI1EzgmxKRsqzxTOlQi75BHCcbjFnouhnfDDM="; + }; + + cargoSha256 = "sha256-PvcKviyXtiHQCHgJLGR2Mr+mPpTd06eKWQ5h6eGdl40="; + + meta = { + description = "A subprocess caching utility"; + homepage = "https://github.com/dimo414/bkt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mangoiv ]; + mainProgram = "bkt"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2246de4b9d11..780a4e7e23b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3120,6 +3120,8 @@ with pkgs; bklk = callPackage ../applications/misc/bklk { }; + bkt = callPackage ../tools/misc/bkt { }; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; From e29436ee4df21ca8386a3fa3f350093c3181b45a Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 26 May 2023 09:39:48 +0200 Subject: [PATCH 03/39] python3Packages.uptime-kuma-api: 0.13.0 -> 1.0.1 --- pkgs/development/python-modules/uptime-kuma-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index 48bbbf84aa11..f9de280dad46 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "0.13.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-MoHE6Y7x1F1l70tuCHNIPt+vpqfJ00EUIMHnE4476Co="; + hash = "sha256-6Cwo71pgwBk5B6MaFFs9XlbocJLL/s4+7m7Gi13ddlM="; }; propagatedBuildInputs = [ From 3579ce8c72be41faf0dff2282d8274d3c1143eb2 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Fri, 26 May 2023 13:18:24 +0300 Subject: [PATCH 04/39] python3Packages.fenics: fixed tests for FIAT --- pkgs/development/python-modules/fenics/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix index 277d28997e6e..edb726a0997e 100644 --- a/pkgs/development/python-modules/fenics/default.nix +++ b/pkgs/development/python-modules/fenics/default.nix @@ -73,6 +73,12 @@ let rm test/unit/test_quadrature.py rm test/unit/test_reference_element.py rm test/unit/test_fiat.py + + # Fix `np.float` deprecation in Numpy 1.20 + grep -lr 'np.float(' test/ | while read -r fn; do + substituteInPlace "$fn" \ + --replace "np.float(" "np.float64(" + done ''; checkPhase = '' runHook preCheck From 461711cb4b0ba9c99ee83048f8fbb05ed06a2a1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:20:42 +0200 Subject: [PATCH 05/39] python311Packages.acquire: 3.5 -> 3.6 Diff: https://github.com/fox-it/acquire/compare/refs/tags/3.5...3.6 Changelog: https://github.com/fox-it/acquire/releases/tag/3.6 --- pkgs/development/python-modules/acquire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 581bd0a0111b..b96250df8eee 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.5"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-F0kKydFDL2XafK7A66qn3Ad/mGZU8x3UKtXtKpxHZqU="; + hash = "sha256-oH+uxu61+d6qEQmT7joxwlyfpv7mF8ug6OzHmyUa95Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b9fce90144fb5f16b152d8e99342bfdc5e430ce2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:25:28 +0200 Subject: [PATCH 06/39] python311Packages.adafruit-pureio: 1.1.10 -> 1.1.11 Changelog: https://github.com/adafruit/Adafruit_Python_PureIO/releases/tag/1.1.11 --- pkgs/development/python-modules/adafruit-pureio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-pureio/default.nix b/pkgs/development/python-modules/adafruit-pureio/default.nix index 6d32b9530523..82d39fa23aba 100644 --- a/pkgs/development/python-modules/adafruit-pureio/default.nix +++ b/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "adafruit-pureio"; - version = "1.1.10"; - format = "setuptools"; + version = "1.1.11"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit_PureIO"; inherit version; - hash = "sha256-EgaIN1PAlmMJ5tAtqXBnbpvHtQO7Sib3NuAXOfVqZLk="; + hash = "sha256-xM+7NlcxlC0fEJKhFvR9/a4K7xjFsn8QcrWCStXqjHw="; }; nativeBuildInputs = [ From 8f84341c90f3b20f506e54cf45a6e106379d0741 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 19 May 2023 15:58:26 -0400 Subject: [PATCH 07/39] pinentry-mac: fix build with Darwin sandbox enabled --- pkgs/tools/security/pinentry/mac.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index daf2d82d66b0..d824a816dc90 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { chmod -R u+w macosx/*.nib ''; + # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process. + sandboxProfile = '' + (allow process-exec (literal "/usr/libexec/PlistBuddy")) + ''; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; From fa10919cd027b5535fda6c5a7269bdd863e209ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 21:26:47 +0200 Subject: [PATCH 08/39] python3Packages.uptime-kuma-api: update disabled --- pkgs/development/python-modules/uptime-kuma-api/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index f9de280dad46..613d9f75e84f 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "uptime_kuma_api"; From 45b47f0c99f1211522b6aa77f607ae0ab7734b08 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 26 May 2023 22:30:53 +0200 Subject: [PATCH 09/39] coreboot-utils: support subset on aarch64-linux --- pkgs/tools/misc/coreboot-utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 029880de2cb6..252d3e6d4f04 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -54,8 +54,8 @@ let intelmetool = generic { pname = "intelmetool"; meta.description = "Dump interesting things about Management Engine"; - buildInputs = [ pciutils zlib ]; meta.platforms = [ "x86_64-linux" "i686-linux" ]; + buildInputs = [ pciutils zlib ]; }; cbfstool = generic { pname = "cbfstool"; @@ -68,6 +68,7 @@ let superiotool = generic { pname = "superiotool"; meta.description = "User-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O"; + meta.platforms = [ "x86_64-linux" "i686-linux" ]; buildInputs = [ pciutils zlib ]; }; ectool = generic { @@ -79,8 +80,8 @@ let inteltool = generic { pname = "inteltool"; meta.description = "Provides information about Intel CPU/chipset hardware configuration (register contents, MSRs, etc)"; - buildInputs = [ pciutils zlib ]; meta.platforms = [ "x86_64-linux" "i686-linux" ]; + buildInputs = [ pciutils zlib ]; }; amdfwtool = generic { pname = "amdfwtool"; @@ -119,7 +120,7 @@ in utils // { coreboot-utils = (buildEnv { name = "coreboot-utils-${version}"; - paths = lib.attrValues utils; + paths = lib.filter (lib.meta.availableOn stdenv.hostPlatform) (lib.attrValues utils); postBuild = "rm -rf $out/sbin"; }) // { inherit version; From 9aa6989b6454585650d7376f74151cf0dad1b11c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 3 May 2022 22:08:43 +0200 Subject: [PATCH 10/39] avrdude: always build documentation on Linux Make texlive a build-time dependency to always build the docs on Linux. --- pkgs/development/embedded/avrdude/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index fd54383f9efb..dfd0f027d6b7 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,9 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline -# docSupport is a big dependency, disabled by default -, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null -}: - -assert docSupport -> texLive != null && texinfo != null && texi2html != null; +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf +, libftdi1, readline +# documentation building is broken on darwin +, docSupport ? (!stdenv.isDarwin), texlive, texinfo, texi2html, unixtools }: stdenv.mkDerivation rec { pname = "avrdude"; @@ -16,10 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-pGjOefWnf11kG/zFGwYGet1OjAhKsULNGgh6vqvIQ7c="; }; - nativeBuildInputs = [ cmake bison flex ]; + nativeBuildInputs = [ cmake bison flex ] ++ lib.optionals docSupport [ + unixtools.more + texlive.combined.scheme-medium + texinfo + texi2html + ]; - buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ] - ++ lib.optionals docSupport [ texLive texinfo texi2html ]; + buildInputs = [ libusb-compat-0_1 libelf libftdi1 readline ]; cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" From 4ac9973f4fae165b5937cec2e2bd131acf1754bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 00:28:26 +0000 Subject: [PATCH 11/39] frugal: 3.16.19 -> 3.16.21 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index c6c548414af3..91d90044b5a0 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.19"; + version = "3.16.21"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PEWjZeFIEfnAGVsv+oyF4R08FI+LzKBWlrlBmiXhJCQ="; + sha256 = "sha256-iNj3E5JtvOHAiEC+81KnAb32TWi+Zq8Av24oLm01ty4="; }; subPackages = [ "." ]; - vendorHash = "sha256-OnPQZk+VpOx97mSNRx9lGtC03OXGGz9JwUSZYX0Ofkc="; + vendorHash = "sha256-29LwvekhevOn/1zrtQEZWqeQMEAN2xPxSRzas/5EhVM="; meta = with lib; { description = "Thrift improved"; From 517da6a94abf564ee0251cb5e0516dae55f6fc34 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 26 May 2023 22:18:04 -0400 Subject: [PATCH 12/39] cargo-binstall: 0.23.0 -> 0.23.1 Diff: https://github.com/cargo-bins/cargo-binstall/compare/v0.23.0...v0.23.1 Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v0.23.1 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 6c972a68a563..dabfff611afb 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-PB7EZMJ9wXVneLTc8wiZVxeyE/XybuwUvcVkN6q04lo="; + hash = "sha256-Dpo/J6FTW95rODWeIqD+8YnN4dt5yhLPxoezA1CTM4A="; }; - cargoHash = "sha256-SxQSzY31m3eTDO38jRpvzwmV9d6puIZ3DwBlC2Zb4b0="; + cargoHash = "sha256-Nc/kdrLsAooM41pwlkZ3zWsLvFlnxHG/2ZQhPsEyPkI="; nativeBuildInputs = [ pkg-config From 6e634db53ba225739e2a7e5056d067d8fe775a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 02:31:08 +0000 Subject: [PATCH 13/39] python310Packages.pyatv: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/pyatv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 0a4dc46f3686..b8f5e1c6d7a9 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "postlund"; repo = pname; - rev = "v${version}"; - hash = "sha256-HWr+Pu/tMuCDFC2mV3R/Wqe0PfVw/DDgEIYBRnfYx/I="; + rev = "refs/tags/v${version}"; + hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q="; }; postPatch = '' From 8c3d981fe8c727cc6f9716cffbd363db3476fd7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:00:37 +0000 Subject: [PATCH 14/39] automatic-timezoned: 1.0.91 -> 1.0.92 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 9e21d9defd55..5c5649a0b8e1 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.91"; + version = "1.0.92"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kXpOJPlsfmpTAUkgNsFb7OZWCAok7i/ku+3u2XHwQV8="; + sha256 = "sha256-4axtrwCmtc33pInOsb1W3VIfXmUP59j0mFByCl//1z0="; }; - cargoHash = "sha256-5XGrFgv9XLEQGfzkUpg7o6Czb4Ha/45nNZ9OCkZAmzo="; + cargoHash = "sha256-V/6SaSk10LLuyPuf3fnyqF2rQlZwG9FRGcQ+3Ao4xQs="; meta = with lib; { description = "Automatically update system timezone based on location"; From c256f09dac1039e1b83c3f0e7246f2487108b83f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:05:34 +0000 Subject: [PATCH 15/39] mediamtx: 0.23.0 -> 0.23.3 --- pkgs/servers/mediamtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 2e55b14b367a..1c1952f96610 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "0.23.0"; + version = "0.23.3"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-wqTES0E8HMBxMAmOiewSne1p9/ZI/Ikf1cr34lTqjwI="; + hash = "sha256-z9fqR2iK7HOpWNFnrIkNzy0peY6v9QLOyUYbVXp1aNU="; }; - vendorHash = "sha256-C7j5jvRB4/GS0A05YZX8u62xvjevcKHpJFxuhzUX1+M="; + vendorHash = "sha256-az2jHhd3YzI7phRRXBWRcAsISgipPN20SRncsfu58fM="; # Tests need docker doCheck = false; From 4f604fcf65d90e44c7e0357a566ef9a238146e21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:18:50 +0000 Subject: [PATCH 16/39] cnspec: 8.10.0 -> 8.11.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index b1615fc8e936..d77e501559bf 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.10.0"; + version = "8.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-xgDHpLnbTAC0OL7Z5JQsOWlarIHqvr7xrDBg6hlWRRw="; + hash = "sha256-ypDosK+vA7EEQsfZh9PUZrXY0uO+mPI1GC6RS80gP1o="; }; proxyVendor = true; - vendorHash = "sha256-LlLnkJc+bIRG1s6AHBYL6r5guYXPDo0moQwMSmHX3Zg="; + vendorHash = "sha256-Iyi1OoJEHHeCS+W922e+3o+pru/UhTUWwkkY2nurRGY="; subPackages = [ "apps/cnspec" From 165431b546e3339049c9a75b14aef7816367418d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 03:23:23 +0000 Subject: [PATCH 17/39] okteto: 2.15.2 -> 2.15.3 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index b76ed98c3052..3e30b14f9b44 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.15.2"; + version = "2.15.3"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-PxCVBi/GMzyTs9GfIAAPHNbinexw4guSO8ZsyZIOmr4="; + hash = "sha256-BzyKmM5Yp9zdNonkDZoJBAmy8jSDwt85Wr9/1nbD7V8="; }; vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE="; From 768241916fbe3452ccb335e29447b1397b2e6e87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:09:09 +0000 Subject: [PATCH 18/39] kubeshark: 40.2 -> 40.5 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 7643748f158b..808d0208989a 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "40.2"; + version = "40.5"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-E39Hr39fPiRKElploh2EEE35x0vnyAf2eWHr8Ifx0l0="; + sha256 = "sha256-Xm8Tx1m3k+Vz5GlSIGJw8W2PVkZav9U5A52X9HUJFno="; }; vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU="; From 568f92cbff307adeefb31cead4c8a5cadfdf797a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:36:26 +0000 Subject: [PATCH 19/39] python310Packages.subarulink: 0.7.6 -> 0.7.6-1 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 42af75533dd1..a73ad1bc1c6f 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.6"; + version = "0.7.6-1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-D2nwzj7uYL/v5Ew2+LfJBLH904Htam4Fa3Gs6t8Hbyo="; + hash = "sha256-/VaGiOnPyTHSwkxlQtwyIZohD3QK897kapmM3S8bHtM="; }; propagatedBuildInputs = [ From 769483f12a86a78adc27a04d4cb95ef5cdb80a1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 04:54:49 +0000 Subject: [PATCH 20/39] stm32cubemx: 6.8.0 -> 6.8.1 --- pkgs/development/embedded/stm32/stm32cubemx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 28019c99fddf..ffd922c20dfe 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.0"; + version = "6.8.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-jJeJTg2cCO6fqQ4vFq2dXsfsWmlN5ncZJWMoekJXkLQ="; + sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; stripRoot = false; }; From bee7cb59046bbb5ff9d4ad21ffbd97c56fd56862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 05:09:39 +0000 Subject: [PATCH 21/39] powerstat: 0.03.01 -> 0.03.03 --- pkgs/os-specific/linux/powerstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index bee805c57bc6..901a522fe8fa 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.03.01"; + version = "0.03.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-+3b6yH5CuFdtjjTmW2mwuvNyhO8/8N7vv6st+ttztBQ="; + hash = "sha256-D8VwczXHUHQ8p03IgYW3t8hOIGHKp0n1c7FpAUWua74="; }; installFlags = [ From decb072d37813bb3e37246530a0aa7656829c70f Mon Sep 17 00:00:00 2001 From: SnO2WMaN Date: Sat, 27 May 2023 14:28:12 +0900 Subject: [PATCH 22/39] killport: 0.8.0 -> 0.9.0 --- pkgs/tools/misc/killport/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix index 4a13e4232293..44484c17ef58 100644 --- a/pkgs/tools/misc/killport/default.nix +++ b/pkgs/tools/misc/killport/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "killport"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-ip7Ndy4i4P6n20COfSL/EtG1Y+xoab8Gox4gcNHH1/o="; + hash = "sha256-aGnjLgDn86OUFQGj7K7+DUSGJuNEIL52yXJz/Mt5DT0="; }; - cargoHash = "sha256-M4riyvGueCQDKOj+lgYPm2lZ8UjCp1y/SyG692vZbS4="; + cargoHash = "sha256-Z3+hqssm5g7rl3XCnrmjuPhsG8E0Yc2Qg8/mjGlnaT4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From eedd40fc42a278f71f0cff2a5be729166e40e46e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 05:42:44 +0000 Subject: [PATCH 23/39] fio: 3.34 -> 3.35 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 49707d1530b2..00c5b6c68fad 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.34"; + version = "3.35"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-+csIerzwYOmXfmykYI0DHzbJf4iUCkEy1f7SFmAiuv4="; + sha256 = "sha256-8LMpgayxBebHb0MXYmjlqqtndSiL42/yEQpgamxt9kI="; }; buildInputs = [ python3 zlib ] From 6e14cc0d55bf1fbd6ca750ad8214b9325b6ec8d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 06:07:18 +0000 Subject: [PATCH 24/39] vtm: 0.9.9i -> 0.9.9k --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 75c57fefd494..9fc677cb2508 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9i"; + version = "0.9.9k"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-pkso0Bpb+0Zua3MIXXEbaJDl/oENa51157mXTJXJC/A="; + sha256 = "sha256-vmgjonMjhVEfsujWUuX+50NPAzgIfJADp8qjnDmfV1E="; }; nativeBuildInputs = [ cmake ]; From d24e607c22632356ffef69178092c43e13064b1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 07:32:44 +0000 Subject: [PATCH 25/39] python310Packages.miniaudio: 1.57 -> 1.58 --- pkgs/development/python-modules/miniaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index f82f91f303a8..ded724b095ac 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.57"; + version = "1.58"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-jAGJEXNDclcGHnoDYMjQXz5ZS9U9pmIWEHzgYKp49/o="; + hash = "sha256-uIjQerxMU4hMCJtpqYPt2kicql3s7jyho9r6/kRHTbk="; }; postPatch = '' From 949a550d0b949947c8b2f75f32368175ea6a8e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 07:35:25 +0000 Subject: [PATCH 26/39] python310Packages.nbsphinx: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 398303b63694..5b19602f92d0 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Wbv7e8Z2pmR4Bfs8qDSQM4rn+WwWdKnl5wfwVcJyxZ0="; + hash = "sha256-VA239AZjR/I9BlDEro59hTNMaa33SeAwr2TBLplv+I4="; }; propagatedBuildInputs = [ From e1e943023f942cd06f34c0df68c6fd8a0cd87af6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 May 2023 18:02:10 +1000 Subject: [PATCH 27/39] fzf: 0.41.0 -> 0.41.1 Diff: https://github.com/junegunn/fzf/compare/0.41.0...0.41.1 Changelog: https://github.com/junegunn/fzf/blob/0.41.1/CHANGELOG.md --- pkgs/tools/misc/fzf/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d2dc331ff030..37b967667434 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -10,6 +10,7 @@ , glibcLocales , testers , fzf +, fetchpatch }: let @@ -24,15 +25,23 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-NUaGuRfXtt/kY4u5uxM30Blg+ngkcvS2/2rcGP/WNtE="; + hash = "sha256-YnWc+yStyoZoCKxEMhQC6Z4FZ/OVRaVsAJPtAzGiJVk="; }; + patches = [ + (fetchpatch { + name = "update-test-case.patch"; + url = "https://github.com/junegunn/fzf/commit/448d7e0c5a717128d499f6a09a978b7addd1d925.patch"; + hash = "sha256-54UYW8x78ZcjPwDWmGLVLxw2E910wme2TkBN7YAr1L8="; + }) + ]; + vendorHash = "sha256-O6OjBbrVAxDQd27ar2mmFkU1XyVM2C8SJWJ54rgaf2s="; outputs = [ "out" "man" ]; From 91dc753211caa5dd717878ac775e5e6bd3d0f03b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:13:31 +0000 Subject: [PATCH 28/39] zsh-nix-shell: 0.6.0 -> 0.7.0 --- pkgs/shells/zsh/zsh-nix-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index 211c18edf7b3..8ae87386c259 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zsh-nix-shell"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; rev = "v${version}"; - sha256 = "sha256-B0mdmIqefbm5H8wSG1h41c/J4shA186OyqvivmSK42Q="; + sha256 = "sha256-oQpYKBt0gmOSBgay2HgbXiDoZo5FoUKwyHSlUrOAP5E="; }; strictDeps = true; From d6b2c1c0df99cc813b4a02cb21ac71f85ce0f558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:22:38 +0000 Subject: [PATCH 29/39] supabase-cli: 1.63.1 -> 1.64.2 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index b6214f16b045..54d3149b1d48 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.63.1"; + version = "1.64.2"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wFWILST5PYvs1bXWK44yiRWVidwZcczLVdtEI418+F8="; + sha256 = "sha256-xqH4twh65nOcB+IqqYjGRdbCYC7MZjAVKeIJARGTG3U="; }; - vendorSha256 = "sha256-fRocOWnjYocTUXnTOvzTosdgKlQGfgyPLVN7FVGnW2o="; + vendorSha256 = "sha256-sQ4lJKQaSUWlet3dEnD8bKLYtkEtdnLuGHVfqCTdFyg="; ldflags = [ "-s" From 60bcbec0719c32d56db5c1817c93d1cbcf092d0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 09:14:39 +0000 Subject: [PATCH 30/39] shopware-cli: 0.1.71 -> 0.1.73 --- pkgs/tools/misc/shopware-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/shopware-cli/default.nix b/pkgs/tools/misc/shopware-cli/default.nix index dbaea41066e3..59f8af85e9dd 100644 --- a/pkgs/tools/misc/shopware-cli/default.nix +++ b/pkgs/tools/misc/shopware-cli/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.1.71"; + version = "0.1.73"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-prn/22H2fVXJF/4YjrjyMoyD8JbhayXdPX06ea6VnFE="; + hash = "sha256-yjWLWTM6ybrNUMTMHQ3oHXTEp8MGI/qH7Y+gft5RXY8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; - vendorSha256 = "sha256-yQM0nRbrKvopIl78YKIF7mc5jLQ/02vVKTzE+rO6/QU="; + vendorHash = "sha256-eaD2vdiAmP2/cMtc1wN0qaMBRvrEckGBf0p5MI1T4gI="; postInstall = '' export HOME="$(mktemp -d)" From 12be07b11c114e5c08d1231cb76709093f78c5a4 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Sat, 27 May 2023 11:18:34 +0200 Subject: [PATCH 31/39] teleport: mark as broken on <64 bit platforms --- pkgs/servers/teleport/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 80a419cd7064..8ff61ce862b6 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -160,5 +160,8 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ arianvp justinas sigma tomberek freezeboy ]; platforms = platforms.unix; + # go-libfido2 is broken on platforms with less than 64-bit because it defines an array + # which occupies more than 31 bits of address space. + broken = stdenv.hostPlatform.parsed.cpu.bits < 64; }; } From 3908d1362fcf36e6df37beb619cd1f2beead17d6 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sat, 27 May 2023 11:31:29 +0200 Subject: [PATCH 32/39] dotnet-sdk_7: 7.0.203 -> 7.0.302 --- .../compilers/dotnet/versions/7.0.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index c28987f141a1..8dd267be55ac 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -47,23 +47,23 @@ }; sdk_7_0 = buildNetSdk { - version = "7.0.203"; + version = "7.0.302"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ebfd0bf8-79bd-480a-9e81-0b217463738d/9adc6bf0614ce02670101e278a2d8555/dotnet-sdk-7.0.203-linux-x64.tar.gz"; - sha512 = "ed1ae7cd88591ec52e1515c4a25d9a832eca29e8a0889549fea35a320e6e356e3806a17289f71fc0b04c36b006ae74446c53771d976c170fcbe5977ac7db1cb6"; + url = "https://download.visualstudio.microsoft.com/download/pr/351400ef-f2e6-4ee7-9d1b-4c246231a065/9f7826270fb36ada1bdb9e14bc8b5123/dotnet-sdk-7.0.302-linux-x64.tar.gz"; + sha512 = "9387bd804ed980ba1bc33093598ddbafa3a761e07d28916c94442cc329533d78a03bfc59d3066a1a861244302414e7e658b4e721b5bc825f623f8f908e748b7e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6cd2eaa7-4c06-4168-b90b-ee2d6bb40b10/4a8387eb07e17d262bfb9965f6d34462/dotnet-sdk-7.0.203-linux-arm64.tar.gz"; - sha512 = "f5e1b5a63b51af664b852435fc5631ff3fbeafbfac9f34c025da016218b0e6fb9a24e816035a44f4b4a16f28bc696821b1aa6f181966754318bc45cde7f439bf"; + url = "https://download.visualstudio.microsoft.com/download/pr/142603ad-0df5-4aef-bdc2-87b6140c90ed/2cce467e6c954d01024942b8370aaf70/dotnet-sdk-7.0.302-linux-arm64.tar.gz"; + sha512 = "7f6372faa348c84560e3f1139605dc08d888b14b98c400724f628b52156fe31c20a50dc2a2f8673e29239d04ef06744e16c6f8bd8eb1756f99274c73eda74621"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/de3e24bd-f677-4d9e-9717-859ce6659b5d/80c21bb06ca64d9408d11a32f858c7c6/dotnet-sdk-7.0.203-osx-x64.tar.gz"; - sha512 = "a69ec597bc5b0a59ccfc9cc63c4883037eb9293600e98ea420c879242ec6c3fae6a81a3a08bf7d5d2ab93f750debffb224ad5628c9abd53bc44cfcb02ca77136"; + url = "https://download.visualstudio.microsoft.com/download/pr/34ce4803-1444-48a2-9955-e2a9b9061b03/e18c978b55226240ca037cf8b1770064/dotnet-sdk-7.0.302-osx-x64.tar.gz"; + sha512 = "cafb8e2839a8c91f58e8bda519d27f622a7a4062aea9247d743d64a3de3acad6ddd4f80d011fd416a3e3622f0ece8cd2e70e65f48331ae321b5ff23d282787b3"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ad0ad533-6970-4099-a0c6-ee1d089a381d/2d7ea966c6d032111389b7686ccc0d9a/dotnet-sdk-7.0.203-osx-arm64.tar.gz"; - sha512 = "e41de76f6be00de587cedaed2b0c6e2c2871b2ebf03c89375b4c69cd3fdd14df0dc49b5fe83970868a25d14aa19deafbfe66ee6790383b77f7da3d8dea939664"; + url = "https://download.visualstudio.microsoft.com/download/pr/fc7ed56d-3afe-4aa6-81bb-b4b0f5df56b5/d199f43f7421c6677ba25544b442b6b7/dotnet-sdk-7.0.302-osx-arm64.tar.gz"; + sha512 = "28cc5fcc9651fc75f9b2f864672e5fdaead28feb262696c305d00a71c828004e46f0b9b4a6bb6b21b9ea475b1c601e1724df302eea4d63f604e4fcdc9c97dd63"; }; }; packages = { fetchNuGet }: [ From 70dea8c226a68a6b0bdd1b8709e835ebc2b34289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 09:32:47 +0000 Subject: [PATCH 33/39] werf: 1.2.235 -> 1.2.238 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index dcbc02d62820..acc4cf4324b4 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.235"; + version = "1.2.238"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-fEo/hHVV+xv60VNe9AqjrP4JGzGXcM8yr/KjhRfOAhk="; + hash = "sha256-cMjekqIZnZMcDEEdeBs/jkPh/mqgox4gV+LkqP3IR5g="; }; - vendorHash = "sha256-1r32uT98I/pd6lxCb3bKy6uxJJodsaslwy9wynE4Pmg="; + vendorHash = "sha256-67J7AaS0kUu42BqFWMsC+ZXL2DnrBWwhz/oGmyMvpyo="; proxyVendor = true; From 92d15cf5f0d4a975cbc3ee8f28767937fe1be217 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 27 May 2023 12:54:39 +0300 Subject: [PATCH 34/39] vtm: extend platforms --- pkgs/tools/misc/vtm/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 9fc677cb2508..35e4e5b67418 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; license = licenses.mit; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; maintainers = with maintainers; [ ahuzik ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373e4f383ed3..f3d55f4c87ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13559,7 +13559,9 @@ with pkgs; SDL = SDL_sixel; }; - vtm = callPackage ../tools/misc/vtm { }; + vtm = callPackage ../tools/misc/vtm { + stdenv = if stdenv.isDarwin then clang16Stdenv else stdenv; + }; witness = callPackage ../tools/security/witness { }; From 15fd3a1603cd76678bd4c70bb25767e886e07ddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 08:50:01 +0000 Subject: [PATCH 35/39] libcpr: 1.10.3 -> 1.10.4 --- pkgs/development/libraries/libcpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/development/libraries/libcpr/default.nix index 7eb882f16389..9652b4a67f96 100644 --- a/pkgs/development/libraries/libcpr/default.nix +++ b/pkgs/development/libraries/libcpr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, curl }: -let version = "1.10.3"; in +let version = "1.10.4"; in stdenv.mkDerivation { pname = "libcpr"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-NueZPBiICrh8GXXdCqNtVaB7PfqwtQ0WolvRij8SYbE="; + hash = "sha256-8qRNlZgBB71t/FSFPnxFhr02OuD2erLVeoc6wAx3LKk="; }; nativeBuildInputs = [ cmake ]; From 3eefbfb3a989e6fa82e7f7b0230e2961b8464b8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 10:05:20 +0000 Subject: [PATCH 36/39] ls-lint: 1.11.2 -> 2.0.0 --- pkgs/development/tools/ls-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix index e42f7f50122a..550931d9d1eb 100644 --- a/pkgs/development/tools/ls-lint/default.nix +++ b/pkgs/development/tools/ls-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ls-lint"; - version = "1.11.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "loeffel-io"; repo = "ls-lint"; rev = "v${version}"; - sha256 = "sha256-mt1SvRHtAA0lChZ//8XIQGDPg1l1EOMkPIAe8YKhMSs="; + sha256 = "sha256-eEP/l3vdObdxUYIp8eSSCn3W0ypcmykbwQTDP083MVE="; }; - vendorSha256 = "sha256-OEwN9kj1npI+H7DY+e3tl5TIY/qr4y2CgAV5fwNA9l4="; + vendorHash = "sha256-nSHhU6z3ItCKBZy8ENBcAkXqSVo3DU6hAyezQczKShM="; meta = with lib; { description = "An extremely fast file and directory name linter"; From 736cd76b3e65a03a7bc516ae4bb75c6c73a05612 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 May 2023 10:16:08 +0000 Subject: [PATCH 37/39] ginkgo: 2.9.4 -> 2.9.5 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index bd0e3e651cc3..cad04204916b 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-groih0LxtmB8k4/vfw2Ivtzm+SOyQqK1o7XASNplFvQ="; + sha256 = "sha256-1Hb8pCvPs/L5UU280XwwEOnQ1CjJjgw0+GdCbtLkIpg="; }; - vendorHash = "sha256-Rm5fpiTZMo/B9+yIpmEniJVRfKgHjpFIagELEjgFYwc="; + vendorHash = "sha256-IxyPRUS7aqkfZ+hjtuopCd95dgiTgVdg1thSiTBZArg="; # integration tests expect more file changes # types tests are missing CodeLocation From 015722217e0cdf61410170c116554fabdbfc9215 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 May 2023 12:41:44 +0200 Subject: [PATCH 38/39] libb64: Fix i686-linux build failure https://hydra.nixos.org/build/221506062 --- pkgs/development/libraries/libb64/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 88bc059892cf..38f16fa5bb1f 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; }) + # Fix i686-linux build failure. + (fetchpatch { + name = "elif.patch"; + url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch"; + hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc"; + }) + (fetchpatch { + name = "size_t.patch"; + url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; + hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; From ae9ce7f2e301ba8647c897c2e8914b789081b445 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 27 May 2023 12:45:04 +0200 Subject: [PATCH 39/39] orchis-theme: 2023-04-08 -> 2023-05-27 https://github.com/vinceliuice/Orchis-theme/releases/tag/2023-05-27 --- pkgs/data/themes/orchis-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index de628bbe74a7..2d07ac3ae380 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-08"; + version = "2023-05-27"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-/X4Hr2M/7pf6JxTUvPoG5VkQd+rweEPeTNe9glSLh78="; + hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; }; nativeBuildInputs = [ gtk3 sassc ];