From 6cacd45bb6f880ef68c36648f9235ef9c07c30ab Mon Sep 17 00:00:00 2001 From: Redhawk18 Date: Wed, 22 May 2024 13:02:09 -0400 Subject: [PATCH 01/80] maintainers: add redhawk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1409fb743964..a591f15401e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17103,6 +17103,12 @@ githubId = 1922770; name = "Tim Engler"; }; + redhawk = { + email = "redhawk76767676@gmail.com"; + github = "Redhawk18"; + githubId = 77415970; + name = "Redhawk"; + }; redvers = { email = "red@infect.me"; github = "redvers"; From b8873a8a8038db832d5c8620bac1a7f7e773cce6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Jun 2024 15:20:23 +0200 Subject: [PATCH 02/80] top-level/aliases: Clean up outdated Nix aliases - Nix 2.6 was removed on 2022-12-28: 172347745ffb457e47cf5386f2ae3ff6678c2b02 - Nix 2.4 and 2.5 were removed on 2022-07-14: b2eea05b06baa2886039d61485d37c338ad3d578 - `nixVersions.unstable` throws but it does not mention the alias: 2b4e18f3d4a7b80af21b640c0970f83b34efceff --- pkgs/top-level/aliases.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 721d077e047c..816cd1cf4e95 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -887,11 +887,8 @@ mapAliases ({ nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 - nixUnstable = nixVersions.unstable; # Added 2022-01-26 + nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; - nix_2_4 = nixVersions.nix_2_4; - nix_2_5 = nixVersions.nix_2_5; - nix_2_6 = nixVersions.nix_2_6; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 From a9116cef2b1027d25389951333e847ef6d842ea1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 2 Jun 2024 15:23:04 -0400 Subject: [PATCH 03/80] lib.systems.riscv-multiplatform: set linux-kernel.preferBuiltin Like aarch64, riscv platforms require many drivers to be builtin to boot. --- lib/systems/platforms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d2e8f77bec03..c8951534ae90 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -535,6 +535,7 @@ rec { name = "riscv-multiplatform"; target = "Image"; autoModules = true; + preferBuiltin = true; baseConfig = "defconfig"; DTB = true; extraConfig = '' From 50a6be5f8b0d316f44d9a10282cc10be1d6fa977 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 2 Jun 2024 15:33:13 -0400 Subject: [PATCH 04/80] lib.systems.riscv-multiplatform: drop linux-kernel.extraConfig SERIAL_OF_PLATFORM has been y in riscv defconfig since 2018 Reference: https://github.com/torvalds/linux/commit/33c57c0d3c67f51f491a9d27108f7e97adc03d96 --- lib/systems/platforms.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index c8951534ae90..403ffc028f0b 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -538,9 +538,6 @@ rec { preferBuiltin = true; baseConfig = "defconfig"; DTB = true; - extraConfig = '' - SERIAL_OF_PLATFORM y - ''; }; }; From 57aff44e39e7eb86d45241ff3caa8686b641b3f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Jun 2024 05:03:04 +0000 Subject: [PATCH 05/80] kicad: 8.0.2 -> 8.0.3 --- .../science/electronics/kicad/versions.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4c55703edccf..b3ddbd5b604f 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.2"; + version = "8.0.3"; src = { - rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50"; - sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9"; + rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; + sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; }; }; libVersion = { - version = "8.0.2"; + version = "8.0.3"; libSources = { - symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661"; - symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn"; - templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6"; - templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v"; - footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6"; - footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz"; - packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162"; - packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35"; + symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; + symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; + templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; + footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; + footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; + packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; + packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; }; }; }; From 596da91f8e5c93db92fffcb5a5eeabddbddc252b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 9 Jun 2024 07:35:35 +0200 Subject: [PATCH 06/80] liboqs: 0.10.0 -> 0.10.1 --- pkgs/by-name/li/liboqs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index f6d996bc1b1d..36d9d042ca4e 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-BFDa5NUr02lFPcT4Hnb2rjGAi+2cXvh1SHLfqX/zLlI="; + hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; }; patches = [ From d97b752ae136452187c116569748a3e420767832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 07:43:17 +0000 Subject: [PATCH 07/80] moon: 1.25.1 -> 1.25.6 --- 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 4923ea23da1c..5e6ad1c1e16f 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.25.1"; + version = "1.25.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-LPQuP2OsR1TYnt7Qm8XRO0Ne7xliglJgQrMHNWnsYhM="; + hash = "sha256-DFBQryGbanytawHtD3ygSL9ypzM9hoxVoVB1H9ruPu4="; }; - cargoHash = "sha256-EWwUlKxsf0rZegxk1m11ZPIcfjwZKQ7C95l5UyGVFD0="; + cargoHash = "sha256-6Ipfz4649vf7qsavkif/zNbElMiZPEi/2ZXHbRcxRTw="; env = { RUSTFLAGS = "-C strip=symbols"; From a42717b875f8d9da831ed7a8ceab1dc986ce518b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Jun 2024 23:40:44 +0200 Subject: [PATCH 08/80] python311Packages.dask: 2024.5.2 -> 2024.6.0 Diff: https://github.com/dask/dask/compare/refs/tags/2024.5.2...2024.6.0 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 851bc43241dd..08ce62f9e701 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -41,7 +41,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.5.2"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,7 +50,7 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw="; + hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0="; }; build-system = [ From 9b7f2cc30bdd5a0d9738e2e6c4227c17255c1d57 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Jun 2024 23:41:46 +0200 Subject: [PATCH 09/80] python311Packages.dask-awkward: 2024.3.0 -> 2024.6.0 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.3.0...2024.6.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2024.6.0 --- .../python-modules/dask-awkward/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 4663d25cffcf..99bf5858bf68 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.3.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,18 +30,18 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; + hash = "sha256-m/KvPo4IGn19sA5RcA/+OhLMCDBU+9BbMQtK3gHOoEc="; }; pythonRelaxDeps = [ "awkward" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ awkward cachetools dask @@ -74,11 +74,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } From 3cdf6478fc0c4343d041f60e889e1cf9be6bed33 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 14 Jun 2024 23:42:42 +0200 Subject: [PATCH 10/80] python311Packages.distributed: 2024.5.0 -> 2024.6.0 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.5.0...2024.6.0 Changelog: https://github.com/dask/distributed/blob/2024.6.0/docs/source/changelog.rst --- .../development/python-modules/distributed/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 3cad3562be1a..0d5da20cccfb 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.5.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8="; + hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k="; }; postPatch = '' @@ -76,11 +76,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "distributed" ]; - meta = with lib; { + meta = { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh ]; }; } From b237046e72a45d097ea5c78d992c6d00d90736f6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 15 Jun 2024 00:01:41 +0200 Subject: [PATCH 11/80] python311Packages.dask-expr: 1.1.2 -> 1.1.3 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.2...v1.1.3 --- pkgs/development/python-modules/dask-expr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 872b88820c95..930581b563a6 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU="; + hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs="; }; postPatch = '' From c203af85968f03b5798862b48b71445e96e5e43e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 16 Jun 2024 21:46:05 +0800 Subject: [PATCH 12/80] escambo: init at 0.1.2 --- pkgs/by-name/es/escambo/package.nix | 62 +++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/es/escambo/package.nix diff --git a/pkgs/by-name/es/escambo/package.nix b/pkgs/by-name/es/escambo/package.nix new file mode 100644 index 000000000000..24341716dd78 --- /dev/null +++ b/pkgs/by-name/es/escambo/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, +}: + +python3Packages.buildPythonApplication rec { + pname = "escambo"; + version = "0.1.2"; + pyproject = false; # built with meson + + src = fetchFromGitHub { + owner = "CleoMenezesJr"; + repo = "escambo"; + rev = version; + hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "HTTP-based APIs test application for GNOME"; + homepage = "https://github.com/CleoMenezesJr/escambo"; + license = lib.licenses.gpl3Plus; + mainProgram = "escambo"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} From 222c34462124c207e66526a42b5baa73e560b6e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 00:48:03 +0200 Subject: [PATCH 13/80] evcc: 0.127.1 -> 0.127.2 https://github.com/evcc-io/evcc/releases/tag/0.127.2 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 2a83b6d5b8a9..b20fbee94591 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,13 +21,13 @@ in buildGoModule rec { pname = "evcc"; - version = "0.127.1"; + version = "0.127.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-wyx0/exXi+LWC3w4VZa9AWpenSHkqn7R91HnTxO68HY="; + hash = "sha256-85AhiqAvjr63tfXovH2bt1b583ak1N09EtbLLtW7qeA="; }; vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs="; From 15f84237717486c8583a828305e2d4c07083ff9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 Jun 2024 00:57:14 +0200 Subject: [PATCH 14/80] python312Packages.homeassistant-stubs: 2024.6.2 -> 2024.6.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.6.3 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5a421a1f897b..4d14ee508bcb 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.6.2"; + version = "2024.6.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-y1TiexWK5aJRa6Kfcdc8rPr+uueKJ2+4n2q6dCPCWjk="; + hash = "sha256-YMoNoR9LT38nkqoo0seaP88XUOcVmSQN1dBKiW+13SM="; }; build-system = [ From f873c8da8028aa8e5ba170e97ae9088f1c75450e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 23:12:17 +0000 Subject: [PATCH 15/80] python311Packages.jsonrpclib-pelix: 0.4.3.2 -> 0.4.3.3 --- pkgs/development/python-modules/jsonrpclib-pelix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 0903e7a1f12a..5cf7fe1f5b80 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.3.2"; + version = "0.4.3.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; + hash = "sha256-xJT+cQCxE5sTEUacKLwy0cuS5P8fRRH7cdaAcgXcN3M="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. From b0b6d5a4b6664b6283278a01d0fb88f56f54a9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 04:13:30 +0000 Subject: [PATCH 16/80] python311Packages.niworkflows: 1.10.1 -> 1.10.2 --- pkgs/development/python-modules/niworkflows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 28e6cffca08b..d6eb920d36d4 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.10.1"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; rev = "refs/tags/${version}"; - hash = "sha256-ZOn3KSaPAA8zTdyexrjF9Wkb5C5qA/5eSJahg2DcX20="; + hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw="; }; postPatch = '' From d780ee602cfe4137a32198c7668a25fe916d14be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 07:27:46 +0000 Subject: [PATCH 17/80] pyenv: 2.4.2 -> 2.4.3 --- pkgs/development/tools/pyenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 007cf3b1dd6a..9f761ef0be27 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hPbXKUg7jl4Dd4m29yaEJVX+jl8c/1oODEcRGTao58w="; + hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; }; nativeBuildInputs = [ From ad99f94c466c9ac2e15c35c753a7ce2e070c8723 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 08:01:50 +0200 Subject: [PATCH 18/80] LASzip{,2}: rename to laszip{,_2} --- pkgs/applications/graphics/cloudcompare/default.nix | 4 ++-- .../LASzip/default.nix => by-name/la/laszip/package.nix} | 2 +- .../LASzip2.nix => by-name/la/laszip_2/package.nix} | 8 ++++---- pkgs/development/libraries/libLAS/default.nix | 6 +++--- pkgs/development/libraries/pdal/default.nix | 4 ++-- pkgs/development/python-modules/laszip/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/python-packages.nix | 1 + 9 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/{development/libraries/LASzip/default.nix => by-name/la/laszip/package.nix} (97%) rename pkgs/{development/libraries/LASzip/LASzip2.nix => by-name/la/laszip_2/package.nix} (84%) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index f66189e0c75c..eac82182f61d 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -11,7 +11,7 @@ , flann , gdal , gmp -, LASzip +, laszip , mpfr , pdal , pcl @@ -48,7 +48,7 @@ mkDerivation rec { flann gdal gmp - LASzip + laszip mpfr pdal pcl diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/by-name/la/laszip/package.nix similarity index 97% rename from pkgs/development/libraries/LASzip/default.nix rename to pkgs/by-name/la/laszip/package.nix index ee6e74aa7bc2..65c2e6934a24 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/by-name/la/laszip_2/package.nix similarity index 84% rename from pkgs/development/libraries/LASzip/LASzip2.nix rename to pkgs/by-name/la/laszip_2/package.nix index 4f63dfe8059c..8af9cae261fe 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/by-name/la/laszip_2/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.michelk ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 195f77d19231..4b00de811573 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff laszip_2 ]; cmakeFlags = [ "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" + "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 86d976531cb3..6e7d1ccabef5 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -10,7 +10,7 @@ , curl , gdal , hdf5-cpp -, LASzip +, laszip , libe57format , libgeotiff , libtiff @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { curl gdal hdf5-cpp - LASzip + laszip libgeotiff libtiff libxml2 diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index bd9a89ce2414..97c268d956ba 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -7,7 +7,7 @@ scikit-build-core, pybind11, cmake, - LASzip, + laszip, ninja, pythonOlder, }: @@ -48,7 +48,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ LASzip ]; + buildInputs = [ laszip ]; # There are no tests doCheck = false; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..c4e8770cf3c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -640,6 +640,8 @@ mapAliases ({ ### L ### larynx = piper-tts; # Added 2023-05-09 + LASzip = laszip; # Added 2024-06-12 + LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..b3d87f4b4b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21648,9 +21648,6 @@ with pkgs; LAStools = callPackage ../development/libraries/LAStools { }; - LASzip = callPackage ../development/libraries/LASzip { }; - LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; lcm = callPackage ../development/libraries/lcm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 483cb05e6996..308a5259c2cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6533,6 +6533,7 @@ self: super: with self; { laszip = callPackage ../development/python-modules/laszip { inherit (pkgs) cmake ninja; + inherit (pkgs.__splicedPackages) laszip; }; latex2mathml = callPackage ../development/python-modules/latex2mathml { }; From f8d3abded0fc8ea7c6a99d9ff514334d1be8c9f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 09:55:37 +0000 Subject: [PATCH 19/80] elasticmq-server-bin: 1.6.3 -> 1.6.4 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 1e8a97fa2b64..f878ef6e64e9 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-AVvzIx39IdtLzlD7jUJk3NlNRJym0N3VZmKsncYkzFU="; + sha256 = "sha256-HAxZaZofO24baPTNFqSltNgZekjOLRuCprcAksTSYiY="; }; # don't do anything? From e681a07830e78eb2f443e26ebb6a066a9f6b7bc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 10:19:31 +0000 Subject: [PATCH 20/80] nu_scripts: 0-unstable-2024-06-08 -> 0-unstable-2024-06-16 --- pkgs/shells/nushell/nu_scripts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 9815d7934387..47d29b44ac23 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-06-16"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "398cc82308d8ddd0fb09bc9e8fc20cced26a0d30"; - hash = "sha256-zJWZakNxLQI3vxClzS4B0NqY84Oj5R1BjX2aMjCm/+Q="; + rev = "92f20ff2827b1afb3d06011bc0609a0212c53993"; + hash = "sha256-ZYrlX8Kg9VD5/eUctesAXQlBcVPiOZ3W9WCpBkByrpA="; }; installPhase = '' From 59131cc40d999d9b5567a543baa685b258e14962 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 13:35:14 +0000 Subject: [PATCH 21/80] prometheus-junos-czerwonk-exporter: 0.12.2 -> 0.12.3 --- .../monitoring/prometheus/junos-czerwonk-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 37631a00c679..c9b7440507aa 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-KdVyRddAr2gqiFyIGBfWbi4DHAaiey4p4OBFND/2u7U="; + sha256 = "sha256-5haMQlwGJO0WdT75AEfs41k1oWUqrFk9nj+DOcKAom0="; }; - vendorHash = "sha256-fytDr56ZhhO5u6u9CRIEKXGqgnzntSVqEVItibpLyPM="; + vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; From bd7e2d7116d0839f8a906be8a7e215b44d62fa7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 14:27:05 +0000 Subject: [PATCH 22/80] python311Packages.puremagic: 1.23 -> 1.24 --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index fc54dbdaa6ec..b3bcbbacec39 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.23"; + version = "1.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE="; + hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; }; build-system = [ setuptools ]; From ec23437473da84810e8ab3d8da21488200c0e4f3 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 17 Jun 2024 20:13:08 +0200 Subject: [PATCH 23/80] tart: 2.11.1 -> 2.12.0 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 60a84cd30675..d0f2f3a0127e 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA="; + hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M="; }; sourceRoot = "."; From ae956ce59ca063048d6f8b8ea1244400d589ebea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 19:15:09 +0000 Subject: [PATCH 24/80] renode-unstable: 1.15.0+20240609git09f623310 -> 1.15.1+20240615gitdd55f8ea4 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 9938de1d8d85..6fb753a1cbad 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240609git09f623310"; + version = "1.15.1+20240615gitdd55f8ea4"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-jbPvMzGXdBXT92aPXBQzw74hXW9JJeTZQgXKvILMlo0="; + hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis="; }; passthru.updateScript = From 79ccb91b88cc39b4cf094cdd3e2f73a168ea0f0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 19:46:49 +0000 Subject: [PATCH 25/80] fflogs: 8.5.12 -> 8.5.16 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index df8e216e34bb..73ec95ab3bf9 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.12"; + version = "8.5.16"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-mlqQm9o001+pSMfMbOwa+gKcIIC6SBg7Rott9+XkB2E="; + hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From a11dd36f4108f0a8b9099134b925d52a543071d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 23:19:38 +0000 Subject: [PATCH 26/80] python311Packages.weconnect: 0.60.2 -> 0.60.3 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e653d684d447..cba91268a5eb 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.2"; + version = "0.60.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk="; + hash = "sha256-eIGzcuSKzcpE6UPQKmv0kcFcIFizWOunfOJDHfcw7Yk="; }; postPatch = '' From 92dd554bbcd9fd96b4cd4b2d13a061301d047790 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 23:50:46 +0000 Subject: [PATCH 27/80] ast-grep: 0.22.6 -> 0.23.0 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index c817a6125fc7..e5ffcc27b2ce 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.22.6"; + version = "0.23.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QE8bTFlKlaxUeYJoaZyiuv/7zk+Pi3s64Er5YNTUh7I="; + hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; }; - cargoHash = "sha256-tTEZUGC4RHjnAK+fMNkVqgsngBSdVAtoZ5ij3VbzKb4="; + cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; nativeBuildInputs = [ installShellFiles ]; From 3461a67499b9714211c9f04467d5e879da6ffc80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 01:16:09 +0000 Subject: [PATCH 28/80] impala: 0.1.1 -> 0.2 --- pkgs/by-name/im/impala/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index f9756c8f7c64..b322e6f0f366 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.1.1"; + version = "0.2"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-r/aWzSn/Dci69oS/yopG6Ro34U8hniHVanctyM7RvDw="; + hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE="; }; - cargoHash = "sha256-IV1ftsRyM0CUlQMVmLip1FiqnouT5TsKASpF/KLARqY="; + cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU="; meta = { description = "TUI for managing wifi"; From 872dcbfa24419135e04b20831d75e833841d55dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:20:32 +0000 Subject: [PATCH 29/80] srm-cuarzo: 0.5.6-2 -> 0.5.7-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index d8d3f4622a1e..af1468b42850 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.6-2"; + version = "0.5.7-1"; rev = "v${self.version}"; - hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90="; + hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc="; src = fetchFromGitHub { inherit (self) rev hash; From 7d7faa6e386e711396d2c59abd47b7bcab8c7e7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:28:54 +0000 Subject: [PATCH 30/80] temporal: 1.24.1 -> 1.24.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 3bef419324d0..3b23b750864c 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.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-GEmlmVTxQPoKsb9RtS6RcHY/0iDZsj3jG/Les2VPMAc="; + hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs="; }; vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E="; From 0f24b05269dddea8f9caefba8d437172e2a3216b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:32:18 +0000 Subject: [PATCH 31/80] tickrs: 0.14.9 -> 0.14.10 --- pkgs/applications/misc/tickrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index a22f9da07359..29587be9bcde 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.9"; + version = "0.14.10"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA="; + hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I="; + cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; nativeBuildInputs = [ pkg-config From 5c9cfc935cf7ffd40ef9b51a11218db184ff059d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:35:29 +0000 Subject: [PATCH 32/80] wait4x: 2.14.0 -> 2.14.1 --- pkgs/by-name/wa/wait4x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 1255e772b056..a5b804e3c907 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -4,7 +4,7 @@ }: let pname = "wait4x"; - version = "2.14.0"; + version = "2.14.1"; in buildGoModule { inherit pname version; @@ -13,10 +13,10 @@ buildGoModule { owner = "atkrad"; repo = pname; rev = "v${version}"; - hash = "sha256-4lv6nYeyjjGGQksi2Ffx+Yu0OazNsJ0QEZG5BfuyrJ8="; + hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU="; }; - vendorHash = "sha256-D8s42YArp0IGi7I6qB9eQEh1ZQptSrKLLVIIdqk5Kq0="; + vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo="; # Tests make network access doCheck = false; From b3f21da3ff924e4e418fcd466712d32520f0790a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 04:40:40 +0000 Subject: [PATCH 33/80] gource: 0.54 -> 0.55 --- pkgs/applications/version-management/gource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index c6e699ac1b51..60f11d5168b1 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gource"; - version = "0.54"; + version = "0.55"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU="; + hash = "sha256-yCOSEtKLB1CNnkd2GZdoAmgWKPwl6z4E9mcRdwE8AUI="; }; postPatch = '' From 5e091e5aff6504adea9da13e0a1f339207174fb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 05:21:15 +0000 Subject: [PATCH 34/80] ethq: 0.6.3 -> 0.7.0 --- pkgs/os-specific/linux/ethq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/os-specific/linux/ethq/default.nix index 581382e4faf2..94f18cccd943 100644 --- a/pkgs/os-specific/linux/ethq/default.nix +++ b/pkgs/os-specific/linux/ethq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ethq"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; rev = "refs/tags/v${builtins.replaceStrings ["."] ["_"] version}"; - hash = "sha256-dr37KiSnP0S0OjQof242EcbH+y4pCCzu6R9D6fXR9qc="; + hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc="; }; buildInputs = [ ncurses ]; From 67818b1e5c3159a17be073d55c1eb4c272d1e942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 05:21:56 +0000 Subject: [PATCH 35/80] fcitx5-chewing: 5.1.4 -> 5.1.5 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index e9317cbc2eea..d7e03bafdb89 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-n/5ZFXX/vg4rZSYeq1J/hpqib7P/grNH+NdPpx0fZMo="; + hash = "sha256-qXIcIByfgfWRe0rhetTHRyA7RqUHIP6FATwvtrfXNwQ="; }; nativeBuildInputs = [ From 3f3e384dce6f537731304122cfb3d43ab14a64be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Jun 2024 08:50:48 +0200 Subject: [PATCH 36/80] checkov: 3.2.137 -> 3.2.138 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.137...3.2.138 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.138 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9f967bd59b00..614f78d54853 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.137"; + version = "3.2.138"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-gI9x2QYrpludcIAmxSB1/Bhy/O+ZPt1EKI6FgNm85Yo="; + hash = "sha256-xgEVUZF6d/vmqaKVTxt0MtppqDBhPEzQcY37WVOR/EE="; }; patches = [ ./flake8-compat-5.x.patch ]; From c4508de5d248b37195840067a84f18c371b73064 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 18 Jun 2024 16:23:09 +0800 Subject: [PATCH 37/80] unconvert: unstable-2022-09-18 -> 0-unstable-2023-09-07 https://github.com/mdempsky/unconvert/compare/3f84926d692329767c21c2aef3dfb7889c956832...415706980c061b6f71ea923bd206aec88785638f --- pkgs/development/tools/unconvert/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index 21c0d08ab5ac..478a111555a6 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unconvert"; - version = "unstable-2022-09-18"; + version = "0-unstable-2023-09-07"; src = fetchFromGitHub { owner = "mdempsky"; repo = "unconvert"; - rev = "3f84926d692329767c21c2aef3dfb7889c956832"; - sha256 = "sha256-vcRHriFCT5b8SKjtRSg+kZDcCAKySC1cKVq+FMZb+9M="; + rev = "415706980c061b6f71ea923bd206aec88785638f"; + hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; }; - vendorHash = "sha256-p77mLvGtohmC8J+bqqkM5kqc1pMPcFx7GhXOZ4q4jeM="; + vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38c65b8f36c0..dfdde0ab062a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24650,9 +24650,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { - buildGoModule = buildGo121Module; - }; + unconvert = callPackage ../development/tools/unconvert { }; uncover = callPackage ../tools/security/uncover { }; From 13814bd8ed8f751f3d6920ed54284f45a44d34a3 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Tue, 18 Jun 2024 11:34:17 +0300 Subject: [PATCH 38/80] pulumi-bin: 3.119.0 -> 3.120.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 162 +++++++++++++-------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b8b0f5c11a8d..128ab8e226f7 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.119.0"; + version = "3.120.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-x64.tar.gz"; - sha256 = "03v3138m6dxqbq192rxs5vhk9ypmvlp64k4l8acmcxys23gz7lvq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-x64.tar.gz"; + sha256 = "1ck6i0hqzisl474vv84iwdg8yh57sc6q3pjq81xh6plp8s95rka2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-amd64.tar.gz"; @@ -17,36 +17,36 @@ sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-amd64.tar.gz"; - sha256 = "036rkgs55j2z9gkivc9iw8apc2h82c4wdf6b0wiwd16jbaj5bvwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-amd64.tar.gz"; + sha256 = "14dh5jf6ld5prgcbz74yk9fwcf1k6fsfm70gw1xy97m4crn2l4q9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-amd64.tar.gz"; - sha256 = "1q6hmfq5j1qjvppb1a9mhsd0ihc7yw1sr1rdspyd76jqk7610nfz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1nqxc28ncrq1zpclm2acvvqa8yl21nmk6lb5sqsvy5kbizpzslar"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-amd64.tar.gz"; sha256 = "0vcmyzb6qbg8sfrbq06sdi1cc309132qsf92lswxydvnrqxvy0x4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-amd64.tar.gz"; - sha256 = "1ca29a9y03bi0q6zk5k1585bfx0pgxgsj4m0hhxvfz8lfh1i6lw3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-amd64.tar.gz"; + sha256 = "162zhf7iy9yr47h4fik3rps2wy7fsl74mg4kcnjxv65wjwmqlab4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-amd64.tar.gz"; - sha256 = "09cn9g7pxnqsgr6cz62k8vnynvkxgqi9pf172inwm0f01h945zp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-amd64.tar.gz"; + sha256 = "1sgfw4b9s6k5854fa35y0p77v1n5h199yaghing4qn05i0miapgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-amd64.tar.gz"; - sha256 = "0y6y8ra858a4hn7wasf2356s33an68w8dwy7y4kdpb3kpky1mx3m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-amd64.tar.gz"; + sha256 = "00cbix4cdhmgj50ilqjyn2ia3mxyp094n1979pm15j88plvambf3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-amd64.tar.gz"; - sha256 = "159anajw61s89f08kkrkp81r4yg7vf269pzk4ldq8fljikr49y55"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-amd64.tar.gz"; + sha256 = "0n1kp9ip9f70rhn619r5a4pzyalcfx46252cfk3ha50drjv27l58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-amd64.tar.gz"; - sha256 = "0vmq4vwfgc1smp6ls2gk4li80zksqb7rx61ci4grm1vgrhxjv2gr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-amd64.tar.gz"; + sha256 = "0qxp61glmnqh5a4w07b7hwbj0nkg7c15pqil8855jv15zakgp495"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-amd64.tar.gz"; - sha256 = "0n7cj6bj4hrjrijn0pniy9fzq39cb019m1k5rqqbfpkpv1211zf1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-amd64.tar.gz"; + sha256 = "1bzmgs0xy1l2rwh843y7rdamsixm8lddybr2y088ilf69g8a63gl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "05g9fhg25ixxxrv0pm066cjdimjzs9wp8jlxv9179hny9hcy8fyh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-amd64.tar.gz"; - sha256 = "19ag7ca5c1cnhpc3rxdy5rm5gavazjnrjh7hzpbysdmckzbc28ff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-amd64.tar.gz"; + sha256 = "0f3pa8y29n3isxa4kwqfsr6i1x3xhcj7jnqmnzkc60y7lg4r1z12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-x64.tar.gz"; - sha256 = "17g915yfckfk7jywf1sxh3hkc9n4rw9myr6zn3h3w8wwhzs74z2y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-x64.tar.gz"; + sha256 = "090hvs9dghc4jzrsxj71gxl6gmsilfr3sydw7is9hwpjiykk1k3n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-amd64.tar.gz"; @@ -175,36 +175,36 @@ sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-amd64.tar.gz"; - sha256 = "0czn7l0vnl8w9lkcg7rbr723q1gwv0ci4bxf6jik3vmcchl38z2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-amd64.tar.gz"; + sha256 = "0pyc2d7jg5bi3lz151d94i0i8sfrxhqnv388sdz6yrdkhz434z82"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-amd64.tar.gz"; - sha256 = "0avzcn0z4i5rhw8sdr0bxpj2lnpvmdxgw70gi7hzn551mr45fsfq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "1qi3vmzsp3bcq7y8y7q0h7hiqk6r5mzjq7h6i0g77fjcyjabqdch"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-amd64.tar.gz"; sha256 = "1jhnh3f2zni8wmddf2bz25r37iwbh1dyf8j9wnjyync1fqjy877y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "1p0qmmh4v8hm82vykpzwdmffrrfr9nrnwqyzxxvmn76p5q2hrqx4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "1km113wism9yf4rlx44g171jkxz3srpyvyi5hwablpw9pk93qnsv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-amd64.tar.gz"; - sha256 = "1vfs8nxck3fwryqbwwbqrai9bcf2b1bw4nv5521z9y6qbskqqyn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-amd64.tar.gz"; + sha256 = "01xjm5q6kixyz4yvgjdhfskm3l7caygd33h19w7kzaih3dfffd25"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-amd64.tar.gz"; - sha256 = "00ividjihn5258vyp0jj3jvvcclihqjpgx9rkxm2xqs6rn7yfy2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-amd64.tar.gz"; + sha256 = "052hkf5ljyg3fhqn7z1dk4mhp4pbzvb2klvc9d2p4qqzv8vc47gr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-amd64.tar.gz"; - sha256 = "136407vq3m2ilpgmyh01n76izm9zigdm9l8rqd7mlg0c6laivc19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-amd64.tar.gz"; + sha256 = "120z9hs349qzjk84fwzizhpp90fp21fgapxbgy56k22pshl35wzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-amd64.tar.gz"; - sha256 = "1ihhs7q570mssswqfgmm1741b879ky1gyakiilypi3nzlnnpa9w5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-amd64.tar.gz"; + sha256 = "0d3pcwj7lncq4zalbkd3nyk4dbas5328maxa3dv55z6wi4x2ds9n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-amd64.tar.gz"; - sha256 = "0fhmza4ynmb5bcwd0m80p4acv2l5f2imca9zg02mmv6drd4wznpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-amd64.tar.gz"; + sha256 = "1h06j9jpba6wxv8nz33ysz5bx928qbm64nk4gv5qa5zzdpm4c1mh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "1mbrrw4mvf1dnh6zp66lb9lsirg24gikvd7ls51bdld4pfs1rn3z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-amd64.tar.gz"; - sha256 = "07g2iys3w2r0giwakymb1n1bpwp812z93nskxbkwiw4zl8p6vr9v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-amd64.tar.gz"; + sha256 = "06vdv0mms6ksn1ah61afkfi2jx6q0sicbkvw2ngd98ch8djjqysk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-arm64.tar.gz"; - sha256 = "0m0ziqpa8q17fn330mrjrvqz27k6fd35x2ihaa6bdx37mq6vmac5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-arm64.tar.gz"; + sha256 = "0aki919lihvzva9qswc1lqigssiqqy8zqdd6v982xfc5b29xa0cb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-arm64.tar.gz"; @@ -333,36 +333,36 @@ sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-arm64.tar.gz"; - sha256 = "026f789v04asxfq0a2bll5qsr28rb7mcm4jmsc4y1bwiv3brcpx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-arm64.tar.gz"; + sha256 = "0yn3rbya6fr12m3ah2f5qywp85vf198zsdkpzx5wny6s6prnsiw8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-arm64.tar.gz"; - sha256 = "0hcf3q5k2rc9xmi66ybvinw9sgc9ky1rgfzsidc7by413maq027z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0fxsa527dnvc77flfgqbmj5823mfwwfp67r9sswkhik3i6i0lm3c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-arm64.tar.gz"; sha256 = "1dv2y358fwcp6pr8mb1yhw5lygs9aqf8ma50vz3p74z1101lz3id"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-arm64.tar.gz"; - sha256 = "14mz37gd25cjivwjkzrszywvz2kmc5xj2rk35dvhdy4qqw10jz4a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-arm64.tar.gz"; + sha256 = "1881iqrnsfja341nq27k6pv3c85pw27cyq5ykk5bs2vzjvv008g0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-arm64.tar.gz"; - sha256 = "1x03nwk51pkcyl6ncsnxiqmk40hd62vswncz0vkd082vhirqfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-arm64.tar.gz"; + sha256 = "0hmd6y0mh9bwx38k5hqbgclwfsa8ls64511zkhlmln6pix3bn4k0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-arm64.tar.gz"; - sha256 = "1b9wsnpnrky80mjrj21p7xn90s95dabync5a426nk7s089kscs6v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-arm64.tar.gz"; + sha256 = "08a20lp4ym5cncv6q3s7dbwrhhn76630x8a2arsm4j7gcqja389m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-arm64.tar.gz"; - sha256 = "0jiqkskhhbb6hvwg0vhh6ms2rqdr8lsl0400yhiin1q1whz9bk4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-arm64.tar.gz"; + sha256 = "0vrlk561p3aax3cgzpvjgwsxwwc5vblqb28cvc1xrj4bphd7xjda"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-arm64.tar.gz"; - sha256 = "06556faphr92rby8iyjzmzl9gxj27yij1d1rhw2cnk7q1w5m45i6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-arm64.tar.gz"; + sha256 = "1qs9bcsw91s450sdxb2lrqzxl2q4wmpfjfspp7g5yxnv8ns8knl6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-arm64.tar.gz"; - sha256 = "1bd3w8lbfcxvr2bl9cqm4kysq1fklsni69w3w42ss7lvayw8rzna"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-arm64.tar.gz"; + sha256 = "1jhjz9kcs09x5i128mx4k7mh5fjafmg21hnifxh2avcari52r1q6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "08w72fz5lzsaa4q5zfnkkggpyy5brqx1zpbybkvc9r91s44kbjjf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-arm64.tar.gz"; - sha256 = "0la5pifbr558smr69nmqax7b8vkvhr243avrn04gz11sc1fwqb2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-arm64.tar.gz"; + sha256 = "0j9w042blbs0wq3qlnjk20a9bs48v3jmg4s3z2mn39c7ff1604by"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-arm64.tar.gz"; - sha256 = "13b12g1lbpg2nsff7xggp7fdz77vsmvmb5l0dk77qrxl8nr6hq25"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-arm64.tar.gz"; + sha256 = "17niys4r8i1b40g3sv783ndnbks0lqpdasi2p3sx7zc64sq6v7nm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-arm64.tar.gz"; @@ -491,36 +491,36 @@ sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-arm64.tar.gz"; - sha256 = "1qhsc01rbgvq25w7m2rjvbfg5fr3x8s3gi1z0vaz5m75znd0kbh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-arm64.tar.gz"; + sha256 = "0blhb4ymfwrc7lm7v4sg0kmpibwbrrxcwd30imqp0gk6awmnjggn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-arm64.tar.gz"; - sha256 = "1a6hkwj3c7rwykiqls6x72gsfiqbqwqmdkyzhbbr0sq1zs1r4n05"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "1g461qcw8479fgchyg0wl086lay2irz7f1415bdvjhcjhjsyqas9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-arm64.tar.gz"; sha256 = "0a1aibs654xbcdm8kdcjjrg55fb0yh819d52zz3h6hpg40bahqcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "1lfancfjr5qrzz9n3nb47cc1gyap4ls3dsc1wpnknafnmxqgv5h0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "0kgyg5jqxrlv8jr5iyqdj6xg1x4n2zjnlaymwyvakygryfnq4b1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-arm64.tar.gz"; - sha256 = "1j7kxxcgysxfzyfy9a5jb3f0dcw8kq39i145cnjh5887bqxqmnvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-arm64.tar.gz"; + sha256 = "1abz7hc4shvijf8291528blba3n4ixwwpk5jqv7i38bsn1jh1q3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-arm64.tar.gz"; - sha256 = "0w5wxc9bcipx3zq9090dsqiz79a2p6md7k8wkbyyzhz9yhpx461s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-arm64.tar.gz"; + sha256 = "0171rb3d1582vi0p67s4cmcjx19a3r278w4a1vlmqadk5jg9xx2k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-arm64.tar.gz"; - sha256 = "07ybs8rg5hdkz0f7d72znpflc5im1sp7nk3qqdmw11wszn63wsrz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-arm64.tar.gz"; + sha256 = "0k2aab9vn0l9sq0pgzwl3cz1gzg5yc4gqw1yln2nq637wknp7p6f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-arm64.tar.gz"; - sha256 = "0v3hw5m78p8qv9camvcbl0dycb1fdgxwbikgpbxa45d921ihkvsc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-arm64.tar.gz"; + sha256 = "1d87xac6mwzigqrql4vq40gmz9xn9f4pi1rri54393jkfqnzi64i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-arm64.tar.gz"; - sha256 = "08x8yzjfl8j3rwlwzxfqmjlxxn177kdhmrz9g8a7igp8yggyq5hs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-arm64.tar.gz"; + sha256 = "0z3bvfcfdx1fps2zgx7g1jmrlhrp0m6sbd91c7ddx7ig4g2l4xfz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "1vfl1qk2iiv1d51l9jzcy3p96n8fwk7fbdsvvyfd3cn2xp07npnv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-arm64.tar.gz"; - sha256 = "0xc8d7ix9nxnpy376q4n36mi58p9vz9ifzvldk8s8cpld8pgrm20"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-arm64.tar.gz"; + sha256 = "0djz66nn08bm47cqwai7mlgwffm6xzn4p3niwsh280xnj0q9hkbq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-arm64.tar.gz"; From 42e2639580af808708df32662f1ddfec64562ba0 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Tue, 18 Jun 2024 11:15:23 +0200 Subject: [PATCH 39/80] slumber: 1.4.0 -> 1.5.0 --- pkgs/by-name/sl/slumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index f2a871cdff90..b992ffe48c1f 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; rev = "v${version}"; - hash = "sha256-sUCOuQ35wfbrLgiPdzw5wmr8BgzDinZDKfBJ3O9JrzI="; + hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A="; }; - cargoHash = "sha256-geTQ/56nuPW9fVtz+YEP3VaYPdWVm83hsGslKCtj0Vo="; + cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; From 163cb8eb30041b6fa2d1e231c8626028b377eb64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 09:43:12 +0000 Subject: [PATCH 40/80] tftui: 0.13.3 -> 0.13.5 --- pkgs/applications/networking/cluster/tftui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 3bd2c2a13868..9af694c683fd 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tftui"; - version = "0.13.3"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "idoavrah"; repo = "terraform-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0="; + hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; }; pythonRelaxDeps = [ From 13b74e5fbdce1499486cd6eeb6045e1671a51f07 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 18 Jun 2024 17:51:12 +0800 Subject: [PATCH 41/80] geopard: 1.4.0 -> 1.5.0 --- pkgs/by-name/ge/geopard/package.nix | 30 +++++++---------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 6ec0127afbe6..9357d4a6634a 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -2,65 +2,49 @@ , cargo , rustc , fetchFromGitHub -, glib -, gtk4 , libadwaita , rustPlatform -, openssl , pkg-config , lib , wrapGAppsHook4 , meson , ninja -, gdk-pixbuf -, cmake , desktop-file-utils -, gettext , blueprint-compiler -, appstream-glib +, glib-networking }: stdenv.mkDerivation rec { pname = "geopard"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ranfdev"; - repo = pname; - rev = version; - hash = "sha256-elHxtFEGkdhEPHxuJtcMYwWnvo6vDaHiOyN51EOzym0="; + repo = "geopard"; + rev = "v${version}"; + hash = "sha256-QHqhjoiKiwTBDMDhb7Agqe0/o2LyLDs2kl/HC4UfayY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-80YujPjcmAxH1gITT4OJk8w4m8Z/pAYtBUpCPQOKe3E="; + hash = "sha256-AmGwsSRrZK+oSnkn9Xzmia/Kbkw19v0nb1kFJtymqOs="; }; nativeBuildInputs = [ - openssl - gettext - glib # for glib-compile-schemas meson ninja pkg-config wrapGAppsHook4 - cmake blueprint-compiler desktop-file-utils - appstream-glib - blueprint-compiler cargo rustc rustPlatform.cargoSetupHook ]; buildInputs = [ - desktop-file-utils - gdk-pixbuf - glib - gtk4 libadwaita - openssl + glib-networking ]; meta = with lib; { From 46ea9c95f9eea5f6d7ba5898c9ed12d685677f35 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 18 Jun 2024 17:54:34 +0800 Subject: [PATCH 42/80] geopard: add aleksana as maintainer --- pkgs/by-name/ge/geopard/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 9357d4a6634a..4966ee60aa43 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ranfdev/Geopard"; description = "Colorful, adaptive gemini browser"; - maintainers = with maintainers; [ jfvillablanca ]; + maintainers = with maintainers; [ jfvillablanca aleksana ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "geopard"; From 4c760f714e96a8958eeddf8bb68835e0ea9b840c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 10:01:47 +0000 Subject: [PATCH 43/80] python311Packages.galois: 0.3.8 -> 0.3.9 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index aee28fb25159..331785dd9e20 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4="; + hash = "sha256-vgOsFEocgBvYba9Aq4HDYsnK1w+iQm1QDTzln68Tqss="; }; nativeBuildInputs = [ From 4ff1b500f1920229b89784ca7866907422822e2c Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 18 Jun 2024 18:44:55 +0800 Subject: [PATCH 44/80] iplookup-gtk: init at 0.3.4 --- pkgs/by-name/ip/iplookup-gtk/package.nix | 58 ++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 pkgs/by-name/ip/iplookup-gtk/package.nix diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix new file mode 100644 index 000000000000..3d2486fe5b98 --- /dev/null +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -0,0 +1,58 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonPackage rec { + pname = "iplookup-gtk"; + version = "0.3.4"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "Bytezz"; + repo = "IPLookup-gtk"; + rev = "v${version}"; + hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = with python3Packages; [ + pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Find info about an IP address"; + homepage = "https://github.com/Bytezz/IPLookup-gtk"; + changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + mainProgram = "iplookup"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} From 25c5c32ef2add8131975115242cb46e934b122a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 11:11:49 +0000 Subject: [PATCH 45/80] marcel: 0.28 -> 0.29.0 --- pkgs/by-name/ma/marcel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marcel/package.nix b/pkgs/by-name/ma/marcel/package.nix index a86df180c1b5..d2468fcb6fab 100644 --- a/pkgs/by-name/ma/marcel/package.nix +++ b/pkgs/by-name/ma/marcel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "marcel"; - version = "0.28"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "geophile"; repo = "marcel"; rev = "refs/tags/v${version}"; - hash = "sha256-aJq8FAW1/Vo2x3st+/cxAzo4jHYPBDx/2i/2h1GVnrs="; + hash = "sha256-hUI5dUqelmRuk65s67rJXrZoPDWAcnNVIHlzxAgRExs="; }; nativeBuildInputs = with python3Packages; [ From fddba4acf312825e50ea292bd37e7883cd3d956a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:21:33 +0300 Subject: [PATCH 46/80] warp-terminal: 0.2024.06.11.08.02.stable_01 -> 0.2024.06.11.08.02.stable_03 Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.06.17-v0.2024.06.11.08.02 --- pkgs/by-name/wa/warp-terminal/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index c853e7b7681b..ed1b85f3755a 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-fUGCbOQXT22VGFpnmLxDLfEaNOk7hJq4BF1PU54swYg=", - "version": "0.2024.06.11.08.02.stable_01" + "hash": "sha256-ZfW4pTFmEEA/IRBfEMfnVDOxWm3SxGqUCec2nC6MADA=", + "version": "0.2024.06.11.08.02.stable_03" }, "linux": { - "hash": "sha256-5Ge6tNA4UnRfDhY7ki/3SIX3egkyWye9hHWEhObv/I8=", - "version": "0.2024.06.11.08.02.stable_01" + "hash": "sha256-xyE/Rc23+ael2oy0Hdq+kGzPYuq5+V8G3jAu3waA1Tk=", + "version": "0.2024.06.11.08.02.stable_03" } } From 1cfd74809b8342733e7b1ab453bb13d1dda49c87 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 5 Jun 2024 15:14:56 -0300 Subject: [PATCH 47/80] nixos/flood: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/torrent/flood.nix | 85 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/flood.nix | 27 ++++++ .../networking/p2p/flood/default.nix | 5 ++ 5 files changed, 119 insertions(+) create mode 100644 nixos/modules/services/torrent/flood.nix create mode 100644 nixos/tests/flood.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b20e98a9f229..a008c3c5bdea 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1316,6 +1316,7 @@ ./services/system/zram-generator.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix + ./services/torrent/flood.nix ./services/torrent/magnetico.nix ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix diff --git a/nixos/modules/services/torrent/flood.nix b/nixos/modules/services/torrent/flood.nix new file mode 100644 index 000000000000..213f4ef04648 --- /dev/null +++ b/nixos/modules/services/torrent/flood.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, utils, ... }: + +let + cfg = config.services.flood; +in +{ + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + + options.services.flood = { + enable = lib.mkEnableOption "flood"; + package = lib.mkPackageOption pkgs "flood" { }; + openFirewall = lib.mkEnableOption "" // { + description = "Whether to open the firewall for the port in {option}`services.flood.port`."; + }; + port = lib.mkOption { + type = lib.types.int; + description = "Port to bind webserver."; + default = 3000; + example = 3001; + }; + host = lib.mkOption { + type = lib.types.str; + description = "Host to bind webserver."; + default = "localhost"; + example = "::"; + }; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; + description = "Extra arguments passed to `flood`."; + default = [ ]; + example = [ "--baseuri=/" ]; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.flood = { + description = "A modern web UI for various torrent clients."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Documentation = "https://github.com/jesec/flood/wiki"; + }; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "3s"; + ExecStart = utils.escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "--host" + cfg.host + "--port" + (toString cfg.port) + "--rundir=/var/lib/flood" + ] ++ cfg.extraArgs); + + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + StateDirectory = "flood"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "@pkey" "~@privileged" ]; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.port + ]; + }; +} + diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 746b29fd2725..708332a9317b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -328,6 +328,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + flood = handleTest ./flood.nix {}; floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; diff --git a/nixos/tests/flood.nix b/nixos/tests/flood.nix new file mode 100644 index 000000000000..075d37e62835 --- /dev/null +++ b/nixos/tests/flood.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + port = 3001; +in +{ + name = "flood"; + meta = { + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; + }; + + nodes.machine = { pkgs, ... }: { + services.flood = { + inherit port; + enable = true; + openFirewall = true; + extraArgs = [ "--baseuri=/" ]; + }; + }; + + testScript = /* python */ '' + machine.start() + machine.wait_for_unit("flood.service") + machine.wait_for_open_port(${toString port}) + + machine.succeed("curl --fail http://localhost:${toString port}") + ''; +}) diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 85ef8b2130bb..ada2a69e6947 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -1,6 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub +, nixosTests }: buildNpmPackage rec { @@ -16,6 +17,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA="; + passthru.tests = { + inherit (nixosTests) flood; + }; + meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; From 6b15cd03874a84cc8858f73363abd7f6544ed1e7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 17 Jun 2024 16:43:33 +0000 Subject: [PATCH 48/80] nixos/doc: add services.flood to rl-2411 --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 889d39974932..ab02e6888f8d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -15,6 +15,8 @@ - [Quickwit](https://quickwit.io), sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit). +- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} From 2f88d77a06be6e94b846cf9146cd28b1505ade49 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 15 Jun 2024 13:35:24 +0000 Subject: [PATCH 49/80] qdrant-web-ui: init at 0.1.28 --- pkgs/by-name/qd/qdrant-web-ui/package.nix | 35 +++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/qd/qdrant-web-ui/package.nix diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix new file mode 100644 index 000000000000..333d9eed042d --- /dev/null +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -0,0 +1,35 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: +buildNpmPackage rec { + pname = "qdrant-web-ui"; + version = "0.1.28"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "qdrant-web-ui"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbr1PdoYcBxT7EOksLOPYNGz+GG5HVG406S+GRyWeiE="; + }; + + npmDepsHash = "sha256-8sk2QyunSrKE5/kjSoo0whdVbY9IXCF+n7ZIjP4Mgq8="; + + npmBuildScript = "build-qdrant"; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + meta = { + description = "Self-hosted web UI for Qdrant"; + homepage = "https://github.com/qdrant/qdrant-web-ui"; + changelog = "https://github.com/qdrant/qdrant-web-ui/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ xzfc ]; + platforms = lib.platforms.all; + }; +} From d4c3537f8e34ee85bd0dad969010aeb40c3d3ff8 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sat, 15 Jun 2024 13:36:12 +0000 Subject: [PATCH 50/80] qdrant: use qdrant-web-ui --- nixos/modules/services/search/qdrant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix index f28178a5f175..41a4e9b41f6d 100644 --- a/nixos/modules/services/search/qdrant.nix +++ b/nixos/modules/services/search/qdrant.nix @@ -60,6 +60,7 @@ in { config = mkIf cfg.enable { services.qdrant.settings = { + service.static_content_dir = mkDefault pkgs.qdrant-web-ui; storage.storage_path = mkDefault "/var/lib/qdrant/storage"; storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots"; # The following default values are the same as in the default config, From 9229155e8c7ff698536b24456250b605fa0ec087 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 13:32:41 +0000 Subject: [PATCH 51/80] halo: 2.16.2 -> 2.16.3 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index b7e8f17419fe..e66027b8dc7f 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-bHMcJvM+ZBjiGUAZzjnEupWW9L8viE/Ix8IK2y4KDoA="; + hash = "sha256-sl2b9zKugnCEMHyvEqBWZPidoANth5gRfh34NAaqg7A="; }; nativeBuildInputs = [ From 02be47641d5d09a1fd9385081f0fef2a98426f9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 13:33:29 +0000 Subject: [PATCH 52/80] maizzle: 1.5.8 -> 1.5.9 --- pkgs/development/tools/maizzle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix index f04536f76309..a33a845e7cd3 100644 --- a/pkgs/development/tools/maizzle/default.nix +++ b/pkgs/development/tools/maizzle/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "maizzle"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "maizzle"; repo = "cli"; rev = "v${version}"; - hash = "sha256-cSAYicgCgFpJO+2vBAqfl3od7B07DTXvkW38x6y5VgM="; + hash = "sha256-r3HWqfm/BdOfENi5cGdau7ockvNLxnWufWcQepI/RFM="; }; - npmDepsHash = "sha256-K9EQxqOjFzgTw/VXG2ZGF90yUzYTNl13Ssq9oiC+F7A="; + npmDepsHash = "sha256-WlqWOGwmSab+cJWPUFIBWuFwMK4lFQm80PoUfEIIIH8="; dontNpmBuild = true; From 15a60ad3b74c04d62b502aa4267cf5f762fbc7ef Mon Sep 17 00:00:00 2001 From: Redhawk18 Date: Tue, 18 Jun 2024 09:41:43 -0400 Subject: [PATCH 53/80] plexamp: 4.8.3 -> 4.10.1 --- pkgs/applications/audio/plexamp/default.nix | 17 +++++++++-------- .../audio/plexamp/update-plexamp.sh | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 29f8dd929bad..ec366f626b29 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,24 +2,25 @@ let pname = "plexamp"; - version = "4.8.3"; + version = "4.10.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - name="${pname}-${version}.AppImage"; - hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; + name = "${pname}-${version}.AppImage"; + hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop - install -m 444 -D ${appimageContents}/plexamp.png \ - $out/share/icons/hicolor/512x512/apps/plexamp.png + install -m 444 -D ${appimageContents}/plexamp.svg \ + $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; @@ -29,9 +30,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73"; license = licenses.unfree; - maintainers = with maintainers; [ killercup synthetica ]; + maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh index b6b8def1e310..44ad9b925014 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -5,7 +5,7 @@ set -Eeuxo pipefail cleanup() { - rm -rf "$TMPDIR" + rm -rf "$TMPDIR" } trap cleanup EXIT @@ -42,9 +42,10 @@ if diff "$DEFAULT_NIX" "$WORKING_NIX"; then fi # update sha hash (convenietly provided) -sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX" +sed -i "s@hash.* = .*;@hash = \"sha512-$SHA512\";@g" "$WORKING_NIX" # update the changelog ("just" increment the number) +# manually check that the changelog corresponds to our Plexamp version CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX) CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL) NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1)) From 69dbcc3f6ecfb2ca0c52ad2b5e36cd03e30db2f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 14:01:02 +0000 Subject: [PATCH 54/80] pm2: 5.4.0 -> 5.4.1 --- pkgs/by-name/pm/pm2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 12473ffc2196..20ad72df7853 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "pm2"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-hmciDjlmlIaqOWl9rYWQ6muq6LFzQb5tfpdzL0vV/ZM="; + hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4="; }; - npmDepsHash = "sha256-je+GwPkUiGPWgKQgSPlx2OEWMbDKdwEM/idTjgINLHY="; + npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA="; dontNpmBuild = true; From d5b88ef6013317468ce0d603fdf3df948cf3f4c9 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 18 Jun 2024 16:13:41 +0200 Subject: [PATCH 55/80] openmolcas: 24.02 -> 24.06 --- pkgs/applications/science/chemistry/openmolcas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 8ad979473955..d500e78b2482 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "openmolcas"; - version = "24.02"; + version = "24.06"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; rev = "v${version}"; - hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw="; + hash = "sha256-/y6vEvA1Zf+p7Z0WpcN4P5voLN8MmfbKz1FuthgVQp0="; }; patches = [ From e3e002e010451441f7b14bdd2da790bfd2821cd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 16:50:28 +0000 Subject: [PATCH 56/80] tuckr: 0.8.0 -> 0.8.1 --- pkgs/applications/misc/tuckr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index 6c9b527294b0..d660248deef8 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s="; + hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; }; - cargoHash = "sha256-aUhiMJUKV+Da3WLUY9Jr3oDB8yqcUm0pP05yKaITjM0="; + cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; From 3dd8a6d9d571b1af78847be2943411b6dadd076e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 16:51:27 +0000 Subject: [PATCH 57/80] rofimoji: 6.3.1 -> 6.3.2 --- pkgs/by-name/ro/rofimoji/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index f0c8339b9e35..610292c2105a 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "rofimoji"; - version = "6.3.1"; + version = "6.3.2"; pyproject = true; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - hash = "sha256-gYLUUbT6OHMo2nzJ//Pa0vZ9WPcHs6YnAjTKNO07VNk="; + hash = "sha256-LJJWHn3UnrCJaowHHuYksD2MHqClLc2MmYYXQfUxTgQ="; }; nativeBuildInputs = [ From bab20def476ecc8d7bc46122affd1712fc0fcb35 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 18 Jun 2024 13:23:58 -0400 Subject: [PATCH 58/80] lib.systems: Default `useLLVM` to true with OpenBSD too Not just FreeBSD. --- lib/systems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d37ff720edce..0981122388bb 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -81,7 +81,7 @@ let && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data - useLLVM = final.isFreeBSD; + useLLVM = final.isFreeBSD || final.isOpenBSD; libc = /**/ if final.isDarwin then "libSystem" From f55846c63cd473306d39b9592880dace17b6a1aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 17:52:56 +0000 Subject: [PATCH 59/80] typos: 1.22.3 -> 1.22.7 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index a908207182c0..b70e8448717b 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.3"; + version = "1.22.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-0al9U7UFqG/ljMtT2xJnyroRz4mGhvM7ZtIs/YkcNIs="; + hash = "sha256-417z9N8oC0kIqBs63fP/xdry5EFmlnyWDryKaJITtZQ="; }; - cargoHash = "sha256-Nn5ein7W4H58fIq8MZsGkwrF1zA5rTO95Uqe/VuL0W8="; + cargoHash = "sha256-Ol/pk3/9StHzEFHXcsSS9APUXf8hjnY7fwmF1mWtsVE="; meta = with lib; { description = "Source code spell checker"; From 2d8356a7112e9889e4d0dafb49fcd88477e896ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 18:09:12 +0000 Subject: [PATCH 60/80] python311Packages.pipdeptree: 2.22.0 -> 2.23.0 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index e7494472a12d..741408518899 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.22.0"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-Kvse8eSlhzIBJvvJ7KoV0FCf9muQHkFS4ozwWp0WLz0="; + hash = "sha256-Er47yUaRCtTYQOhttOMIaM2EFf0l5rMH5YV1kpMCDls="; }; build-system = [ From dc1bb1e780787e2dfa11b954bb77397dd2eb5fff Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 18 Jun 2024 14:03:12 -0400 Subject: [PATCH 61/80] release-cross.nix: test cross compilation to x86_64-openbsd It is less mature than the other two, but we are in the process of making it better, and caching helps. --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d6896155c920..4b41dc5bdcd2 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -258,6 +258,7 @@ in x86_64-freebsd = mapTestOnCross systems.examples.x86_64-freebsd common; x86_64-netbsd = mapTestOnCross systems.examples.x86_64-netbsd common; + x86_64-openbsd = mapTestOnCross systems.examples.x86_64-openbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far From b6727bbeac10eba4b4b157b51a8521390fc94f3c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 18 Jun 2024 13:34:16 -0400 Subject: [PATCH 62/80] netbsd: Fetch source once The big `fetchCVS` is slow, but a one-time cost. Everything else is much faster, and not having to manage a gazillion `version` and `sha256` fields is much easier. This brings NetBSD in line with how we do FreeBSD and OpenBSD. --- pkgs/os-specific/bsd/netbsd/default.nix | 34 +++++++------------ pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/column.nix | 6 +--- pkgs/os-specific/bsd/netbsd/pkgs/common.nix | 3 -- .../bsd/netbsd/pkgs/compat/package.nix | 19 ++++------- pkgs/os-specific/bsd/netbsd/pkgs/config.nix | 4 +-- pkgs/os-specific/bsd/netbsd/pkgs/csu.nix | 6 ++-- pkgs/os-specific/bsd/netbsd/pkgs/dict.nix | 2 -- .../bsd/netbsd/pkgs/fts/package.nix | 11 ++---- pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix | 6 +--- pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix | 6 +--- pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix | 6 +--- .../bsd/netbsd/pkgs/getent/package.nix | 2 -- .../bsd/netbsd/pkgs/i18n_module.nix | 4 +-- pkgs/os-specific/bsd/netbsd/pkgs/include.nix | 5 +-- .../bsd/netbsd/pkgs/install/package.nix | 6 ++-- .../os-specific/bsd/netbsd/pkgs/ld_elf_so.nix | 4 +-- pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libc.nix | 7 +--- pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix | 2 -- .../os-specific/bsd/netbsd/pkgs/libcurses.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libm.nix | 4 +-- .../bsd/netbsd/pkgs/libossaudio.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix | 4 +-- .../bsd/netbsd/pkgs/libpthread/base.nix | 6 +--- .../bsd/netbsd/pkgs/libpthread/package.nix | 9 +++-- .../os-specific/bsd/netbsd/pkgs/libresolv.nix | 4 +-- .../os-specific/bsd/netbsd/pkgs/librpcsvc.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/librt.nix | 4 +-- .../bsd/netbsd/pkgs/libterminfo.nix | 7 +--- pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix | 9 ++--- .../bsd/netbsd/pkgs/locale/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix | 2 -- .../bsd/netbsd/pkgs/make-rules.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/make.nix | 7 +--- .../bsd/netbsd/pkgs/makeMinimal.nix | 4 +-- pkgs/os-specific/bsd/netbsd/pkgs/man.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/misc.nix | 2 -- .../bsd/netbsd/pkgs/mkDerivation.nix | 25 ++++++++++---- pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix | 6 +--- pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix | 4 +-- pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix | 6 +--- .../netbsd/pkgs/netbsdSetupHook/setup-hook.sh | 10 ------ pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix | 6 +--- pkgs/os-specific/bsd/netbsd/pkgs/source.nix | 12 +++++++ .../bsd/netbsd/pkgs/stat/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix | 5 +-- .../bsd/netbsd/pkgs/sys/headers.nix | 2 -- .../bsd/netbsd/pkgs/sys/package.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/tic.nix | 9 ++--- pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix | 2 -- pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix | 2 -- 53 files changed, 90 insertions(+), 216 deletions(-) delete mode 100644 pkgs/os-specific/bsd/netbsd/pkgs/common.nix create mode 100644 pkgs/os-specific/bsd/netbsd/pkgs/source.nix diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e0d03108960c..5f5ec212f269 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -17,15 +17,7 @@ makeScopeWithSplicing' { directory = ./pkgs; } // { - - fetchNetBSD = - path: version: sha256: - fetchcvs { - cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; - module = "src/${path}"; - inherit sha256; - tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; - }; + version = "9.2"; defaultMakeFlags = [ "MKSOFTFLOAT=${ @@ -151,18 +143,18 @@ makeScopeWithSplicing' { inherit (buildPackages.buildPackages) rsync; }; - _mainLibcExtraPaths = with self; [ - common - i18n_module.src - sys.src - ld_elf_so.src - libpthread.src - libm.src - libresolv.src - librpcsvc.src - libutil.src - librt.src - libcrypt.src + _mainLibcExtraPaths = [ + "common" + "lib/i18n_module" + "lib/libcrypt" + "lib/libm" + "lib/libpthread" + "lib/libresolv" + "lib/librpcsvc" + "lib/librt" + "lib/libutil" + "libexec/ld.elf_so" + "sys" ]; libc = self.callPackage ./pkgs/libc.nix { diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix index a2ec387501ae..a95df55874e4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/cksum"; - version = "9.2"; - sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix index f3cebfa9ab26..a51369433f6c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/column"; - version = "9.2"; - sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; -} +mkDerivation { path = "usr.bin/column"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix b/pkgs/os-specific/bsd/netbsd/pkgs/common.nix deleted file mode 100644 index 464fc1c9e0c2..000000000000 --- a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ fetchNetBSD }: - -fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9" diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 4c149e95c1ae..91a2bb8755c8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -14,19 +14,16 @@ netbsdSetupHook, makeMinimal, rsync, - fetchNetBSD, _mainLibcExtraPaths, + version, }: mkDerivation ( let - version = "9.2"; commonDeps = [ zlib ]; in { path = "tools/compat"; - sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; - inherit version; setupHooks = [ ../../../../../build-support/setup-hooks/role.bash @@ -133,14 +130,12 @@ mkDerivation ( --subst-var-by version ${version} ''; extraPaths = [ - include.src - libc.src - libutil.src - (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") - (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") - (fetchNetBSD "common/include/rpc/types.h" "9.2" - "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a" - ) + include.path + libc.path + libutil.path + "external/bsd/flex" + "sys/sys" + "common/include/rpc/types.h" ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; } ) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix index c423f3ca8676..272e9065b29b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -13,8 +13,6 @@ }: mkDerivation { path = "usr.bin/config"; - version = "9.2"; - sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = [ bsdSetupHook @@ -27,5 +25,5 @@ mkDerivation { rsync ]; buildInputs = compatIfNeeded; - extraPaths = [ cksum.src ]; + extraPaths = [ cksum.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix index 66443331490f..a0d7ca419c1c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -22,8 +22,6 @@ mkDerivation { path = "lib/csu"; - version = "9.2"; - sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ bsdSetupHook @@ -43,7 +41,7 @@ mkDerivation { ]; buildInputs = [ headers ]; extraPaths = [ - sys.src - ld_elf_so.src + sys.path + ld_elf_so.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix index 0d7d026dd21d..8d27f29a75e5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/dict"; noCC = true; - version = "9.2"; - sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix index 7c64658bf2e5..57fc0633b088 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -4,14 +4,11 @@ netbsdSetupHook, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { pname = "fts"; path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "9.2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -19,11 +16,9 @@ mkDerivation { ]; propagatedBuildInputs = compatIfNeeded; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.2" - "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc" - ) - (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + "lib/libc/gen/fts.c" + "lib/libc/include/namespace.h" + "lib/libc/gen/fts.3" ]; skipIncludesPhase = true; buildPhase = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix index 7f81a77a02dd..9eed584b29ae 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/genassym"; - version = "9.2"; - sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; -} +mkDerivation { path = "usr.bin/genassym"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix index 411be85e91e2..ea701b6404ec 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/gencat"; - version = "9.2"; - sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; -} +mkDerivation { path = "usr.bin/gencat"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix index c8483d454b87..2feb6495ccf8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/getconf"; - sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "9.2"; -} +mkDerivation { path = "usr.bin/getconf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix index 7a9acb1e0a9e..b6a4efad4ac9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/getent"; - sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; - version = "9.2"; patches = [ ./getent.patch ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix index c76ada865775..066d9f236f9b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/i18n_module"; - version = "9.2"; - sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix index ec316a63174f..6df34b96095e 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -10,15 +10,12 @@ rsync, nbperf, rpcgen, - common, defaultMakeFlags, stdenv, }: mkDerivation { path = "include"; - version = "9.2"; - sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -46,7 +43,7 @@ mkDerivation { makeFlags=''${makeFlags/INCSDIR/INCSDIR0} ''; - extraPaths = [ common ]; + extraPaths = [ "common" ]; headersOnly = true; noCC = true; meta.platforms = lib.platforms.netbsd; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index 0fc6ca452be0..2dbec08f15e8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -26,11 +26,9 @@ let in mkDerivation { path = "usr.bin/xinstall"; - version = "9.2"; - sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ - mtree.src - make.src + mtree.path + make.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix index a350e81d3206..7f25ce097ff0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix @@ -7,8 +7,6 @@ mkDerivation { path = "libexec/ld.elf_so"; - version = "9.2"; - sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; LIBC_PIC = "${libc}/lib/libc_pic.a"; # Hack to prevent a symlink being installed here for compatibility. @@ -18,5 +16,5 @@ mkDerivation { "BINDIR=$(out)/libexec" "CLIBOBJ=${libc}/lib" ]; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix index 93ea02f8a17c..457ea6fa48d9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libarch"; - version = "9.2"; - sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index d755e4b6870a..cf71857776d8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -3,7 +3,6 @@ mkDerivation, defaultMakeFlags, _mainLibcExtraPaths, - fetchNetBSD, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -26,13 +25,9 @@ mkDerivation { path = "lib/libc"; - version = "9.2"; - sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; USE_FORT = "yes"; MKPROFILE = "no"; - extraPaths = _mainLibcExtraPaths ++ [ - (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") - ]; + extraPaths = _mainLibcExtraPaths ++ [ "external/bsd/jemalloc" ]; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix index c5f9deff589c..abcb2cfb14fb 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix @@ -2,8 +2,6 @@ mkDerivation { path = "lib/libcrypt"; - version = "9.2"; - sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 5072821db911..8d61bcfdf7d9 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libcurses"; - version = "9.2"; - sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = [ libterminfo ]; env.NIX_CFLAGS_COMPILE = toString ( [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index ee1e7bf79f96..cb9951cb8cf1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libedit"; - version = "9.2"; - sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; buildInputs = [ libterminfo libcurses diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix index f36e97f8e6ae..8a2304cacbca 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix @@ -6,9 +6,7 @@ mkDerivation { path = "lib/libm"; - version = "9.2"; - sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix index 51bbc216e204..a74176db68cd 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libossaudio"; - version = "9.2"; - sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix index b0be4a2da723..69d1ff5accca 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix @@ -7,9 +7,7 @@ mkDerivation { pname = "libpci"; path = "lib/libpci"; - version = "9.2"; - sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix index d8ea7c553eba..08c298c0fe5d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix @@ -1,5 +1 @@ -{ - path = "lib/libpthread"; - version = "9.2"; - sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; -} +{ path = "lib/libpthread"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix index 88d392e20b4a..28665b351f88 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -2,7 +2,6 @@ lib, mkDerivation, headers, - common, libc, librt, sys, @@ -18,10 +17,10 @@ mkDerivation ( buildInputs = [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; extraPaths = [ - common - libc.src - librt.src - sys.src + "common" + libc.path + librt.path + sys.path ]; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix index 24bc4f2f9e00..7db4948e6939 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/libresolv"; - version = "9.2"; - sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix index 8d757a8a8430..3f2d392ba8c5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix @@ -14,8 +14,6 @@ mkDerivation { path = "lib/librpcsvc"; - version = "9.2"; - sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix index fa0229953b66..4e4bf0bc5ac4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix @@ -7,10 +7,8 @@ mkDerivation { path = "lib/librt"; - version = "9.2"; - sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; postPatch = '' sed -i 's,/usr\(/include/sys/syscall.h\),${headers}\1,g' \ $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix index 6ac573d865b1..6e7b59df2ed5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -12,13 +12,10 @@ tic, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { path = "lib/libterminfo"; - version = "9.2"; - sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -45,7 +42,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") - ]; + extraPaths = [ "share/terminfo" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index fdc57df9c231..d5bf075fc5e7 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -1,6 +1,5 @@ { mkDerivation, - common, libc, sys, bsdSetupHook, @@ -18,12 +17,10 @@ mkDerivation { path = "lib/libutil"; - version = "9.2"; - sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = [ - common - libc.src - sys.src + "common" + libc.path + sys.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix index 3c61e8517b35..e3e06ba1a152 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix @@ -2,8 +2,6 @@ mkDerivation { path = "usr.bin/locale"; - version = "9.2"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix index 0b99a794b07a..836fa7500e57 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/lorder"; - version = "9.2"; - sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix index 66086c01c233..a1e8d1482c21 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix @@ -9,8 +9,6 @@ mkDerivation { path = "share/mk"; - sha256 = "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy"; - version = "9.2"; noCC = true; buildInputs = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 4d0b9f4b4cf2..9612ca7ff489 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,15 +1,12 @@ { lib, mkDerivation, - fetchNetBSD, stdenv, make-rules, }: mkDerivation { path = "usr.bin/make"; - sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; - version = "9.2"; postPatch = make-rules.postPatch @@ -21,7 +18,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; - extraPaths = [ - (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") - ]; + extraPaths = [ "share/mk" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix index 62a4d4a6a124..ad70b6b8cd07 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -9,8 +9,6 @@ mkDerivation { path = "tools/make"; - sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; - version = "9.2"; buildInputs = [ ]; nativeBuildInputs = [ @@ -47,5 +45,5 @@ mkDerivation { runHook postInstall ''; - extraPaths = [ make.src ]; + extraPaths = [ make.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix index bce5bcee6694..527c547fdaad 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix @@ -3,8 +3,6 @@ mkDerivation { path = "share/man"; noCC = true; - version = "9.2"; - sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; # man0 generates a man.pdf using ps2pdf, but doesn't install it later, # so we can avoid the dependency on ghostscript postPatch = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix index 7f96f4d1495a..726acf27d50b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/misc"; noCC = true; - version = "9.2"; - sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index 849d2b1da3fb..f4f103087587 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -1,8 +1,11 @@ { lib, - stdenvNoCC, stdenv, - fetchNetBSD, + stdenvNoCC, + crossLibcStdenv, + runCommand, + rsync, + source, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -12,9 +15,9 @@ mandoc, groff, statHook, - rsync, compatIfNeeded, defaultMakeFlags, + version, }: lib.makeOverridable ( @@ -23,10 +26,20 @@ lib.makeOverridable ( stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ( - { + rec { pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; - inherit (attrs) version; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; + inherit version; + src = runCommand "${pname}-filtered-src" { nativeBuildInputs = [ rsync ]; } '' + for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [ ])}; do + set -x + path="$out/$p" + mkdir -p "$(dirname "$path")" + src_path="${source}/$p" + if [[ -d "$src_path" ]]; then src_path+=/; fi + rsync --chmod="+w" -r "$src_path" "$path" + set +x + done + ''; extraPaths = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix index 5c4c172e40a7..bf7d8b7db689 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "sbin/mknod"; - version = "9.2"; - sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; -} +mkDerivation { path = "sbin/mknod"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix index 723da3ad891b..8310941c7cb2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.sbin/mtree"; - version = "9.2"; - sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; - extraPaths = [ mknod.src ]; + extraPaths = [ mknod.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix index a23c5dddfc9f..3b52eae96c3b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/nbperf"; - version = "9.2"; - sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; -} +mkDerivation { path = "usr.bin/nbperf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index ef00ea418e53..8c3742a76534 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh @@ -1,16 +1,6 @@ -mergeNetBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this - chmod -R u+w $BSDSRCDIR - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $BSDSRCDIR/ - done -} - addNetBSDMakeFlags() { makeFlags="INCSDIR=${!outputDev}/include $makeFlags" makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" } -postUnpackHooks+=(mergeNetBSDSourceDir) preConfigureHooks+=(addNetBSDMakeFlags) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix index b1482d4dff11..dc6ceb7bd634 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/rpcgen"; - version = "9.2"; - sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; -} +mkDerivation { path = "usr.bin/rpcgen"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix new file mode 100644 index 000000000000..432de84ffb3e --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix @@ -0,0 +1,12 @@ +{ + lib, + fetchcvs, + version, +}: + +fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src"; + tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; + sha256 = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; +} diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix index 397b1f5303c1..522a7a1837b1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -14,8 +14,6 @@ mkDerivation { path = "usr.bin/stat"; - version = "9.2"; - sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index 4c140fa3bdef..6a6f8a503276 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -14,12 +14,9 @@ config, genassym, defaultMakeFlags, - common, }: { path = "sys"; - version = "9.2"; - sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; # Make the build ignore linker warnings prePatch = '' @@ -89,5 +86,5 @@ ''; meta.platforms = lib.platforms.netbsd; - extraPaths = [ common ]; + extraPaths = [ "common" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix index 2df35efc199a..65fabedfcb45 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix index c8e6edab5f48..cb691dc87855 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix index e0900652108f..f71df930ce1c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -11,13 +11,10 @@ compatIfNeeded, defaultMakeFlags, libterminfo, - fetchNetBSD, }: mkDerivation { path = "tools/tic"; - version = "9.2"; - sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = compatIfNeeded; nativeBuildInputs = [ @@ -32,8 +29,8 @@ mkDerivation { ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = [ - libterminfo.src - (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") - (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") + libterminfo.path + "usr.bin/tic" + "tools/Makefile.host" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix index 9200bc57a73e..b1ab320da0c8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/tsort"; - version = "9.2"; - sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index 7592db3eaf18..1e58df16ceee 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -6,8 +6,6 @@ mkDerivation { path = "usr.bin/uudecode"; - version = "9.2"; - sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; } From 1ff1a32e9c1dacd4789d9079213f21ac28c353e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 18:18:45 +0000 Subject: [PATCH 63/80] gmid: 2.0.4 -> 2.0.5 --- pkgs/by-name/gm/gmid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index 6c73773b6e11..f6f9996b7383 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-ioyQS5jjOICAWtZG8no+WUmLybEVLvum6TFFFdnMdfY="; + hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc="; }; nativeBuildInputs = [ bison ]; From faa579e444360ed3ff5b4746251e2722b8f99b78 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 18 Jun 2024 11:30:16 -0700 Subject: [PATCH 64/80] nixos/systemd-boot: guard assertion messages against eval failures These messages should be able to be printed in all cases. In particular, trying to coerce a `null` to a string is an error unless passed through `toString`. --- .../system/boot/loader/systemd-boot/systemd-boot.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index cee8663f0040..e73048dc2ecb 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -323,15 +323,15 @@ in { assertions = [ { assertion = (hasPrefix "/" efi.efiSysMountPoint); - message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path"; + message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'"; } { assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; From 646211cda415928929417bf4329c5bc870a69028 Mon Sep 17 00:00:00 2001 From: Anillc Date: Wed, 19 Jun 2024 03:21:58 +0800 Subject: [PATCH 65/80] vscode-extensions.banacorn.agda-mode: init at 0.4.7 Release: https://github.com/banacorn/agda-mode-vscode/releases/tag/v0.4.7 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b8ee9984adc4..3f822ee9dc8e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -484,6 +484,23 @@ let }; }; + banacorn.agda-mode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "banacorn"; + name = "agda-mode"; + version = "0.4.7"; + hash = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; + description = "agda-mode on VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=banacorn.agda-mode"; + homepage = "https://github.com/banacorn/agda-mode-vscode"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.mit; + }; + }; + batisteo.vscode-django = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "batisteo"; From 96609c3a56020c706fe4f2ed8c60a8a6b8a169f6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 6 Jun 2024 17:21:58 +0200 Subject: [PATCH 66/80] osmo-[bsc,ggsn,sgsn,hlr]: add mainProgram to meta --- pkgs/servers/osmocom/osmo-bsc/default.nix | 1 + pkgs/servers/osmocom/osmo-ggsn/default.nix | 1 + pkgs/servers/osmocom/osmo-hlr/default.nix | 1 + pkgs/servers/osmocom/osmo-sgsn/default.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 1f9a6cabbf18..1df6e7dd4c3b 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-bsc"; }; } diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index ce902e29c256..51615fdb1b3c 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-ggsn"; }; } diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 6dce9cd84d40..112e3c873902 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-hlr"; }; } diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index d74ca535e140..9529c4f50cad 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-sgsn"; }; } From b299dc5d3bed1db7928147dcda0139591623358f Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 18 Jun 2024 22:29:08 +0300 Subject: [PATCH 67/80] virt-manager: cherry-pick fix for weird cursor theme related crash Fixes #320855, aka #207496, aka virt-manager/virt-manager#479 --- pkgs/applications/virtualization/virt-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3cbc285076fe..c8bedb1e9569 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -28,6 +28,11 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch"; hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE="; }) + # fix crash with some cursor themes + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch"; + hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws="; + }) ]; nativeBuildInputs = [ From 492c47de9d837ff446337613483f966893570b4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 19:40:18 +0000 Subject: [PATCH 68/80] nhost-cli: 1.18.2 -> 1.18.3 --- pkgs/by-name/nh/nhost-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index bc8a14d9a496..d3a88416983d 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WIkuYmNXpKLsHY6de6PDa56NFTkgpXt1aGouJrEiyUo="; + hash = "sha256-TYi0Cth4GWEIT9QRUC4z3Uwnh4EmywY+XCOM5oJP+4g="; }; vendorHash = null; From ebc9de3e472192a17bd0b7352fb173d926aaa4f2 Mon Sep 17 00:00:00 2001 From: Anillc Date: Wed, 19 Jun 2024 03:44:12 +0800 Subject: [PATCH 69/80] vscode-extensions.mesonbuild.mesonbuild: init at 1.24.0 Release: https://github.com/mesonbuild/vscode-meson/releases/tag/v1.24.0 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b8ee9984adc4..09f14f2ecd16 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2930,6 +2930,23 @@ let }; }; + mesonbuild.mesonbuild = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mesonbuild"; + name = "mesonbuild"; + version = "1.24.0"; + hash = "sha256-n7c2CUiTIej2Y/QMGWpv6anuCDjqpo2W+hJylfvvMVE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog"; + description = "Meson language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mesonbuild.mesonbuild"; + homepage = "https://github.com/mesonbuild/vscode-meson"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.asl20; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { From b87a5f8a15ef07c50ad873ca148189f1ef0e5654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 19:45:12 +0000 Subject: [PATCH 70/80] kubefirst: 2.4.9 -> 2.4.10 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 9bcc77663d5c..7183fb8885b2 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-BuGE+SVLklToKnH7pptfuHqwddncUQq523RZtfmtkLg="; + hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0="; }; - vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; + vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw="; ldflags = [ "-s" From f4423979dea598216dc0270aa9421196bb2ffe70 Mon Sep 17 00:00:00 2001 From: Xandor Schiefer Date: Tue, 18 Jun 2024 22:23:00 +0200 Subject: [PATCH 71/80] vscode-js-debug: fix missing jq in postPatch Fixes #320507. The `npmConfigHook` used by `buildNpmPackage` does not correctly propagate the `nativeBuildInputs` into its `PATH`, which is why `jq` was not available during the patch phase. Since this `npmConfigHook` is run as part of a fixed-output derivation (`fetchNpmDeps`), if it had already been realised, unless its hash had changed, a missing `jq` would not be noticed, on a rebuild of `vscode-js-debug`. The `postPatch` hook is *also* run during `buildNpmPackage`, but there the `nativeBuildInputs` were correctly added to the `PATH`, which is why a rebuild of `vscode-js-debug` with the previous `postPatch` would succeed (if its `npmDeps`'s hash hadn't changed). --- pkgs/by-name/vs/vscode-js-debug/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 613350da9b8d..542b5cbfc811 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub -, jq +, buildPackages , libsecret , pkg-config , nodePackages @@ -23,12 +23,12 @@ buildNpmPackage rec { npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM="; - nativeBuildInputs = [ pkg-config nodePackages.node-gyp jq ]; + nativeBuildInputs = [ pkg-config nodePackages.node-gyp ]; buildInputs = [ libsecret ]; postPatch = '' - jq ' + ${lib.getExe buildPackages.jq} ' .scripts.postinstall |= empty | # tries to install playwright, not necessary for build .scripts.build |= "gulp dapDebugServer" | # there is no build script defined .bin |= "./dist/src/dapDebugServer.js" # there is no bin output defined From 83b00c3637b03fd7d1dbea3d988fd2207652c253 Mon Sep 17 00:00:00 2001 From: Aria Date: Tue, 18 Jun 2024 21:33:38 +0100 Subject: [PATCH 72/80] akkoma: remove maintainer tcmal (#320858) --- maintainers/maintainer-list.nix | 6 ------ nixos/modules/services/web-apps/akkoma.nix | 2 +- pkgs/servers/akkoma/default.nix | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8835e8c91403..bf8d0981a5f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19621,12 +19621,6 @@ githubId = 2389333; name = "Andy Tockman"; }; - tcmal = { - email = "me@aria.rip"; - github = "tcmal"; - githubId = 4183876; - name = "Aria Shrimpton"; - }; teatwig = { email = "nix@teatwig.net"; name = "tea"; diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 338e7c738338..8ba3c7eaa1e6 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -1136,6 +1136,6 @@ in { }; }; - meta.maintainers = with maintainers; [ mvs tcmal ]; + meta.maintainers = with maintainers; [ mvs ]; meta.doc = ./akkoma.md; } diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 472089bbafae..ec69767338aa 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -222,7 +222,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; license = licenses.agpl3Only; - maintainers = with maintainers; [ mvs tcmal ]; + maintainers = with maintainers; [ mvs ]; platforms = platforms.unix; }; } From 14925a6a2c08ee4e061de9aed94b2f398679aafe Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Tue, 18 Jun 2024 22:01:52 +0200 Subject: [PATCH 73/80] tparse: init at 0.13.3 --- pkgs/by-name/tp/tparse/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/tp/tparse/package.nix diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix new file mode 100644 index 000000000000..981f536a16c6 --- /dev/null +++ b/pkgs/by-name/tp/tparse/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + pname = "tparse"; + version = "0.13.3"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "mfridman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MTaxEWRNAXem/DIirrd53YEHA/A5S4wNX4osuMV3gtc="; + }; + + vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA="; + + meta = { + description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly"; + mainProgram = "tparse"; + homepage = "https://github.com/mfridman/tparse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obreitwi ]; + }; +} From ee342570b3b6f98caff6f7756052bd0d1704f534 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 19:05:21 +0000 Subject: [PATCH 74/80] python311Packages.robotframework: 7.0 -> 7.0.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index ea323ac63455..b961d6ca0726 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-IyOm2MTHj2rOew/IkyGIfI4XZSFU88+Tx8KHKIRT2G4="; + hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE="; }; nativeBuildInputs = [ setuptools ]; From 1e810b1047c9fb76d9882a86615147a7c9bac7f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jun 2024 21:34:23 +0000 Subject: [PATCH 75/80] cirrus-cli: 0.119.0 -> 0.119.1 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index d3cbb676757f..e50259bed236 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BdCsm6ciQsfmrQOxOWPTfNbWXhnJzXBmHEUkPD/FobU="; + sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; }; vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; From 6819f38e5c48d7c1aec9e69e85ab74067619be24 Mon Sep 17 00:00:00 2001 From: Niko Cantero <97130632+nyabinary@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:22:05 -0400 Subject: [PATCH 76/80] goofcord: 1.4.2 -> 1.4.3 --- pkgs/by-name/go/goofcord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index d4103a09a08e..57819ebfbc0f 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.4.2"; + version = "1.4.3"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-amd64.deb"; - hash = "sha256-fUP/se3hOhs+aAoew25YhRyxnodYPrgqN68RIg1A1Kw="; + hash = "sha256-XO/T5O6+hJ6QT8MCVorrdXPZZlrywa6u0UKPk9WIQBE="; }; aarch64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-arm64.deb"; - hash = "sha256-hVpXmBSIgoON683f/sRtmpHwqxcO6IrFCCRPZjsUqjw="; + hash = "sha256-4mJ3kDQ+eh9LnyzxyNYvd2hMmgiJtBMXKup7ILlHk0Y="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From d6670b9d92df578d6ee05bc386dbf4ec8543eed3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 00:31:46 +0200 Subject: [PATCH 77/80] python313Packages.humanfriendly: replace pipes module usage It was deprecated in 3.11 and removed in 3.13. --- .../development/python-modules/humanfriendly/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 766fb1339159..f4761c2e2a49 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, }: buildPythonPackage rec { @@ -14,6 +15,14 @@ buildPythonPackage rec { sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; + patches = [ + (fetchpatch2 { + # https://github.com/xolox/python-humanfriendly/pull/75 + url = "https://github.com/musicinmybrain/python-humanfriendly/commit/13d05b8057010121acd2a402a337ef4ee5834062.patch"; + hash = "sha256-m7cySiIx0gNhh6KKhT71DJFOtFu2Copk9ic2yaiCulk="; + }) + ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( From 4707354446e4b5e5a47fce883238c37247927ff9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 00:33:04 +0200 Subject: [PATCH 78/80] python312Packages.humanfriendly: use pep517 builder --- pkgs/development/python-modules/humanfriendly/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index f4761c2e2a49..8c217e3ac228 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -3,12 +3,13 @@ buildPythonPackage, fetchPypi, fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "humanfriendly"; version = "10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -23,6 +24,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( From a1f575ab06d868512371f8f4c535593a76e5b849 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 01:31:02 +0200 Subject: [PATCH 79/80] python312Packages.bork: relax build constraint --- pkgs/development/python-modules/bork/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index d3368634604d..b48ff6603f33 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "build" "packaging" "readme-renderer" "twine" From 41d281fc4cd47d2e3f38a5114b661b7f3c962bd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 01:53:24 +0200 Subject: [PATCH 80/80] python312Packages.spsdk: relax requests constraint --- pkgs/development/python-modules/spsdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index fdc74f982c29..0e0d56aa027e 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { "click" "cryptography" "platformdirs" + "requests" "typing-extensions" ];