From 07504011e2773beb22a1ef4214eebaa87bdaba25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Feb 2025 08:00:34 +0000 Subject: [PATCH 01/27] yamlscript: 0.1.89 -> 0.1.91 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 189caee6282c..9ee123ed43ca 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.89"; + version = "0.1.91"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-SSgiAjPRow4R1cLl7POUzC+TeQ4Oq+8QeFh410IsgdA="; + hash = "sha256-4i7jXz67XvSmrrQQNZ/wDfjwgh+cVc5a8ptOwjbj/Yc="; }; executable = "ys"; From 6b8ddcbc1a04eae608caa582336b7de76d910dbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 04:44:40 +0000 Subject: [PATCH 02/27] python312Packages.cookidoo-api: 0.12.2 -> 0.12.3 --- pkgs/development/python-modules/cookidoo-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cookidoo-api/default.nix b/pkgs/development/python-modules/cookidoo-api/default.nix index fe230729c517..ab8c24717bc1 100644 --- a/pkgs/development/python-modules/cookidoo-api/default.nix +++ b/pkgs/development/python-modules/cookidoo-api/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cookidoo-api"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; src = fetchFromGitHub { owner = "miaucl"; repo = "cookidoo-api"; tag = version; - hash = "sha256-7FDnaiq/c3ug96usjgPXtrR5oFb10gDaDokYfApktsk="; + hash = "sha256-hkKYIfnvDIT+eNEMfPxTzcSEs7VZLkHFoOqWms5Pt6w="; }; build-system = [ setuptools ]; From afee63185329ab84203d90a955eac5f96ad8ee89 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Fri, 14 Feb 2025 12:22:11 +0700 Subject: [PATCH 03/27] nixos/step-ca: use `pathWith` for `intermediatePasswordFile` This lets us remove an assertion, because `pathWith` can require that a file not be in the store. Note that the old assertion didn't quite do what we wanted: it prevented you from using top level store paths (such as `/nix/store/gg8578vvbcf1wpqvk85bigi5s4pvylkk-test-certificates`), but was ok with sub-files (such as `/nix/store/gg8578vvbcf1wpqvk85bigi5s4pvylkk-test-certificates/intermediate-password-file`). Now that we're stricter, we need some way to populate `intermediatePasswordFile` in our test without making the type unhappy. I opted to solve that by creating a file in `/etc`. --- nixos/modules/services/security/step-ca.nix | 16 ++++------------ nixos/tests/step-ca.nix | 3 ++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 9c03fde123d8..3465d93f2fd0 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -60,7 +60,10 @@ in ''; }; intermediatePasswordFile = lib.mkOption { - type = lib.types.path; + type = lib.types.pathWith { + inStore = false; + absolute = true; + }; example = "/run/keys/smallstep-password"; description = '' Path to the file containing the password for the intermediate @@ -86,17 +89,6 @@ in ); in { - assertions = [ - { - assertion = !lib.isStorePath cfg.intermediatePasswordFile; - message = '' - points to - a file in the Nix store. You should use a quoted absolute path to - prevent this. - ''; - } - ]; - systemd.packages = [ cfg.package ]; # configuration file indirection is needed to support reloading diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index 67beacf7a49e..4f2ff71c85e8 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -14,12 +14,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { caserver = { config, pkgs, ... }: { + environment.etc.password-file.source = "${test-certificates}/intermediate-password-file"; services.step-ca = { enable = true; address = "[::]"; port = 8443; openFirewall = true; - intermediatePasswordFile = "${test-certificates}/intermediate-password-file"; + intermediatePasswordFile = "/etc/${config.environment.etc.password-file.target}"; settings = { dnsNames = [ "caserver" ]; root = "${test-certificates}/root_ca.crt"; From 22c4b4e833ad30a773665084f7d5aab163ba1267 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 05:43:37 +0000 Subject: [PATCH 04/27] sgt-puzzles: 20241230.79be403 -> 20250216.b99f107 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 257bad506f5d..1ecb2bc5ea54 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20241230.79be403"; + version = "20250216.b99f107"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-gWt328Ic0+ctcptnhnTprAEmMpcpfAAyTEqRuKF0gVY="; + hash = "sha256-TErU482qrpPFWq//5RuCIpl6RpHU+MdckRolSDAS+xk="; }; sgt-puzzles-menu = fetchurl { From e2fa1483a197d27d9583f8b3ff96d83faff5f37d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 11:09:44 +0000 Subject: [PATCH 05/27] python312Packages.anthropic: 0.45.2 -> 0.46.0 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 3e549cd385c2..59be51c3d22c 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-/QuAUU0/nNhJZouCP0LVkCFMTiNdeze/fF+SZKD1Jis="; + hash = "sha256-dmc2RXutp7FHQ+AWSKKFWBclu/Jt5jOUWFrHEz8D38U="; }; build-system = [ From 48a2cfd2dcdb79a0e32e4b1a486533012a716309 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 3 Feb 2025 23:04:29 +0100 Subject: [PATCH 06/27] python312Packages.pytensor: 2.26.4 -> 2.28.0 Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.26.4...rel-2.28.0 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.28.0 --- .../python-modules/pytensor/default.nix | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 96ca2309c957..1434ed7a44d3 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -25,21 +25,21 @@ pytest-mock, pytestCheckHook, tensorflow-probability, - pythonAtLeast, + writableTmpDirAsHomeHook, nix-update-script, }: buildPythonPackage rec { pname = "pytensor"; - version = "2.26.4"; + version = "2.28.0"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pytensor"; tag = "rel-${version}"; - hash = "sha256-pREyBedkF9MW7g3Bctnk8C9vVbRTsLLreldxlqDdHVI="; + hash = "sha256-jwx7fcMiFNvnwP746nM2rqo2BD6PEbKkfEwIz8MenN4="; }; pythonRelaxDeps = [ @@ -69,12 +69,9 @@ buildPythonPackage rec { pytest-mock pytestCheckHook tensorflow-probability + writableTmpDirAsHomeHook ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; - pythonImportsCheck = [ "pytensor" ]; # Ensure that the installed package is used instead of the source files from the current workdir @@ -94,6 +91,10 @@ buildPythonPackage rec { # Failure reported upstream: https://github.com/pymc-devs/pytensor/issues/980 "test_choose_signature" + + # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06 + # Mismatched elements: 9 / 81 (11.1%) + "test_jax_pad" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # pytensor.link.c.exceptions.CompileError: Compilation failed (return status=1) @@ -111,6 +112,7 @@ buildPythonPackage rec { "test_NoOutputFromInplace" "test_OpFromGraph" "test_adv_sub1_sparse_grad" + "test_alloc" "test_binary" "test_borrow_input" "test_borrow_output" @@ -136,6 +138,7 @@ buildPythonPackage rec { "test_mul_s_v_grad" "test_multiple_outputs" "test_not_inplace" + "test_numba_Cholesky_grad" "test_numba_pad" "test_optimizations_preserved" "test_overided_function" @@ -146,6 +149,7 @@ buildPythonPackage rec { "test_scan_err1" "test_scan_err2" "test_shared" + "test_solve_triangular_grad" "test_structured_add_s_v_grad" "test_structureddot_csc_grad" "test_structureddot_csr_grad" @@ -157,18 +161,29 @@ buildPythonPackage rec { "test_update_equiv" "test_update_same" ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # Flaky: TypeError: cannot pickle 'PyCapsule' object + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # pytensor/link/basic.py", line 665 in thunk + "test_Unique" + "test_aligned_RandomVariable" "test_blockwise" - "test_blockwise_benchmark" + "test_mvnormal_cov_decomposition_method" + "test_unnatural_batched_dims" ]; - disabledTestPaths = [ - # Don't run the most compute-intense tests - "tests/scan/" - "tests/tensor/" - "tests/sparse/sandbox/" - ]; + disabledTestPaths = + [ + # Don't run the most compute-intense tests + "tests/scan/" + "tests/tensor/" + "tests/sparse/sandbox/" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # Fatal Python error: Segmentation fault + # pytensor/link/basic.py", line 665 in thunk + "tests/link/numba/test_nlinalg.py" + "tests/link/numba/test_slinalg.py" + ]; passthru.updateScript = nix-update-script { extraArgs = [ @@ -187,8 +202,5 @@ buildPythonPackage rec { bcdarwin ferrine ]; - # Not yet compatible with numpy >= 2.0 - # https://github.com/pymc-devs/pytensor/issues/688 - broken = true; }; } From cb56b2809d2b726a9846e3a3685cb6db3862ca82 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 6 Feb 2025 17:01:27 +0100 Subject: [PATCH 07/27] python312Packages.pymc: 5.20.0 -> 5.20.1 Diff: https://github.com/pymc-devs/pymc/compare/refs/tags/v5.20.0...v5.20.1 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.20.1 --- pkgs/development/python-modules/pymc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 603136c65a22..4ac12b51bddb 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.20.0"; + version = "5.20.1"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-5iHm+q4ykXhCntUpZmEfZc1805+GoCQR3yrkQGJ2qQg="; + hash = "sha256-Vc+yjMd5XCM97Y0JIfII+PfNz0rx1hi9N370mgBbO+8="; }; postPatch = '' @@ -42,6 +42,10 @@ buildPythonPackage rec { versioneer ]; + pythonRelaxDeps = [ + "pytensor" + ]; + dependencies = [ arviz cachetools @@ -64,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc"; - changelog = "https://github.com/pymc-devs/pymc/releases/tag/${src.tag}"; + changelog = "https://github.com/pymc-devs/pymc/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nidabdella From 5e7818e81d83dbc6113db0c8904c96e7bed590c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 15:40:30 +0000 Subject: [PATCH 08/27] sydbox: 3.32.2 -> 3.32.3 --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index dd45b7f52c5d..3b19ad959223 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "sydbox"; - version = "3.32.2"; + version = "3.32.3"; outputs = [ "out" @@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec { owner = "Sydbox"; repo = "sydbox"; tag = "v${version}"; - hash = "sha256-afuOpRRjUDYCIERSQzrVykrxc9bxRvUqU62aA/Z83VY="; + hash = "sha256-h96D/IeNJ3sTiJNHGUzU5iR1XJCeI83s3EB659MS5ds="; }; useFetchCargoVendor = true; - cargoHash = "sha256-NasGY1FTdO3EtnIkNcvntnR3aiCe0mUrVCBnwiNy7Bs="; + cargoHash = "sha256-AwN3DIVJb3M4nJ+2GWtPTLGKA3zMcxw6Oq19s/JtFGE="; nativeBuildInputs = [ mandoc From 25b4c690a677c55e68dc0842d5363fed395cfa91 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 22 Feb 2025 22:35:42 +0100 Subject: [PATCH 09/27] python312Packages.bambi: disable failing test --- pkgs/development/python-modules/bambi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index a71d435f862b..90b6aa66ff50 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -19,6 +19,7 @@ blackjax, numpyro, pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -58,14 +59,15 @@ buildPythonPackage rec { blackjax numpyro pytestCheckHook + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = [ + # AssertionError: assert ( Size: 1B\narray(False) & Size: 1B\narray(False)) + # https://github.com/bambinos/bambi/issues/888 + "test_beta_regression" + # Tests require network access "test_alias_equal_to_name" "test_average_by" From d4cb7bdf47ecb3d96a35c2dcfb0a84fefbbd1288 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Feb 2025 22:46:12 +0100 Subject: [PATCH 10/27] python313Packages.aioguardian: 2023.12.0 -> 2025.02.0 Diff: bachya/aioguardian@refs/tags/2023.12.0...2025.02.0 Changelog: https://github.com/bachya/aioguardian/releases/tag/2025.02.0 --- .../python-modules/aioguardian/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index db71a552bdc2..6b20a14f4043 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -1,43 +1,50 @@ { lib, aiohttp, - async-timeout, asyncio-dgram, buildPythonPackage, certifi, - docutils, fetchFromGitHub, + frozenlist, poetry-core, pytest-aiohttp, pytest-asyncio, pytestCheckHook, pythonOlder, voluptuous, + typing-extensions, + yarl, }: buildPythonPackage rec { pname = "aioguardian"; - version = "2023.12.0"; + version = "2025.02.0"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "bachya"; repo = "aioguardian"; tag = version; - hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o="; + hash = "sha256-RoVD2O/OAk4l96kYEq7ZM/2QuckcPxDluf1MT4HdKc4="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "asyncio_dgram" + "typing-extensions" + ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp - async-timeout asyncio-dgram certifi - docutils + frozenlist voluptuous + typing-extensions + yarl ]; nativeCheckInputs = [ From 4fd85a0e1980deb667f53cb5421d56b02ef8b5b8 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Thu, 13 Feb 2025 22:44:13 +0100 Subject: [PATCH 11/27] python312Packages.colormath2: init at 3.0.3 This is a fork of python312Packages.colormath2 that is unmaintained. --- .../python-modules/colormath2/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/colormath2/default.nix diff --git a/pkgs/development/python-modules/colormath2/default.nix b/pkgs/development/python-modules/colormath2/default.nix new file mode 100644 index 000000000000..30f081f8cb62 --- /dev/null +++ b/pkgs/development/python-modules/colormath2/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + networkx, + numpy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "colormath2"; + version = "3.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bkmgit"; + repo = "python-colormath2"; + tag = version; + hash = "sha256-G8b0L8A2RzbVQFPNg2fuBklqTNjo3yqvek/+GnqtsHc="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + networkx + numpy + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "colormath2" ]; + + meta = { + description = "Color math and conversion library (fork)"; + homepage = "https://github.com/bkmgit/python-colormath2"; + changelog = "https://github.com/bkmgit/python-colormath2/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ apraga ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b634be25d594..fd1daec9f2ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2560,6 +2560,8 @@ self: super: with self; { colormath = callPackage ../development/python-modules/colormath { }; + colormath2 = callPackage ../development/python-modules/colormath2 { }; + colorspacious = callPackage ../development/python-modules/colorspacious { }; colorthief = callPackage ../development/python-modules/colorthief { }; From b872d76484b1c3c24616e909c340433ff01682c9 Mon Sep 17 00:00:00 2001 From: Alexis Praga Date: Thu, 13 Feb 2025 23:00:39 +0100 Subject: [PATCH 12/27] python312Packages.spectra: 0.0.11 -> 0.1.0 Main change : colormath -> colormath2 --- .../python-modules/spectra/default.nix | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/spectra/default.nix b/pkgs/development/python-modules/spectra/default.nix index f07c17a3bd16..8090bd49dd1f 100644 --- a/pkgs/development/python-modules/spectra/default.nix +++ b/pkgs/development/python-modules/spectra/default.nix @@ -1,40 +1,29 @@ { - buildPythonPackage, - colormath, - fetchFromGitHub, - fetchpatch2, lib, - pytestCheckHook, + buildPythonPackage, + fetchFromGitHub, setuptools, + colormath2, + pytestCheckHook, }: buildPythonPackage rec { pname = "spectra"; - version = "0.0.11"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jsvine"; repo = "spectra"; tag = "v${version}"; - hash = "sha256-4A2TWTxYqckJ3DX5cd2KN3KXcmO/lQdXmOEnGi76RsA="; + hash = "sha256-PS5p9IR3v6+Up5Fcq8mhkprVgXigD6PZUF4/6hbv7NI="; }; - patches = [ - # https://github.com/jsvine/spectra/pull/21 - (fetchpatch2 { - name = "nose-to-pytest.patch"; - url = "https://github.com/jsvine/spectra/commit/50037aba16dac4bf0fb7ffbd787d0e6b906e8a4b.patch"; - hash = "sha256-cMoIbjRwcZjvhiIOcJR7NmIAOaqpr/e5eh9+sPGKqos="; - excludes = [ ".github/*" ]; - }) - ]; - build-system = [ setuptools ]; - propagatedBuildInputs = [ colormath ]; + dependencies = [ colormath2 ]; nativeCheckInputs = [ pytestCheckHook From 7df1bf3fe53208089e1fee55523917c9435d2c05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Feb 2025 00:33:28 +0100 Subject: [PATCH 13/27] evcc: 0.133.0 -> 0.200.2 https://github.com/evcc-io/evcc/releases/tag/0.200.0 https://github.com/evcc-io/evcc/releases/tag/0.200.1 https://github.com/evcc-io/evcc/releases/tag/0.200.2 --- pkgs/by-name/ev/evcc/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 05290fb1b405..c2057a5a2572 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -1,12 +1,13 @@ { lib, stdenv, - buildGoModule, + buildGo124Module, fetchFromGitHub, fetchNpmDeps, cacert, git, - go, + go_1_24, + gokrazy, enumer, mockgen, nodejs, @@ -16,23 +17,23 @@ }: let - version = "0.133.0"; + version = "0.200.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-10xgw6zL49Hk7OH5c6lqeTsIhdkSOyRZCJjSkQox0XI="; + hash = "sha256-qSWSZ6luD6Wglmvf9zCoSNs3eVBY6Ket4GFEBKIh99c="; }; - vendorHash = "sha256-aBTs6S7b+1JS9MNKWMpuUZ6AXb9ylfXnuAV7q9WnE9w="; + vendorHash = "sha256-sx04fyRXX9H2182yz8qvdLv/sSLXTrzhlwpf8lMSVew="; commonMeta = with lib; { license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; - decorate = buildGoModule { + decorate = buildGo124Module { pname = "evcc-decorate"; inherit version src vendorHash; @@ -45,13 +46,13 @@ let }; in -buildGoModule rec { +buildGo124Module rec { pname = "evcc"; inherit version src vendorHash; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-AlwmMipGBnUSaqXxVBlC1c1IZ5utxLYx01T9byXOTrQ="; + hash = "sha256-VYAJO2HeswhBlCVKi08frkvhKc/AFepmrSGY4JccBZE="; }; nativeBuildInputs = [ @@ -63,7 +64,8 @@ buildGoModule rec { nativeBuildInputs = [ decorate enumer - go + go_1_24 + gokrazy git cacert mockgen From dbdee4ab67ce7ffb393f61bc50a330cc7e3fb5ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Feb 2025 02:27:12 +0100 Subject: [PATCH 14/27] nixos/test/evcc: migrate to runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/evcc.nix | 184 +++++++++++++++++++------------------- 2 files changed, 91 insertions(+), 95 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index de8d97bd2e5f..5cc5a3e5d56d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -329,7 +329,7 @@ in { etcd-cluster = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; etesync-dav = handleTest ./etesync-dav.nix {}; - evcc = handleTest ./evcc.nix {}; + evcc = runTest ./evcc.nix; fail2ban = handleTest ./fail2ban.nix { }; fakeroute = handleTest ./fakeroute.nix {}; fancontrol = handleTest ./fancontrol.nix {}; diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix index 1988ed3f1a9b..465dca58bc30 100644 --- a/nixos/tests/evcc.nix +++ b/nixos/tests/evcc.nix @@ -1,107 +1,103 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: +{ pkgs, lib, ... }: - { - name = "evcc"; - meta.maintainers = with lib.maintainers; [ hexa ]; +{ + name = "evcc"; + meta.maintainers = with lib.maintainers; [ hexa ]; - nodes = { - machine = - { config, ... }: - { - services.evcc = { - enable = true; - settings = { - network = { - schema = "http"; - host = "localhost"; - port = 7070; - }; + nodes = { + machine = { + services.evcc = { + enable = true; + settings = { + network = { + schema = "http"; + host = "localhost"; + port = 7070; + }; - log = "info"; + log = "info"; - site = { - title = "NixOS Test"; - meters = { - grid = "grid"; - pv = "pv"; - }; - }; - - meters = [ - { - type = "custom"; - name = "grid"; - power = { - source = "script"; - cmd = "/bin/sh -c 'echo -4500'"; - }; - } - { - type = "custom"; - name = "pv"; - power = { - source = "script"; - cmd = "/bin/sh -c 'echo 7500'"; - }; - } - ]; - - chargers = [ - { - name = "dummy-charger"; - type = "custom"; - status = { - source = "script"; - cmd = "/bin/sh -c 'echo charger status A'"; - }; - enabled = { - source = "script"; - cmd = "/bin/sh -c 'echo charger enabled state false'"; - }; - enable = { - source = "script"; - cmd = "/bin/sh -c 'echo set charger enabled state true'"; - }; - maxcurrent = { - source = "script"; - cmd = "/bin/sh -c 'echo set charger max current 7200'"; - }; - } - ]; - - loadpoints = [ - { - title = "Dummy"; - charger = "dummy-charger"; - } - ]; + site = { + title = "NixOS Test"; + meters = { + grid = "grid"; + pv = "pv"; }; }; + + meters = [ + { + type = "custom"; + name = "grid"; + power = { + source = "script"; + cmd = "/bin/sh -c 'echo -4500'"; + }; + } + { + type = "custom"; + name = "pv"; + power = { + source = "script"; + cmd = "/bin/sh -c 'echo 7500'"; + }; + } + ]; + + chargers = [ + { + name = "dummy-charger"; + type = "custom"; + status = { + source = "script"; + cmd = "/bin/sh -c 'echo charger status A'"; + }; + enabled = { + source = "script"; + cmd = "/bin/sh -c 'echo charger enabled state false'"; + }; + enable = { + source = "script"; + cmd = "/bin/sh -c 'echo set charger enabled state true'"; + }; + maxcurrent = { + source = "script"; + cmd = "/bin/sh -c 'echo set charger max current 7200'"; + }; + } + ]; + + loadpoints = [ + { + title = "Dummy"; + charger = "dummy-charger"; + } + ]; }; + }; }; + }; - testScript = '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("evcc.service") - machine.wait_for_open_port(7070) + machine.wait_for_unit("evcc.service") + machine.wait_for_open_port(7070) - with subtest("Check package version propagates into frontend"): - machine.fail( - "curl --fail http://localhost:7070 | grep '0.0.1-alpha'" - ) - machine.succeed( - "curl --fail http://localhost:7070 | grep '${pkgs.evcc.version}'" - ) + with subtest("Check package version propagates into frontend"): + machine.fail( + "curl --fail http://localhost:7070 | grep '0.0.1-alpha'" + ) + machine.succeed( + "curl --fail http://localhost:7070 | grep '${pkgs.evcc.version}'" + ) - with subtest("Check journal for errors"): - _, output = machine.execute("journalctl -o cat -u evcc.service") - assert "FATAL" not in output + with subtest("Check journal for errors"): + _, output = machine.execute("journalctl -o cat -u evcc.service") + assert "FATAL" not in output - with subtest("Check systemd hardening"): - _, output = machine.execute("systemd-analyze security evcc.service | grep -v '✓'") - machine.log(output) - ''; - } -) + with subtest("Check systemd hardening"): + _, output = machine.execute("systemd-analyze security evcc.service | grep -v '✓'") + machine.log(output) + ''; +} From 64f738dc58a3f8630cdc745391c28cbae5313a3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Feb 2025 01:28:48 +0100 Subject: [PATCH 15/27] maintainers: drop srid Banned from the community on 2023-11-14. --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/ni/nix-health/package.nix | 5 +---- pkgs/by-name/ni/nixci/package.nix | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 3 --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3d5ce0f4d991..af09120bba5f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22219,13 +22219,6 @@ githubId = 219362; name = "Sarah Brofeldt"; }; - srid = { - email = "srid@srid.ca"; - matrix = "@srid:matrix.org"; - github = "srid"; - githubId = 3998; - name = "Sridhar Ratnakumar"; - }; srounce = { name = "Samuel Rounce"; email = "me@samuelrounce.co.uk"; diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index 26f390b09201..ab6cf7acfec3 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -42,10 +42,7 @@ rustPlatform.buildRustPackage rec { description = "Check the health of your Nix setup"; homepage = "https://github.com/juspay/nix-health"; license = licenses.asl20; - maintainers = with maintainers; [ - srid - shivaraj-bh - ]; + maintainers = with maintainers; [ shivaraj-bh ]; mainProgram = "nix-health"; }; } diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix index 1957cfcda026..458a03ade240 100644 --- a/pkgs/by-name/ni/nixci/package.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -63,7 +63,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/srid/nixci"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ - srid shivaraj-bh rsrohitsingh682 ]; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 447df2a7ce02..50a0aa0110ea 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -445,9 +445,6 @@ package-maintainers: - ttn-client - update-nix-fetchgit - zre - srid: - - ema - - emanote sternenseemann: # also maintain upstream package - cabal2nix diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0276b44a4bc9..09d46c1033ca 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -100901,7 +100901,6 @@ self: { ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; - maintainers = [ lib.maintainers.srid ]; }) {}; "ema-extra" = callPackage @@ -101220,7 +101219,6 @@ self: { license = lib.licenses.agpl3Only; badPlatforms = [ "x86_64-darwin" ]; mainProgram = "emanote"; - maintainers = [ lib.maintainers.srid ]; }) {}; "embed-config" = callPackage From 338658eb825aec66ea7fe0771d917856cfe79599 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Feb 2025 01:35:57 +0100 Subject: [PATCH 16/27] maintainers: drop blaggacao Banned from the community on 2023-12-17. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/gi/git-town/package.nix | 1 - pkgs/by-name/go/go-rice/package.nix | 2 +- pkgs/by-name/ho/hostctl/package.nix | 2 +- pkgs/by-name/jd/jd-diff-patch/package.nix | 1 - pkgs/by-name/ku/kubespy/package.nix | 2 +- pkgs/by-name/md/mdbook-d2/package.nix | 2 +- pkgs/by-name/md/mdbook-emojicodes/package.nix | 1 - pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix | 1 - pkgs/by-name/md/mdbook-pagetoc/package.nix | 1 - pkgs/by-name/no/norouter/package.nix | 2 +- pkgs/by-name/te/terraform-backend-git/package.nix | 2 +- pkgs/development/python-modules/annotated-types/default.nix | 2 +- pkgs/development/python-modules/git-url-parse/default.nix | 2 +- pkgs/development/python-modules/gocardless-pro/default.nix | 2 +- pkgs/development/python-modules/pydantic-core/default.nix | 2 +- pkgs/development/python-modules/pymatting/default.nix | 2 +- pkgs/development/python-modules/pypika/default.nix | 2 +- pkgs/development/python-modules/python-youtube/default.nix | 2 +- pkgs/tools/networking/ifwifi/default.nix | 2 +- 20 files changed, 14 insertions(+), 25 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index af09120bba5f..d80eab25a6c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3142,12 +3142,6 @@ githubId = 5718007; name = "Bastian Köcher"; }; - blaggacao = { - name = "David Arnold"; - email = "dar@xoe.solutions"; - github = "blaggacao"; - githubId = 7548295; - }; blakesmith = { name = "Blake Smith"; email = "blakesmith0@gmail.com"; diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 623f81ed61d4..0bc2fca142ba 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -82,7 +82,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ allonsy - blaggacao gabyx ]; mainProgram = "git-town"; diff --git a/pkgs/by-name/go/go-rice/package.nix b/pkgs/by-name/go/go-rice/package.nix index f98384bd270f..85127bc363d3 100644 --- a/pkgs/by-name/go/go-rice/package.nix +++ b/pkgs/by-name/go/go-rice/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { description = "Go package that makes working with resources such as html, js, css, images, templates very easy"; homepage = "https://github.com/GeertJohan/go.rice"; license = licenses.bsd2; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; mainProgram = "rice"; }; } diff --git a/pkgs/by-name/ho/hostctl/package.nix b/pkgs/by-name/ho/hostctl/package.nix index 6cc9412266e9..a5838703674c 100644 --- a/pkgs/by-name/ho/hostctl/package.nix +++ b/pkgs/by-name/ho/hostctl/package.nix @@ -42,7 +42,7 @@ buildGoModule rec { ''; homepage = "https://guumaster.github.io/hostctl/"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; mainProgram = "hostctl"; }; } diff --git a/pkgs/by-name/jd/jd-diff-patch/package.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix index e69daa1be12a..f2899114af2b 100644 --- a/pkgs/by-name/jd/jd-diff-patch/package.nix +++ b/pkgs/by-name/jd/jd-diff-patch/package.nix @@ -29,7 +29,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ bryanasdev000 - blaggacao ]; mainProgram = "jd"; }; diff --git a/pkgs/by-name/ku/kubespy/package.nix b/pkgs/by-name/ku/kubespy/package.nix index eff7b4624dae..6a28cc19c305 100644 --- a/pkgs/by-name/ku/kubespy/package.nix +++ b/pkgs/by-name/ku/kubespy/package.nix @@ -39,6 +39,6 @@ buildGoModule rec { mainProgram = "kubespy"; homepage = "https://github.com/pulumi/kubespy"; license = licenses.asl20; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index b948c7a2cb0b..72897f5957cf 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/danieleades/mdbook-d2"; changelog = "https://github.com/danieleades/mdbook-d2/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao matthiasbeyer ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index e8c39c0a0000..430e3f32f30a 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/blyxyas/mdbook-emojicodes/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ - blaggacao matthiasbeyer ]; }; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index 5a20db414d6e..fd18fe07fc96 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/joelcourtney/mdbook-kroki-preprocessor"; license = licenses.gpl3Only; maintainers = with maintainers; [ - blaggacao matthiasbeyer ]; }; diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix index b61c9e9ea060..0a91b274eb12 100644 --- a/pkgs/by-name/md/mdbook-pagetoc/package.nix +++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/slowsage/mdbook-pagetoc"; license = licenses.mit; maintainers = with maintainers; [ - blaggacao matthiasbeyer ]; }; diff --git a/pkgs/by-name/no/norouter/package.nix b/pkgs/by-name/no/norouter/package.nix index 73b9273e5d64..6cd63474af38 100644 --- a/pkgs/by-name/no/norouter/package.nix +++ b/pkgs/by-name/no/norouter/package.nix @@ -34,7 +34,7 @@ buildGoModule rec { description = "Tool to handle unprivileged networking by using multiple loopback addresses"; homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; mainProgram = "norouter"; }; } diff --git a/pkgs/by-name/te/terraform-backend-git/package.nix b/pkgs/by-name/te/terraform-backend-git/package.nix index cba0fd94eaca..0df99f3ddce7 100644 --- a/pkgs/by-name/te/terraform-backend-git/package.nix +++ b/pkgs/by-name/te/terraform-backend-git/package.nix @@ -41,6 +41,6 @@ buildGoModule rec { homepage = "https://github.com/plumber-cd/terraform-backend-git"; changelog = "https://github.com/plumber-cd/terraform-backend-git/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/annotated-types/default.nix b/pkgs/development/python-modules/annotated-types/default.nix index b72c6404071c..cd818c067676 100644 --- a/pkgs/development/python-modules/annotated-types/default.nix +++ b/pkgs/development/python-modules/annotated-types/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/annotated-types/annotated-types"; changelog = "https://github.com/annotated-types/annotated-types/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/git-url-parse/default.nix b/pkgs/development/python-modules/git-url-parse/default.nix index f49bf677ecc8..67a0e5a38030 100644 --- a/pkgs/development/python-modules/git-url-parse/default.nix +++ b/pkgs/development/python-modules/git-url-parse/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/coala/git-url-parse"; changelog = "https://github.com/coala/git-url-parse/blob/${src.rev}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index b61bb0326632..54591dc9af35 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://github.com/gocardless/gocardless-pro-python"; changelog = "https://github.com/gocardless/gocardless-pro-python/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 88be177af130..f246f5f39666 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -80,7 +80,7 @@ let description = "Core validation logic for pydantic written in rust"; homepage = "https://github.com/pydantic/pydantic-core"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix index 7f65640f012b..89ca430db1c3 100644 --- a/pkgs/development/python-modules/pymatting/default.nix +++ b/pkgs/development/python-modules/pymatting/default.nix @@ -58,6 +58,6 @@ buildPythonPackage rec { homepage = "https://github.com/pymatting/pymatting"; changelog = "https://github.com/pymatting/pymatting/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pypika/default.nix b/pkgs/development/python-modules/pypika/default.nix index 1acaee0a89f2..70e3d3bcb114 100644 --- a/pkgs/development/python-modules/pypika/default.nix +++ b/pkgs/development/python-modules/pypika/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python SQL query builder"; homepage = "https://github.com/kayak/pypika"; license = licenses.asl20; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix index 0496cc57a68d..0a335053af47 100644 --- a/pkgs/development/python-modules/python-youtube/default.nix +++ b/pkgs/development/python-modules/python-youtube/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/sns-sdks/python-youtube"; changelog = "https://github.com/sns-sdks/python-youtube/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ blaggacao ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index 0e9b2c850f74..3504a56c920f 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/araujobsd/ifwifi"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ blaggacao ]; + maintainers = with maintainers; [ ]; # networkmanager doesn't work on darwin # even though the `wifiscanner` crate would work platforms = with platforms; linux; # ++ darwin; From 6f7bcb6e435ceb4b0a1c8faa8c2302ddafaa74d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Feb 2025 01:42:45 +0100 Subject: [PATCH 17/27] maintainers: drop nrdxp Banned from the community on 2024-11-06. --- maintainers/maintainer-list.nix | 7 ------- maintainers/team-list.nix | 1 - nixos/modules/programs/gamescope.nix | 2 +- .../networking/browsers/qutebrowser/default.nix | 1 - pkgs/by-name/cf/cfdyndns/package.nix | 1 - pkgs/by-name/ev/eva/package.nix | 1 - pkgs/by-name/ga/gamescope/package.nix | 1 - pkgs/development/python-modules/pyqt-builder/default.nix | 2 +- .../development/python-modules/pyqt6-webengine/default.nix | 1 - pkgs/development/python-modules/sip/default.nix | 2 +- 10 files changed, 3 insertions(+), 16 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d80eab25a6c6..47cbb63019bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17041,13 +17041,6 @@ githubId = 24574288; name = "Nikodem Rabuliński"; }; - nrdxp = { - email = "tim.deh@pm.me"; - matrix = "@timdeh:matrix.org"; - github = "nrdxp"; - githubId = 34083928; - name = "Tim DeHerrera"; - }; nrhelmi = { email = "helmiinour@gmail.com"; github = "NRHelmi"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index aa77c3245932..6fce487c6ed5 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -546,7 +546,6 @@ with lib.maintainers; cleverca22 disassembler manveru - nrdxp ]; scope = "Input-Output Global employees, which maintain critical software"; shortName = "Input-Output Global employees"; diff --git a/nixos/modules/programs/gamescope.nix b/nixos/modules/programs/gamescope.nix index f3659ff20a40..62de0006551c 100644 --- a/nixos/modules/programs/gamescope.nix +++ b/nixos/modules/programs/gamescope.nix @@ -78,5 +78,5 @@ in environment.systemPackages = lib.mkIf (!cfg.capSysNice) [ gamescope ]; }; - meta.maintainers = with lib.maintainers; [ nrdxp ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1de7936f7d7f..66a2fc921c56 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -164,7 +164,6 @@ python3.pkgs.buildPythonApplication { rnhmjoj ebzzry dotlambda - nrdxp ]; }; } diff --git a/pkgs/by-name/cf/cfdyndns/package.nix b/pkgs/by-name/cf/cfdyndns/package.nix index 8ee036e18f1a..feb1e50b0091 100644 --- a/pkgs/by-name/cf/cfdyndns/package.nix +++ b/pkgs/by-name/cf/cfdyndns/package.nix @@ -30,7 +30,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with maintainers; [ colemickens - nrdxp ]; platforms = with platforms; linux; }; diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix index 82f865814887..b758b5b538a7 100644 --- a/pkgs/by-name/ev/eva/package.nix +++ b/pkgs/by-name/ev/eva/package.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/NerdyPepper/eva"; license = licenses.mit; maintainers = with maintainers; [ - nrdxp ma27 figsoda ]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 1462e6e8a4ed..7dc34cce547b 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -185,7 +185,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ValveSoftware/gamescope"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ - nrdxp pedrohlc Scrumplex zhaofengli diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index ef8af60f541b..3e7d899a24b4 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "PEP 517 compliant build system for PyQt"; homepage = "https://github.com/Python-PyQt/PyQt-builder"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nrdxp ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index 4f410a23626f..e71d5128184f 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -96,7 +96,6 @@ buildPythonPackage rec { inherit (mesa.meta) platforms; maintainers = with lib.maintainers; [ LunNova - nrdxp ]; }; } diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index bf83c5c8c142..7f544f6c1531 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Creates C++ bindings for Python modules"; homepage = "https://riverbankcomputing.com/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nrdxp ]; + maintainers = with maintainers; [ ]; }; } From a5e6cc2ffe1a1a842a7bdfab4d1d5fb3c70044e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Feb 2025 01:43:58 +0100 Subject: [PATCH 18/27] maintainers: drop tgunnoe Banned from the community on 2024-11-09. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/op/openjk/package.nix | 2 +- pkgs/games/lzwolf/default.nix | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47cbb63019bf..927fb0802df2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23165,12 +23165,6 @@ github = "tfmoraes"; githubId = 351108; }; - tgunnoe = { - email = "t@gvno.net"; - github = "tgunnoe"; - githubId = 7254833; - name = "Taylor Gunnoe"; - }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix index 15b89654ad4e..beff76cf9dd5 100644 --- a/pkgs/by-name/op/openjk/package.nix +++ b/pkgs/by-name/op/openjk/package.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation { homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ tgunnoe ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 44551efd384a..9537d959253e 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { mainProgram = "lzwolf"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ tgunnoe ]; + maintainers = with maintainers; [ ]; }; } From 7dc635328006b1ce4862997934da3fdadc206146 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 Feb 2025 01:45:56 +0100 Subject: [PATCH 19/27] maintainers: drop RGBCube Banned from the community on 2024-06-25. --- maintainers/maintainer-list.nix | 7 ------- pkgs/by-name/gr/gruvbox-plus-icons/package.nix | 2 +- pkgs/by-name/ma/material-cursors/package.nix | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 927fb0802df2..fe00f03a8a3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19772,13 +19772,6 @@ githubId = 44014925; name = "Rexx Larsson"; }; - RGBCube = { - name = "RGBCube"; - email = "nixpkgs@rgbcu.be"; - github = "RGBCube"; - githubId = 78925721; - keys = [ { fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; } ]; - }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index b182026972aa..ffb34bfd54bd 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -42,6 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ eureka-cpu RGBCube ]; + maintainers = with maintainers; [ eureka-cpu ]; }; }) diff --git a/pkgs/by-name/ma/material-cursors/package.nix b/pkgs/by-name/ma/material-cursors/package.nix index 76a4746e2e7f..a67071394999 100644 --- a/pkgs/by-name/ma/material-cursors/package.nix +++ b/pkgs/by-name/ma/material-cursors/package.nix @@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/varlesh/material-cursors"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ RGBCube ]; + maintainers = with lib.maintainers; [ ]; }; } From a61120b3d5a18fc8a928472a18c2132350b5e897 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 22 Feb 2025 19:44:34 -0500 Subject: [PATCH 20/27] roon-server: 2.0-1496 -> 2.47.1510 https://community.roonlabs.com/t/roon-2-47-build-1510-and-arc-1-63-build-344-are-live/293889 --- pkgs/by-name/ro/roon-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index 2ee08db09230..4d0d447930c5 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,8 +16,8 @@ stdenv, }: let - version = "2.0-1496"; - urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; + version = "2.47.1510"; + urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { pname = "roon-server"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-QglwnTO7dZ/8X8pNj63D6XQdJmGTKPfOG91xgfqWho0="; + hash = "sha256-xuXQLniV2PKIeupfCH00j0e9mRxLocEraENqIUkdWNo="; }; dontConfigure = true; From a834e1a0477a0c52024313f0118b497fb8d11da0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 14 Jan 2025 08:54:36 +0100 Subject: [PATCH 21/27] python312Packages.oryx: 0.2.7 -> 0.2.9 --- .../python-modules/oryx/default.nix | 79 +++++++++++++++++-- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/oryx/default.nix b/pkgs/development/python-modules/oryx/default.nix index db61db9ca36d..169902c8a5be 100644 --- a/pkgs/development/python-modules/oryx/default.nix +++ b/pkgs/development/python-modules/oryx/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, # build-system poetry-core, @@ -18,14 +18,13 @@ buildPythonPackage rec { pname = "oryx"; - version = "0.2.7"; + version = "0.2.9"; pyproject = true; - src = fetchFromGitHub { - owner = "jax-ml"; - repo = "oryx"; - tag = "v${version}"; - hash = "sha256-1n7ogGuFNAeOyXWe0/pAouhg2+aA3MXxlCcsrfqRTdU="; + # No more tags on GitHub. See https://github.com/jax-ml/oryx/issues/95 + src = fetchPypi { + inherit pname version; + hash = "sha256-HlKUnguTNfs7gSqIJ0n2EjjLXPUgtI2JsQM70wKMeXs="; }; build-system = [ poetry-core ]; @@ -43,6 +42,72 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Number of devices 1 must equal the product of mesh_shape (1, 2) + "test_plant" + "test_plant_before_shmap" + "test_plant_inside_shmap_fails" + "test_reap" + "test_reap_before_shmap" + "test_reap_inside_shmap_fails" + + # ValueError: Variable has already been reaped + "test_call_list" + "test_call_tuple" + "test_dense_combinator" + "test_dense_function" + "test_dense_imperative" + "test_function_in_combinator_in_function" + "test_grad_of_function_with_literal" + "test_grad_of_shared_layer" + "test_grad_of_stateful_function" + "test_kwargs_rng" + "test_kwargs_training" + "test_kwargs_training_rng" + "test_reshape_call" + "test_scale_by_adam_should_scale_by_adam" + "test_scale_by_schedule_should_update_scale" + "test_scale_by_stddev_should_scale_by_stddev" + "test_trace_should_keep_track_of_momentum_with_nesterov" + + # NotImplementedError: No registered inverse for `split` + "test_inverse_of_split" + + # jax.errors.UnexpectedTracerError: Encountered an unexpected tracer + "test_can_plant_into_jvp_of_custom_jvp_function_unimplemented" + "test_forward_Scale" + + # ValueError: No variable declared for assign: update_1 + "test_optimizer_adam" + "test_optimizer_noisy_sgd" + "test_optimizer_rmsprop" + "test_optimizer_sgd" + "test_optimizer_sgd_with_momentum" + "test_optimizer_sgd_with_nesterov_momentum" + + # AssertionError + # ACTUAL: array(-2.337877, dtype=float32) + # DESIRED: array(0., dtype=float32) + "test_can_map_over_batches_with_vmap_and_reduce_to_scalar_log_prob" + "test_vmapping_distribution_reduces_to_scalar_log_prob" + + # TypeError: _dot_general_shape_rule() missing 1 required keyword-only argument: 'out_sharding' + "test_can_rewrite_dot_to_einsu" + + # AttributeError: 'float' object has no attribute 'shape' + "test_add_noise_should_add_noise" + "test_apply_every_should_delay_updates" + + # TypeError: Error interpreting argument to functools.partial(...) as an abstract array + "test_can_rewrite_nested_expression_into_single_einsum" + ]; + + disabledTestPaths = [ + # ValueError: Variable has already been reaped + "oryx/experimental/nn/normalization_test.py" + "oryx/experimental/nn/pooling_test.py" + ]; + meta = { description = "Library for probabilistic programming and deep learning built on top of Jax"; homepage = "https://github.com/jax-ml/oryx"; From 89f74e9a0e934f2191ced01b00b17ae06ca289d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Feb 2025 01:21:23 +0000 Subject: [PATCH 22/27] gh-dash: 4.11.0 -> 4.12.0 --- pkgs/by-name/gh/gh-dash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index b4d9dbad1a4a..b739d8d357ce 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-i7PsOd2avaKY0FvsjBpTQk6rijf9EE6kVRicfe4k8NE="; + hash = "sha256-qtSJbp9BGX4669fl/B1Z6rGG3432Nj1IQ+aYfIE9W50="; }; - vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; + vendorHash = "sha256-7s+Lp8CHo1+h2TmbTOcAGZORK+/1wytk4nv9fgD2Mhw="; ldflags = [ "-s" From 698421d0d9faf27479428c952eb7149c9b05e645 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Feb 2025 14:17:16 +0100 Subject: [PATCH 23/27] python312Packages.nutpie: 0.13.2 -> 0.13.4 Diff: https://github.com/pymc-devs/nutpie/compare/refs/tags/v0.13.2...v0.13.4 Changelog: https://github.com/pymc-devs/nutpie/blob/refs/tags/v0.13.4/CHANGELOG.md --- .../python-modules/nutpie/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index a37f5b50c79d..fed4b7ea809d 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, @@ -9,9 +8,6 @@ cargo, rustc, - # buildInputs - libiconv, - # dependencies arviz, pandas, @@ -26,24 +22,25 @@ pymc, pytestCheckHook, setuptools, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "nutpie"; - version = "0.13.2"; + version = "0.13.4"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "nutpie"; tag = "v${version}"; - hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s="; + hash = "sha256-BpKt/EWBefCQUGDxyqF6Xjrj/HUvY4M26gk79R/CyZo="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-mLoMbIy3Chmby+c6j3dg+bQvIHuhDgt3ZzPIXB3WxuE="; + hash = "sha256-d0Qk01YwosHlOy3yb/2PV5Op1Wz+yB5ROVbUWfHooEk="; }; build-system = [ @@ -54,8 +51,8 @@ buildPythonPackage rec { rustc ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv + pythonRelaxDeps = [ + "xarray" ]; dependencies = [ @@ -75,23 +72,18 @@ buildPythonPackage rec { pymc pytestCheckHook setuptools + writableTmpDirAsHomeHook ]; disabledTestPaths = [ # Require unpackaged bridgestan "tests/test_stan.py" - - # KeyError: "duplicate registration for " - "tests/test_pymc.py" ]; - # Currently, no test are working... - doCheck = false; - meta = { description = "Python wrapper for nuts-rs"; homepage = "https://github.com/pymc-devs/nutpie"; - changelog = "https://github.com/pymc-devs/nutpie/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pymc-devs/nutpie/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From 25fb2896ea38048a6c4fd6e1e81dcd0fcd85c71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Feb 2025 20:07:55 +0000 Subject: [PATCH 24/27] warp-terminal: 0.2025.02.19.08.02.stable_04 -> 0.2025.02.19.08.02.stable_05 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 54fd3dd9a715..0f7d2fd35839 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-WOfRQhelQ7q1B2BeJYbCYnvokfw1lmMLUnvUo9bIhIM=", - "version": "0.2025.02.19.08.02.stable_04" + "hash": "sha256-guzskf6U2kmHTZHTJZuH6v3y43FgbZ5XRbW1JRmk1VU=", + "version": "0.2025.02.19.08.02.stable_05" }, "linux_x86_64": { - "hash": "sha256-IVtM6370gwY8nuT78w2DGIOc7TeZE6dcTpP2wIb98po=", - "version": "0.2025.02.19.08.02.stable_04" + "hash": "sha256-eR5AC2MhXcfOWBXefn6ipy0JfbnTNImt0ffH2ypDxxw=", + "version": "0.2025.02.19.08.02.stable_05" }, "linux_aarch64": { - "hash": "sha256-2vlzC/Ho5YJPwdeu3MxKVhZnQPKCD3CQegAZsX/A+qM=", - "version": "0.2025.02.19.08.02.stable_04" + "hash": "sha256-W/6pNDeaq3v5mqoh+urbt0ZVfclTQV5CbBVYZ7ebWGA=", + "version": "0.2025.02.19.08.02.stable_05" } } From 06b36bb519629003bc79e4dcc0c4132b2e9e5c47 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 15 Jan 2025 22:49:46 -0800 Subject: [PATCH 25/27] libaom: fix building with llvm --- pkgs/by-name/li/libaom/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix index 1c1a321f2506..d21c177d3f28 100644 --- a/pkgs/by-name/li/libaom/package.nix +++ b/pkgs/by-name/li/libaom/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { "-DCONFIG_TUNE_VMAF=1" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ - "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" + "-DCMAKE_ASM_COMPILER=${lib.getBin stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # armv7l-hf-multiplatform does not support NEON From 5024df2d7cde035b83715d0d908bafca9cfbb75f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 8 Feb 2025 11:17:05 -0800 Subject: [PATCH 26/27] nixos/nix-daemon: allow nix implementations not following nix versioning --- nixos/modules/services/system/nix-daemon.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 3e5b0d16fca0..78787d08b1e1 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -16,7 +16,9 @@ let nixPackage = cfg.package.out; - isNixAtLeast = lib.versionAtLeast (lib.getVersion nixPackage); + # nixVersion is an attribute which defines the implementation version. + # This is useful for Nix implementations which don't follow Nix's versioning. + isNixAtLeast = lib.versionAtLeast (nixPackage.nixVersion or (lib.getVersion nixPackage)); makeNixBuildUser = nr: { name = "nixbld${toString nr}"; From e7f18964af37b1d0476f22c7c1acd71527a5b74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Feb 2025 21:14:50 -0800 Subject: [PATCH 27/27] python313Packages.pygti: 0.9.4 -> 0.10.0 Diff: https://github.com/vigonotion/pygti/compare/refs/tags/v0.9.4...0.10.0 Changelog: https://github.com/vigonotion/pygti/releases/tag/0.10.0 --- .../python-modules/pygti/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pygti/default.nix b/pkgs/development/python-modules/pygti/default.nix index a26792696f27..a9ee409a15ae 100644 --- a/pkgs/development/python-modules/pygti/default.nix +++ b/pkgs/development/python-modules/pygti/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools-scm, aiohttp, @@ -11,21 +10,19 @@ buildPythonPackage rec { pname = "pygti"; - version = "0.9.4"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "0.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "vigonotion"; repo = "pygti"; - tag = "v${version}"; + tag = version; hash = "sha256-2T4Yw4XEOkv+IWyB4Xa2dPu929VH0tLeUjQ5S8EVXz0="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pytz voluptuous @@ -40,10 +37,11 @@ buildPythonPackage rec { "pygti.gti" ]; - meta = with lib; { + meta = { + changelog = "https://github.com/vigonotion/pygti/releases/tag/${src.tag}"; description = "Access public transport information in Hamburg, Germany"; homepage = "https://github.com/vigonotion/pygti"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; }; }