From a70e411d48b0c70ba4f0e4024e205f429bbb94fd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 2 Sep 2025 19:21:41 -0500 Subject: [PATCH 01/34] oh-my-posh: 26.8.0 -> 26.20.1 Changelog: https://github.com/JanDeDobbeleer/oh-my-posh/releases/tag/v26.20.1 Signed-off-by: Austin Horstman --- pkgs/by-name/oh/oh-my-posh/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 6f734f481bd6..d737b338ba7d 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "oh-my-posh"; - version = "26.8.0"; + version = "26.20.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "oh-my-posh"; tag = "v${version}"; - hash = "sha256-CWc9i+QGdcp+6eRfctn4oJFaQOy8D+jDTHTmUzBXez4="; + hash = "sha256-7xwPL13lZhS6A5c7PEEYeBi/XVLdgttxUK03+tT+uso="; }; - vendorHash = "sha256-oqsQbcvcgid6odTZY7m74NNilBpukEmifqZGx+xeEXA="; + vendorHash = "sha256-wzgPQN3Y0e4CpJzWfNKCoDrUF4oC0Flx4Bhxt5Bx6XY="; sourceRoot = "${src.name}/src"; @@ -34,7 +34,7 @@ buildGoModule rec { postPatch = '' # these tests requires internet access - rm image/image_test.go config/migrate_glyphs_test.go upgrade/notice_test.go segments/upgrade_test.go + rm cli/image/image_test.go config/migrate_glyphs_test.go cli/upgrade/notice_test.go segments/upgrade_test.go ''; postInstall = '' From 0d68dcfa60f8f0d267d85130ba8527609fa9e9d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 07:53:20 +0000 Subject: [PATCH 02/34] ooniprobe-cli: 3.26.0 -> 3.27.0 --- pkgs/by-name/oo/ooniprobe-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oo/ooniprobe-cli/package.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix index 91876ac95547..3789fdc11a19 100644 --- a/pkgs/by-name/oo/ooniprobe-cli/package.nix +++ b/pkgs/by-name/oo/ooniprobe-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; tag = "v${version}"; - hash = "sha256-CTrjr3f7x2xtKvo/pO2BRVCl/5osI7seKY0lwSLvQhg="; + hash = "sha256-dVYxq/ojE3nPxdkQEXocJJKNXeaaS+Sdq+CO8j5M5jM="; }; - vendorHash = "sha256-ZQIuRZdS96mO72JyVUQ0lIost6ZgBPqRvTYpWl6grxY="; + vendorHash = "sha256-JnvP0PUOYNJLBpY9BWlC6cJ+Sor2gxDgSKJ8KnUctWc="; subPackages = [ "cmd/ooniprobe" ]; From 0bf4918595af9da07e021434d1508564b7bb0bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 13:35:55 +0000 Subject: [PATCH 03/34] beeper: 4.1.135 -> 4.1.169 --- pkgs/by-name/be/beeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 36d0be40a5dd..e37360f3d9a9 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.1.135"; + version = "4.1.169"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-bp0RGU689A8kgphNgJJnlbQBh1fAubwWUvM9StzLwB4="; + hash = "sha256-ZtFyIRhDpf8R/0aWhA83JqKjpNoxgAPVDesE1jRGVH8="; }; appimageContents = appimageTools.extract { inherit pname version src; From 01ff5dbb4a007e42cc25e6c2832d376501aeee74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 14:46:51 +0000 Subject: [PATCH 04/34] cista: 0.15 -> 0.16 --- pkgs/by-name/ci/cista/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cista/package.nix b/pkgs/by-name/ci/cista/package.nix index b1822ae7bbd0..d5338afc7b72 100644 --- a/pkgs/by-name/ci/cista/package.nix +++ b/pkgs/by-name/ci/cista/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cista"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "felixguendling"; repo = "cista"; rev = "v${version}"; - sha256 = "sha256-+DcxnckoXVSc+gXt21fxKkx4J1khLsQPuxYH9CBRrfE="; + sha256 = "sha256-Q7IDQckFa/iMZ/f3Bim/yWyKCGqsNxJJ5C9PTToFZYI="; }; nativeBuildInputs = [ cmake ]; From 7d00bc8d8c5607cc32e8661fafac1ab7a4d83f8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Sep 2025 20:51:59 +0200 Subject: [PATCH 05/34] python313Packages.beanhub-inbox: init at 0.2.3 Email processing engine for archiving and extracting financial data with LLM https://github.com/LaunchPlatform/beanhub-inbox --- .../python-modules/beanhub-inbox/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/beanhub-inbox/default.nix diff --git a/pkgs/development/python-modules/beanhub-inbox/default.nix b/pkgs/development/python-modules/beanhub-inbox/default.nix new file mode 100644 index 000000000000..af98ff441e3b --- /dev/null +++ b/pkgs/development/python-modules/beanhub-inbox/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + email-validator, + fetchFromGitHub, + hatchling, + jinja2, + lxml, + ollama, + pydantic, + pytest-dotenv, + pytest-factoryboy, + pytest-mock, + pytestCheckHook, + pyyaml, +}: + +buildPythonPackage rec { + pname = "beanhub-inbox"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "LaunchPlatform"; + repo = "beanhub-inbox"; + tag = version; + hash = "sha256-WWfZsJRm2rJI85vmFt/AtV++5vpSTJZpRrk3PdHMhAA="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + email-validator + jinja2 + lxml + ollama + pydantic + pyyaml + ]; + + nativeCheckInputs = [ + pytest-dotenv + pytest-factoryboy + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "beanhub_inbox" ]; + + meta = { + description = "Email processing engine for archiving and extracting financial data with LLM"; + homepage = "https://github.com/LaunchPlatform/beanhub-inbox"; + changelog = "https://github.com/LaunchPlatform/beanhub-inbox/releases/tag${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 868696153ff8..af7cc5fab53b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1805,6 +1805,8 @@ self: super: with self; { beanhub-import = callPackage ../development/python-modules/beanhub-import { }; + beanhub-inbox = callPackage ../development/python-modules/beanhub-inbox { }; + beanquery = callPackage ../development/python-modules/beanquery { }; beanstalkc = callPackage ../development/python-modules/beanstalkc { }; From 26b22f45a65806ee1e140e9643a1d8de423465d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Sep 2025 21:00:52 +0200 Subject: [PATCH 06/34] python313Packages.beanhub-cli: add beanhub-inbox --- .../python-modules/beanhub-cli/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 178476f284b9..5b814c7023c8 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -3,17 +3,17 @@ fetchFromGitHub, buildPythonPackage, pythonOlder, - pytestCheckHook, + hatchling, # dependencies beancount-black, beancount-parser, beanhub-forms, beanhub-import, + beanhub-inbox, click, fastapi, jinja2, - poetry-core, pydantic-settings, pydantic, pyyaml, @@ -31,10 +31,11 @@ tomli, # tests - pytest, pytest-asyncio, + pytest-factoryboy, pytest-httpx, pytest-mock, + pytestCheckHook, }: buildPythonPackage rec { @@ -51,17 +52,16 @@ buildPythonPackage rec { hash = "sha256-hreVGsptCGW6L3rj6Ec8+lefZWpQ4tZtUEJI+NxTO7w="; }; - pythonRelaxDeps = [ - "rich" - ]; + pythonRelaxDeps = [ "rich" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ beancount-black beancount-parser beanhub-forms beanhub-import + beanhub-inbox click fastapi jinja2 @@ -95,6 +95,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-factoryboy pytest-httpx pytest-mock pytestCheckHook @@ -105,10 +106,10 @@ buildPythonPackage rec { meta = { description = "Command line tools for BeanHub or Beancount users"; - mainProgram = "bh"; homepage = "https://github.com/LaunchPlatform/beanhub-cli/"; changelog = "https://github.com/LaunchPlatform/beanhub-cli/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fangpen ]; + mainProgram = "bh"; }; } From 5e0eb4c4882c0019f2c3fad4cd14a69c2deec239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 20:42:19 +0000 Subject: [PATCH 07/34] python3Packages.plaid-python: 36.0.0 -> 36.1.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index c4053d4371cf..10f113d5c3f5 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "36.0.0"; + version = "36.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-l3Lc4Qn3+XE7qKwRwWkZtiP9EURL/lahp3yV4upCsyw="; + hash = "sha256-3TQ6jGsf+2ebYnAxRTKs4JrijDf3ojyfS4iBAMAG8FU="; }; build-system = [ setuptools ]; From 8f29006d9a98d4702db4fe9a346862e0469f3fa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 20:53:17 +0000 Subject: [PATCH 08/34] python3Packages.yaramod: 4.4.1 -> 4.5.0 --- pkgs/development/python-modules/yaramod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index aa7405725368..7049bf0e6a23 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,14 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.4.1"; + version = "4.5.0"; pyproject = true; src = fetchFromGitHub { owner = "avast"; repo = "yaramod"; tag = "v${version}"; - hash = "sha256-mI/NIgBs/amV7DRJEfclR5LcYOc8/2d1tmP+bWcULhw="; + hash = "sha256-iIPMwN/kHrbN3ca+IJdyIfvrsnwiiflQY/gHAT3p+S4="; }; postPatch = '' From 75d9ab962e4be40b089da1b168f4619351b368df Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sat, 6 Sep 2025 16:05:41 -0300 Subject: [PATCH 09/34] steel: 0-unstable-2025-06-15 -> 0-unstable-2025-08-30 --- pkgs/by-name/st/steel/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index 3be8c2bb4062..f50cfd89e236 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -19,16 +19,16 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0-unstable-2025-06-15"; + version = "0-unstable-2025-08-30"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "123adb314702d6520f8ab04115e79308d2400c38"; - hash = "sha256-o1RZBlAGUht0Q7UVF+yPlrWW7B016fpBBcoaxuzRQo4="; + rev = "c24b1f36012850e54375c9421d7289aae6fc528e"; + hash = "sha256-zKdIPW2r/8l1Qo+4nGToAk1+3PuT+M/norYw3+ywfhI="; }; - cargoHash = "sha256-/vPDVVOhLO7mnULyU8QLW+YHh+kGd+BSiPi55jrOWps="; + cargoHash = "sha256-a7wene1oI2lhMUo8iguosXyk1G12bhrEdK7IJ/WgRq4="; nativeBuildInputs = [ curl @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { ] ++ lib.optionals includeForge [ "--package" - "forge" + "steel-forge" ]; # Tests are disabled since they always fail when building with Nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage { postInstall = '' mkdir -p $out/lib/steel - substituteInPlace cogs/installer/download.scm \ + substituteInPlace crates/forge/installer/download.scm \ --replace-fail '"cargo-steel-lib"' '"$out/bin/cargo-steel-lib"' pushd cogs From 9b4bfaccb88b4ebafede91eac3b8595e4338212d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 12:44:44 +0000 Subject: [PATCH 10/34] scotch: 7.0.8 -> 7.0.9 --- pkgs/by-name/sc/scotch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index a2097393abbd..b15a1a66f0a5 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.8"; + version = "7.0.9"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-AtpaBxgV9EamkAlvH9psp+K0o923EhSu6LQA89qyG3w="; + hash = "sha256-dbf18XdmDP0KgS4H4L7Wnam7kGF88yBcCvehYRRpHvA="; }; outputs = [ From 2147f5b77b358fa7a8846b45773a127828314098 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 12:24:03 +0000 Subject: [PATCH 11/34] vcpkg: 2025.07.25 -> 2025.08.27 --- pkgs/by-name/vc/vcpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 4d8f7b873027..0c24c8edfd8f 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2025.07.25"; + version = "2025.08.27"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; tag = finalAttrs.version; - hash = "sha256-1v4IaHDsKipmpkuh+Xx52j3Li98MtG6BYL15rhWJC1w="; + hash = "sha256-rgpFnISzqmmb3Ce+iLd9HkcZnhqQ2dEVl2GkoeLrs2U="; leaveDotGit = true; postFetch = '' cd "$out" From a43909ac2d2c33f9e93adf6514c62a620b3e952a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 09:27:46 +0000 Subject: [PATCH 12/34] python3Packages.manifestoo-core: 1.10 -> 1.11 --- pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index 8c5d9bebc78e..bd13239399d3 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.10"; + version = "1.11"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-LLxr96/cuAAncddMeBBVlFq2Hl5+pNXqgMbvbnfzcE8="; + hash = "sha256-f242Zf6L/vvAAOHpqcJVBVKFD17ATpDU3Er/eoNqIfg="; }; nativeBuildInputs = [ hatch-vcs ]; From 80cc8a18d8ebf53c251de0d93086a592c79628f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 09:32:33 +0000 Subject: [PATCH 13/34] python3Packages.unstructured-client: 0.42.0 -> 0.42.3 --- .../python-modules/unstructured-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index c92072ee35b8..0bf324291f84 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.42.0"; + version = "0.42.3"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-LXCKD2LL1rFObr2Ew0vsa5Uh96sR8/821ecL/il30r0="; + hash = "sha256-n13+ET4w+g9Ldygi+3bgn8X5r5ofMowA4ZJZsqnqIkk="; }; preBuild = '' From e7d6d176b582b5e09ffd8e92a75b744483bf27af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 08:33:45 +0000 Subject: [PATCH 14/34] python3Packages.cogapp: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/cogapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 3f9d7ae238c5..76b48aec073f 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cogapp"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; src = fetchFromGitHub { owner = "nedbat"; repo = "cog"; tag = "v${version}"; - hash = "sha256-jmHAHBzUw8VLCudT8slisCJ7yOUTVrrLiUbEiiTcfew="; + hash = "sha256-tUFqvG1SzoMc/cWAIOpNaf161KbRqscjNnxThg9slu8="; }; build-system = [ setuptools ]; From 411d2400eae60fcbcababbb18449d96f5e435925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 07:15:41 +0000 Subject: [PATCH 15/34] python3Packages.readability-lxml: 0.8.1 -> 0.8.4 --- pkgs/development/python-modules/readability-lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index 7c75c32be269..c9a03744a956 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "readability-lxml"; - version = "0.8.1"; + version = "0.8.4"; format = "setuptools"; src = fetchFromGitHub { owner = "buriy"; repo = "python-readability"; rev = "v${version}"; - hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4="; + hash = "sha256-6A4zpe3GvHHf235Ovr2RT/cJgj7bWasn96yqy73pVgY="; }; propagatedBuildInputs = [ From 130d122f84bc1533f9654f7420e6d20754dd4bb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 06:02:02 +0000 Subject: [PATCH 16/34] onioncircuits: 0.8.1 -> 0.8.2 --- pkgs/by-name/on/onioncircuits/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onioncircuits/package.nix b/pkgs/by-name/on/onioncircuits/package.nix index 99dc3e8f8b89..3f28526e852f 100644 --- a/pkgs/by-name/on/onioncircuits/package.nix +++ b/pkgs/by-name/on/onioncircuits/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitLab { @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tails"; repo = "onioncircuits"; rev = version; - sha256 = "sha256-5VGOuvngZvUFQ+bubdt4YV3/IflOhBB1i+oEQaV4kr0="; + sha256 = "sha256-hk4pwPTtj4wt58Wn3NbGc5yQt/FJGdcZC9BbNgvaMqY="; }; nativeBuildInputs = [ From 5e7780045c52dcd34eb53775117d1d29c2e62c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 05:06:20 +0000 Subject: [PATCH 17/34] writefreely: 0.15.1 -> 0.16.0 --- pkgs/by-name/wr/writefreely/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wr/writefreely/package.nix b/pkgs/by-name/wr/writefreely/package.nix index e5349e47276a..4afa4d402df9 100644 --- a/pkgs/by-name/wr/writefreely/package.nix +++ b/pkgs/by-name/wr/writefreely/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "writefreely"; repo = "writefreely"; rev = "v${version}"; - sha256 = "sha256-Qr31XSbAckLElD81yxD+K7tngWECQ+wyuESC+biAbyw="; + sha256 = "sha256-VM5TkQAohxGmtbQs9ZWxCqF4kJ/9wtihz+p1twd+W9E="; }; - vendorHash = "sha256-HmEh8WmKbdAimvzsAiaXcqSXoU1DJx06+s1EH1JZmwo="; + vendorHash = "sha256-5X+EYV1RFbzB26gi7IYcNpWtNlkTaK2SnDxYJL1AlaA="; ldflags = [ "-s" From 5606a3850901c8974f3010493d08abcff810f95e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 04:48:34 +0000 Subject: [PATCH 18/34] vcpkg-tool: 2025-07-21 -> 2025-08-29 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 8c6a014844a7..d61ded030fa7 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2025-07-21"; + version = "2025-08-29"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-Q2CLqlHItNr4H4xFcuGd0BqootxsInZQ3unTZ7vtz8E="; + hash = "sha256-j+yFC3V+zMJ0UzevVI5L2xNX5+zh/3IyU4NFZRQIf10="; }; nativeBuildInputs = [ From aab3b9c270f0ad9407ca24a3b6982fa719c91699 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 02:32:23 +0000 Subject: [PATCH 19/34] kics: 2.1.12 -> 2.1.13 --- pkgs/by-name/ki/kics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix index d315c28e208e..2a664e684694 100644 --- a/pkgs/by-name/ki/kics/package.nix +++ b/pkgs/by-name/ki/kics/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kics"; - version = "2.1.12"; + version = "2.1.13"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; tag = "v${version}"; - hash = "sha256-InoH/BzRJtJaFGL1OjLpRoz72Gkrf03WRZQUDyxnFDM="; + hash = "sha256-7ulu5PVCD6VoIj7RVpBGzsb9uWctOkVfYVb8qB5YMB0="; }; vendorHash = "sha256-kKK3kSWjork6KZdPzKySsiHR0bOLKlzltP/u6ZQioqM="; From 0923dd3e1546af1961f43746f1ed869c28dd4e64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:51:41 +0000 Subject: [PATCH 20/34] groonga: 15.1.4 -> 15.1.5 --- pkgs/by-name/gr/groonga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index acea713b4330..3a630129a926 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "15.1.4"; + version = "15.1.5"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-w5r7HiTQ1YZNdjTo3sDl0s++z0M3mAXtOjZWxrMhahk="; + hash = "sha256-dRO9QBQCIVJlFhNZjVZwoiEIesIBrkZWNSOwzgkOnkY="; }; patches = [ From 7d69bd1807a708f7fab9d9dceef94afc6788560e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:48:20 +0000 Subject: [PATCH 21/34] juju: 3.6.8 -> 3.6.9 --- pkgs/by-name/ju/juju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index 38ebbc9ea81e..e2be3c03f63e 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "juju"; - version = "3.6.8"; + version = "3.6.9"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-Y+sUR8HURkiICa6lffz0u3CeX9bzOjtbFOdvy7PaZfU="; + hash = "sha256-AeIGnpcVj0cSByyStUSpuzAg9322uOdpIZQx1KiAjSQ="; }; - vendorHash = "sha256-ghgXwaSyOVW3Viw+xA9r6KogKWJp0IWMByVdWCbE6hY="; + vendorHash = "sha256-cPfwyagNWaxxBtniEhA4P6+lxas1ffibH7J9SHXuM5g="; subPackages = [ "cmd/juju" From d86768a88300ba55c3d0332a481b8114399c5b8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Aug 2025 01:21:30 +0000 Subject: [PATCH 22/34] kn: 1.19.1 -> 1.19.2 --- pkgs/by-name/kn/kn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix index 8f129118b75f..d8e61dc0536b 100644 --- a/pkgs/by-name/kn/kn/package.nix +++ b/pkgs/by-name/kn/kn/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "kn"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "knative"; repo = "client"; tag = "knative-v${finalAttrs.version}"; - hash = "sha256-nTWY6R8t14Z1xLvarAUqEWiQoBnQLCBQwglEX+hJpIE="; + hash = "sha256-zp+4JcC4AB3Yp6muYxnOPddchB77VitU1VKv/mAVkKk="; }; - vendorHash = "sha256-ep9BkF2+pqFjDwY7mXuRVcPJyVyBv489zBhSp2MQxU4="; + vendorHash = "sha256-CUuNlu6zoKAYu5+mtDEfiGi588qbCT81XSolfiUYL8k="; env.GOWORK = "off"; From e809b8c53082bc5ddeebec677c229748c75efc9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 20:45:05 +0000 Subject: [PATCH 23/34] bazel-remote: 2.5.2 -> 2.6.0 --- pkgs/by-name/ba/bazel-remote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bazel-remote/package.nix b/pkgs/by-name/ba/bazel-remote/package.nix index 309689020de8..91a84898b204 100644 --- a/pkgs/by-name/ba/bazel-remote/package.nix +++ b/pkgs/by-name/ba/bazel-remote/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "buchgr"; repo = "bazel-remote"; rev = "v${version}"; - hash = "sha256-qsNIfl3Y+2MaflTCL+uKV1T6tMe1AFIt+fOz/bB3EEQ="; + hash = "sha256-TKfoQEUYsLDJL9sINoCOBeB7SgH5MyyuUIOAhRoZLfU="; }; - vendorHash = "sha256-cZe1jFJZnZy960lyV3nMO0+ZotwjMn1tSyeFj05tZao="; + vendorHash = "sha256-bM545QqUXg8io6SNK4dtT+UL/MTvQW7pi+Mb3rb7R48="; subPackages = [ "." ]; From 6558b4d077fb90c1f6fc3a896b1916b8f5143f2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 20:01:55 +0000 Subject: [PATCH 24/34] go-migrate: 4.18.3 -> 4.19.0 --- pkgs/by-name/go/go-migrate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index 1c9ddd5d601a..58cdace2892a 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.18.3"; + version = "4.19.0"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-aM8okSrLj2oIb3Ey2KkHu3UQY7mSnPjMfwNsdL2Fz28="; + sha256 = "sha256-u8lP1mQLZ3WtX8NV8mnlNut5bLqkWk2blaoYJPOQoCk="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-H3FBO6RFoXzwk/9bkSVuIlDbfd4AATzbgLmEvbtahFM="; + vendorHash = "sha256-aAtPYD8gZReUJu+oOkuZ1afUKnGvP5shXCo7FgigBDI="; subPackages = [ "cmd/migrate" ]; From a1f358e7877d9eac8ef83ea7d53feea0d95bfe09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:50:28 +0000 Subject: [PATCH 25/34] python3Packages.ddgs: 9.5.2 -> 9.5.4 --- pkgs/development/python-modules/ddgs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix index 3896b9927745..46089add9e41 100644 --- a/pkgs/development/python-modules/ddgs/default.nix +++ b/pkgs/development/python-modules/ddgs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ddgs"; - version = "9.5.2"; + version = "9.5.4"; pyproject = true; src = fetchFromGitHub { owner = "deedy5"; repo = "ddgs"; tag = "v${version}"; - hash = "sha256-UDmgRuMpLQu7I0t+0RmK0GkXpV5NTJ1NgsXYIl+A1i0="; + hash = "sha256-iqa2OviyAfpKDM6ghfo5FcCqEacY7vxSra2ePPvm2D0="; }; build-system = [ setuptools ]; From 8d46612dd42f2734c129fb2ba2149c67babb48c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:37:28 +0000 Subject: [PATCH 26/34] python3Packages.python-editor: 1.0.4-unstable-2023-10-11 -> 1.0.4 --- pkgs/development/python-modules/python-editor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 21ae55ef6701..8e3fde5cce16 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -6,7 +6,7 @@ buildPythonPackage { pname = "python-editor"; - version = "1.0.4-unstable-2023-10-11"; + version = "1.0.4"; format = "setuptools"; src = fetchFromGitHub { From a9851337d6bd92356e17818f44034d5ffc16b416 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:04:21 +0000 Subject: [PATCH 27/34] balena-cli: 22.2.4 -> 22.3.0 --- pkgs/by-name/ba/balena-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 5ffbaa94db04..e62e4be0a1b5 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -22,16 +22,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "22.2.4"; + version = "22.3.0"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-d0buLOiCHBpGhzduOCfJk+hraqS/njz1PTOD8QZSt8k="; + hash = "sha256-V/y2gsHjcWyduIYq+lddRqAC5ECafNBXQ0tiK/dLHOI="; }; - npmDepsHash = "sha256-7qecvPiJeV1rOLnI76WNwRGmx6PVCPHH5M/+OH+8l3I="; + npmDepsHash = "sha256-SWtWXvWUuIzMqLoEDRTqVJyWNK/FXOA/LF73kCWfuz4="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 8aa461e2d76c9fe212ee33fb5242d76e4304a075 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 18:00:14 +0000 Subject: [PATCH 28/34] buildkite-cli: 3.8.0 -> 3.10.0 --- pkgs/by-name/bu/buildkite-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-cli/package.nix b/pkgs/by-name/bu/buildkite-cli/package.nix index 7e57c0f790d5..696b7dd32a65 100644 --- a/pkgs/by-name/bu/buildkite-cli/package.nix +++ b/pkgs/by-name/bu/buildkite-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-zRACKFs4AZkWg2OqFIyiLuM1V6GyIPmtyxSOjfHkL6U="; + sha256 = "sha256-j5h5tej0RtliO9CqZUq5KRGRS2Ns+Te5yqNQeOCU6ZQ="; }; - vendorHash = "sha256-IOZd5XIUPhU52fcBYFo9+88XZcJon2RKVHnjDbOhPJ0="; + vendorHash = "sha256-0+KQcV1RXu6sgjrOCStENzjZvQWmvpbcse2K9syfZEw="; doCheck = false; From 7475e5a4cc6d07fe8ec7dcdd260390cd3bb9d76f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:53:35 +0000 Subject: [PATCH 29/34] python3Packages.qstylizer: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/qstylizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix index 9ebd77a7e62c..5396e38834df 100644 --- a/pkgs/development/python-modules/qstylizer/default.nix +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "qstylizer"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "blambright"; repo = "qstylizer"; tag = version; - hash = "sha256-eZVBUGQxa2cr0O48iKWNTqM9E5ZAsiT1WfXjdYdxIdg="; + hash = "sha256-Is/kYkSX9fOX+pLv5g1ns2OxeLpSkaCfO2jPIbiuIxA="; }; PBR_VERSION = version; From f2e616827f78333f3a15f76efe76a2d87814d8c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:49:36 +0000 Subject: [PATCH 30/34] squawk: 2.22.0 -> 2.24.0 --- pkgs/by-name/sq/squawk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/squawk/package.nix b/pkgs/by-name/sq/squawk/package.nix index e7d3d8715f12..78f9c71cdbc2 100644 --- a/pkgs/by-name/sq/squawk/package.nix +++ b/pkgs/by-name/sq/squawk/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "2.22.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = "squawk"; tag = "v${version}"; - hash = "sha256-wAcoSnWbWhoT4FaGWH8zQRBwc0udJPCni4ZUecmRX4c="; + hash = "sha256-r5ypzFMmrk09lukGdKQK8BMX8xkA5Qiz1D6AunkUbmk="; }; - cargoHash = "sha256-ptUskdXoKLqqtFDUszJvEbvha01M6OgGJFV9mRLI2gw="; + cargoHash = "sha256-19dBVJPUka5ul+M5hFU+e85WjRq0So1iSaIw5STfq/Q="; nativeBuildInputs = [ pkg-config From 251144e4756af4c2de430c427ced9d715b68dc79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Aug 2025 17:43:27 +0000 Subject: [PATCH 31/34] traccar: 6.9.0 -> 6.9.1 --- pkgs/by-name/tr/traccar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix index e58b134fdb8b..69a1795a5b7e 100644 --- a/pkgs/by-name/tr/traccar/package.nix +++ b/pkgs/by-name/tr/traccar/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "traccar"; - version = "6.9.0"; + version = "6.9.1"; nativeBuildInputs = [ pkgs.makeWrapper ]; src = fetchzip { stripRoot = false; url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip"; - hash = "sha256-UILLCRzefPY6AWzy1AOLFu1L+h22VylMAR/25pE9RGE="; + hash = "sha256-PR0crdEGYr4lVp5JSFSLGsR+uZKWulfp6LA57y9K88E="; }; installPhase = '' From 77561c9d58846cf182547f15abbd75e47d44704f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Sep 2025 21:48:44 +0000 Subject: [PATCH 32/34] python3Packages.tuya-device-sharing-sdk: 0.2.1 -> 0.2.4 --- .../python-modules/tuya-device-sharing-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index 5f8f9b21d5b7..71d4e75cbca4 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -9,7 +9,7 @@ }: let pname = "tuya-device-sharing-sdk"; - version = "0.2.1"; + version = "0.2.4"; in buildPythonPackage { format = "setuptools"; @@ -17,7 +17,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-cuLJfCIQmnySCN1yezxyqtFmnTUdhD9tY9sBYNh9iUI="; + hash = "sha256-4RwsuFg2ukvM0rplCZKJx85DbJTpJnhkCVDnfT4r4A8="; }; # workaround needed, upstream issue: https://github.com/tuya/tuya-device-sharing-sdk/issues/10 From f0528176ad9aab8b1cd62dbb363e5c0361800727 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jul 2025 13:14:25 +0200 Subject: [PATCH 33/34] python313Packages.playwright-stealth: 1.0.6-unstable-2023-09-11 -> 2.0.0 --- .../playwright-stealth/default.nix | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/playwright-stealth/default.nix b/pkgs/development/python-modules/playwright-stealth/default.nix index c5b3bd825a6d..b9ef5c86e47f 100644 --- a/pkgs/development/python-modules/playwright-stealth/default.nix +++ b/pkgs/development/python-modules/playwright-stealth/default.nix @@ -1,40 +1,32 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, playwright, - pythonOlder, - setuptools, + poetry-core, }: -buildPythonPackage { +buildPythonPackage rec { pname = "playwright-stealth"; - version = "1.0.6-unstable-2023-09-11"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "AtuboDad"; - repo = "playwright_stealth"; - # https://github.com/AtuboDad/playwright_stealth/issues/25 - rev = "43f7433057906945b1648179304d7dbd8eb10874"; - hash = "sha256-ZWmuVwjEgrPmfxjvws3TdocW6tyNH++fyRfKQ0oJ6bo="; + src = fetchPypi { + pname = "playwright_stealth"; + inherit version; + hash = "sha256-T0TUFtQiZomJWk0c+0Do0TchbAyXEOqPhLri2/EYb8U="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ playwright ]; - - # Tests require Chromium binary - doCheck = false; + dependencies = [ playwright ]; pythonImportsCheck = [ "playwright_stealth" ]; - meta = with lib; { - description = "Playwright stealth"; + meta = { + description = "Make your playwright instance stealthy"; homepage = "https://github.com/AtuboDad/playwright_stealth"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 4a5ab1eb69f06512371ce89e710b30ab30f54b36 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 5 Sep 2025 13:29:48 +0200 Subject: [PATCH 34/34] haskell.compiler.ghc865Binary: drop This was used for bootstrapping GHC on powerpc64le, but it's unclear whether that actually still works. It makes no sense to pretend to support it, when it's most likely broken, but we can't even verify. Also the bootstrap chain will be broken once we drop GHC 8.10.7, so we might as well drop the whole thing. --- doc/release-notes/rl-2511.section.md | 2 + .../compilers/ghc/8.6.5-binary.nix | 268 ------------------ .../configuration-ghc-8.6.x.nix | 97 ------- .../haskell-modules/generic-builder.nix | 2 +- pkgs/top-level/haskell-packages.nix | 70 +---- pkgs/top-level/release-haskell.nix | 6 +- 6 files changed, 11 insertions(+), 434 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/8.6.5-binary.nix delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 141b887ee05f..12da7843bb40 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -24,6 +24,8 @@ - GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported. +- GHC 8.6.5 and its package set have been removed. It was only used to bootstrap GHC for powerpc64le, but this was probably broken anyway. + - `base16-builder` node package has been removed due to lack of upstream maintenance. - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities. diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix deleted file mode 100644 index 7c15730205b2..000000000000 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ /dev/null @@ -1,268 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - gcc, - ncurses5, - ncurses6, - gmp, - glibc, - libiconv, - llvmPackages, - coreutils, - targetPackages, -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - useLLVM = - !(stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isPower || stdenv.targetPlatform.isSparc); - - useNcurses6 = - stdenv.hostPlatform.system == "x86_64-linux" - || (with stdenv.hostPlatform; isPower64 && isLittleEndian); - - ourNcurses = if useNcurses6 then ncurses6 else ncurses5; - - libPath = lib.makeLibraryPath ( - [ - ourNcurses - gmp - ] - ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv - ); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - - glibcDynLinker = - assert stdenv.hostPlatform.isLinux; - if stdenv.hostPlatform.libc == "glibc" then - # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. - ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' - else - "${lib.getLib glibc}/lib/ld-linux*"; - - downloadsUrl = "https://downloads.haskell.org/ghc"; - - runtimeDeps = [ - targetPackages.stdenv.cc - targetPackages.stdenv.cc.bintools - coreutils # for cat - ] - ++ - lib.optionals - ( - assert useLLVM -> !(llvmPackages == null); - useLLVM - ) - [ - (lib.getBin llvmPackages.llvm) - ] - # On darwin, we need unwrapped bintools as well (for otool) - ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ - targetPackages.stdenv.cc.bintools.bintools - ]; - -in - -stdenv.mkDerivation rec { - version = "8.6.5"; - pname = "ghc-binary"; - - # https://downloads.haskell.org/~ghc/8.6.5/ - src = fetchurl ( - { - i686-linux = { - # Don't use the Fedora27 build (as below) because there isn't one! - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; - }; - x86_64-linux = { - # This is the Fedora build because it links against ncurses6 where the - # deb9 one links against ncurses5, see here - # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; - sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; - }; - x86_64-darwin = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; - }; - powerpc64le-linux = { - url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-powerpc64le-fedora29-linux.tar.xz"; - sha256 = "sha256-tWSsJdPVrCiqDyIKzpBt5DaXb3b6j951tCya584kWs4="; - }; - } - .${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform") - ); - - nativeBuildInputs = [ perl ]; - - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location/ - ${libEnvVar} = libPath; - - postUnpack = - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - lib.optionalString stdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - '' - + - - # Some scripts used during the build need to have their shebangs patched - '' - patchShebangs ghc-${version}/utils/ - patchShebangs ghc-${version}/configure - test -d ghc-${version}/inplace/bin && \ - patchShebangs ghc-${version}/inplace/bin - '' - + - - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' - + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -perm -0100 \ - -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.hostPlatform.is64bit "w"}.so.5 libncurses.so \ - ${ - # This isn't required for x86_64-linux where we use ncurses6 - lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" - } \ - --interpreter ${glibcDynLinker} {} \; - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - '' - + - # We're kludging a glibc bindist into working with non-glibc... - # Here we patch up the use of `__strdup` (part of glibc binary ABI) - # to instead use `strdup` since musl doesn't provide __strdup - # (`__strdup` is defined to be an alias of `strdup` anyway[1]). - # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html - # Use objcopy magic to make the change: - lib.optionalString stdenv.hostPlatform.isMusl '' - find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; - ''; - - configurePlatforms = [ ]; - configureFlags = [ - "--with-gmp-includes=${lib.getDev gmp}/include" - # Note `--with-gmp-libraries` does nothing for GHC bindists: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # GHC tries to remove xattrs when installing to work around Gatekeeper - # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally - # succeeds in nixpkgs because xattrs are not allowed in the store, but it - # can fail when a file has the `com.apple.provenance` xattr, and it can’t be - # modified (such as target of the symlink to `libiconv.dylib`). - # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13. - # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/ - makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ]; - - # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - ''; - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - postFixup = - lib.optionalString stdenv.hostPlatform.isLinux '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - ''; - - # GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - hardeningDisable = [ "pie" ]; - - doInstallCheck = true; - installCheckPhase = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - env -i $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - - inherit llvmPackages; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = rec { - license = lib.licenses.bsd3; - platforms = [ - "x86_64-linux" - "i686-linux" - "x86_64-darwin" - "powerpc64le-linux" - ]; - # build segfaults, use ghc8107Binary which has proper musl support instead - broken = stdenv.hostPlatform.isMusl; - maintainers = with lib.maintainers; [ - guibou - ]; - teams = [ lib.teams.haskell ]; - }; -} diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix deleted file mode 100644 index 3258dd341465..000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -let - inherit (pkgs.stdenv.hostPlatform) isDarwin; -in - -self: super: { - - # Should be llvmPackages_6 which has been removed from nixpkgs, - # create attribute set to prevent eval errors. - llvmPackages = { - llvm = null; - clang = null; - }; - - # Disable GHC 8.6.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hpc = null; - integer-gmp = null; - libiserv = null; - mtl = null; - parsec = null; - pretty = null; - process = null; - rts = null; - stm = null; - template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = - if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then - null - else - doDistribute self.terminfo_0_4_1_7; - text = null; - time = null; - transformers = null; - unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; - - # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work - Cabal-syntax = self.Cabal-syntax_3_6_0_0; - # These core package only exist for GHC >= 9.4. The best we can do is feign - # their existence to callPackages, but their is no shim for lower GHC versions. - system-cxx-std-lib = null; - - # Becomes a core package in GHC >= 9.8 - semaphore-compat = doDistribute self.semaphore-compat_1_0_0; - - # Needs Cabal 3.0.x. - jailbreak-cabal = super.jailbreak-cabal.overrideScope (cself: _: { Cabal = cself.Cabal_3_2_1_0; }); - - # Test suite does not compile. - data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x - dates = doJailbreak super.dates; # base >=4.9 && <4.12 - HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 - hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 - http-api-data = doJailbreak super.http-api-data; - wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 - rebase = doJailbreak super.rebase; # time ==1.9.* is too low - - # cabal2nix needs the latest version of Cabal, and the one - # hackage-db uses must match, so take the latest - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); - - # cabal2spec needs a recent version of Cabal - cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); - - # ghc versions prior to 8.8.x needs additional dependency to compile successfully. - ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex; - - # Needs base-orphans for GHC < 9.8 / base < 4.19 - some = addBuildDepend self.base-orphans super.some; - - # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = self.exceptions_0_10_10; - - mime-string = disableOptimization super.mime-string; -} diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2724a78f692f..f2ea85774d60 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -957,7 +957,7 @@ lib.fix ( # # and with python: # # > nix-shell -E 'with (import {}); \ - # > haskell.packages.ghc865.hello.envFunc { buildInputs = [ python ]; }' + # > haskellPackages.hello.envFunc { buildInputs = [ python ]; }' envFunc = { withHoogle ? false, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4f0de7a6498e..6e4d535f31d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -20,7 +20,6 @@ let "integer-simple" "native-bignum" # Binary GHCs - "ghc865Binary" "ghc8107Binary" "ghc902Binary" "ghc924Binary" @@ -79,11 +78,6 @@ in bb = pkgsBuildBuild.haskell; in { - ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { - # Should be llvmPackages_6 which has been removed from nixpkgs - llvmPackages = null; - }; - ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix { llvmPackages = pkgs.llvmPackages_12; }; @@ -105,13 +99,7 @@ in }; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { - bootPkgs = - # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - # to my (@a-m-joseph) knowledge there are no newer official binaries for this platform - bb.packages.ghc865Binary - else - bb.packages.ghc8107Binary; + bootPkgs = bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -123,12 +111,7 @@ in }; ghc810 = compiler.ghc8107; ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix { - bootPkgs = - # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc810 - else - bb.packages.ghc8107Binary; + bootPkgs = bb.packages.ghc8107Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; @@ -139,13 +122,7 @@ in ghc928 = callPackage ../development/compilers/ghc/9.2.8.nix { bootPkgs = # GHC >= 9.0 removed the armv7l bindist - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc8107Binary - # No suitable bindists for powerpc64le - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc902Binary; + if stdenv.buildPlatform.isAarch32 then bb.packages.ghc8107Binary else bb.packages.ghc902Binary; inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until @@ -160,12 +137,7 @@ in bootPkgs = # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - - # No suitable bindists for powerpc64le - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc902Binary; + bb.packages.ghc902Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -179,12 +151,7 @@ in ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.packages.ghc924Binary; + if stdenv.buildPlatform.isAarch32 then bb.packages.ghc928 else bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -197,12 +164,7 @@ in ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.packages.ghc924Binary; + if stdenv.buildPlatform.isAarch32 then bb.packages.ghc928 else bb.packages.ghc924Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -220,8 +182,6 @@ in else if stdenv.buildPlatform.isAarch32 then # For GHC 9.6 no armv7l bindists are available. bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 else bb.packages.ghc963Binary; inherit (buildPackages.python3Packages) sphinx; @@ -239,8 +199,6 @@ in # For GHC 9.6 no armv7l bindists are available. if stdenv.buildPlatform.isAarch32 then bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 else if stdenv.buildPlatform.isDarwin then # it seems like the GHC 9.6.* bindists are built with a different # toolchain than we are using (which I'm guessing from the fact @@ -264,8 +222,6 @@ in # For GHC 9.6 no armv7l bindists are available. if stdenv.buildPlatform.isAarch32 then bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 else if stdenv.buildPlatform.isDarwin then # it seems like the GHC 9.6.* bindists are built with a different # toolchain than we are using (which I'm guessing from the fact @@ -315,12 +271,7 @@ in ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # No armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc984 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc984 - else - bb.packages.ghc984Binary; + if stdenv.buildPlatform.isAarch32 then bb.packages.ghc984 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -374,13 +325,6 @@ in bh = buildPackages.haskell; in { - - ghc865Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc865Binary; - ghc = bh.compiler.ghc865Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc8107Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107Binary; ghc = bh.compiler.ghc8107Binary; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9f045ae77346..482923ed7518 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -384,11 +384,7 @@ let "aarch64-darwin" ] { - haskell.compiler = lib.recursiveUpdate (packagePlatforms pkgs.pkgsMusl.haskell.compiler) { - # remove musl ghc865Binary since it is known to be broken and - # causes an evaluation error on darwin. - ghc865Binary = { }; - }; + haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler; # Get some cache going for MUSL-enabled GHC. haskellPackages = {