Merge staging-next into staging

authored by nixpkgs-ci[bot] and committed by GitHub 14efaace dde0ac2c

+324 -144
+6
maintainers/maintainer-list.nix
··· 1475 1475 github = "an-empty-string"; 1476 1476 githubId = 681716; 1477 1477 }; 1478 + ananthb = { 1479 + name = "Ananth Bhaskararaman"; 1480 + email = "nixos-maint@devhuman.net"; 1481 + github = "ananthb"; 1482 + githubId = 3133350; 1483 + }; 1478 1484 anas = { 1479 1485 email = "anas.elgarhy.dev@gmail.com"; 1480 1486 github = "0x61nas";
+18
pkgs/applications/networking/browsers/chromium/common.nix
··· 526 526 # preventing compilations of chromium with versions below their intended version, not about running the very 527 527 # exact version or even running a newer version. 528 528 ./patches/chromium-136-nodejs-assert-minimal-version-instead-of-exact-match.patch 529 + ] 530 + ++ lib.optionals (chromiumVersionAtLeast "138") [ 531 + (fetchpatch { 532 + # Unbreak building with Rust 1.89+ which introduced 533 + # a new mismatched_lifetime_syntaxes lint. 534 + # https://issues.chromium.org/issues/424424323 535 + name = "chromium-138-rust-1.86-mismatched_lifetime_syntaxes.patch"; 536 + # https://chromium-review.googlesource.com/c/chromium/src/+/6658267 537 + url = "https://chromium.googlesource.com/chromium/src/+/94a87ff38c51fd1a71980a5051d3553978391608^!?format=TEXT"; 538 + decode = "base64 -d"; 539 + includes = [ "build/rust/cargo_crate.gni" ]; 540 + hash = "sha256-xf1Jq5v3InXkiVH0uT7+h1HPwZse5MDcHKuJNjSLR6k="; 541 + }) 542 + ] 543 + ++ lib.optionals (!chromiumVersionAtLeast "138") [ 544 + # Rebased variant of the patch above for 545 + # electron 35 (M134) and 36 (M136) 546 + ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch 529 547 ]; 530 548 531 549 postPatch =
+14
pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
··· 1 + diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni 2 + index 8266c44cbd1dfb8a53797dbe911ea74c32ce070e..ec7d751f2d068151dfeb71aa1f6510483bebd95c 100644 3 + --- a/build/rust/cargo_crate.gni 4 + +++ b/build/rust/cargo_crate.gni 5 + @@ -285,6 +285,9 @@ template("cargo_crate") { 6 + } 7 + rustenv = _rustenv 8 + 9 + + # TODO(crbug.com/424424323): Clean up and enable. 10 + + rustflags += [ "-Amismatched_lifetime_syntaxes" ] 11 + + 12 + if (!defined(build_native_rust_unit_tests)) { 13 + build_native_rust_unit_tests = _crate_type != "proc-macro" 14 + }
+2 -2
pkgs/by-name/en/enzyme/package.nix
··· 7 7 }: 8 8 llvmPackages.stdenv.mkDerivation rec { 9 9 pname = "enzyme"; 10 - version = "0.0.188"; 10 + version = "0.0.189"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "EnzymeAD"; 14 14 repo = "Enzyme"; 15 15 rev = "v${version}"; 16 - hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU="; 16 + hash = "sha256-fjKu8H24RuDGmMjN4SphdQw6g8FLS0Xc+STjgx7hiq4="; 17 17 }; 18 18 19 19 postPatch = ''
+20 -20
pkgs/by-name/es/esptool/package.nix
··· 7 7 8 8 python3Packages.buildPythonApplication rec { 9 9 pname = "esptool"; 10 - version = "4.9.0"; 10 + version = "5.0.2"; 11 11 pyproject = true; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "espressif"; 15 15 repo = "esptool"; 16 16 tag = "v${version}"; 17 - hash = "sha256-iIFjInqiqjeqiDYL7BU3vT99pCVnu8OhU7u9uKwe/SI="; 17 + hash = "sha256-oRvtEBp88tmgjjIuoQS5ySm4I0aD/Zs8VLRUZo0sh/I="; 18 18 }; 19 19 20 20 postPatch = '' ··· 29 29 ]; 30 30 31 31 dependencies = with python3Packages; [ 32 - argcomplete 33 32 bitstring 33 + click 34 34 cryptography 35 - ecdsa 36 35 intelhex 37 36 pyserial 37 + pyyaml 38 38 reedsolo 39 - pyyaml 39 + rich-click 40 40 ]; 41 41 42 42 optional-dependencies = with python3Packages; { ··· 48 48 [ 49 49 pyelftools 50 50 pytestCheckHook 51 + requests 51 52 softhsm 52 53 ] 53 54 ++ lib.flatten (lib.attrValues optional-dependencies); 54 55 55 - # tests mentioned in `.github/workflows/test_esptool.yml` 56 - checkPhase = '' 57 - runHook preCheck 56 + preCheck = '' 57 + export PATH="$out/bin:$PATH" 58 + ''; 58 59 60 + pytestFlags = [ 61 + "-m" 62 + "host_test" 63 + ]; 64 + 65 + postCheck = '' 59 66 export SOFTHSM2_CONF=$(mktemp) 60 67 echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" 61 68 ./ci/setup_softhsm2.sh 62 69 63 - pytest test/test_imagegen.py 64 - pytest test/test_espsecure.py 65 70 pytest test/test_espsecure_hsm.py 66 - pytest test/test_merge_bin.py 67 - pytest test/test_image_info.py 68 - pytest test/test_modules.py 69 - 70 - runHook postCheck 71 71 ''; 72 72 73 - meta = with lib; { 73 + meta = { 74 74 changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md"; 75 75 description = "ESP8266 and ESP32 serial bootloader utility"; 76 76 homepage = "https://github.com/espressif/esptool"; 77 - license = licenses.gpl2Plus; 78 - maintainers = with maintainers; [ 77 + license = lib.licenses.gpl2Plus; 78 + maintainers = with lib.maintainers; [ 79 79 dezgeg 80 80 dotlambda 81 81 ]; 82 82 teams = [ lib.teams.lumiguide ]; 83 - platforms = with platforms; linux ++ darwin; 84 - mainProgram = "esptool.py"; 83 + platforms = with lib.platforms; linux ++ darwin; 84 + mainProgram = "esptool"; 85 85 }; 86 86 }
+38
pkgs/by-name/go/gow/package.nix
··· 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + makeWrapper, 6 + go, 7 + }: 8 + 9 + buildGoModule (finalAttrs: { 10 + pname = "gow"; 11 + version = "0-unstable-2025-08-13"; 12 + 13 + src = fetchFromGitHub { 14 + owner = "mitranim"; 15 + repo = "gow"; 16 + rev = "466e175ff6996eba082cb86ac7b43fc5f8f9c766"; 17 + hash = "sha256-vfJ6AFkCeyGKWF/a26ulyErCjCng+uHJlLyRfBmtLs0="; 18 + }; 19 + 20 + vendorHash = "sha256-L7H3tZQXfeDtWLMvxSMf4/Oez8OV5Q+NhKLkJ991sNA="; 21 + 22 + # This is required for wrapProgram. 23 + allowGoReference = true; 24 + 25 + nativeBuildInputs = [ makeWrapper ]; 26 + 27 + postFixup = '' 28 + wrapProgram $out/bin/gow --prefix PATH : ${lib.makeBinPath [ go ]} 29 + ''; 30 + 31 + meta = { 32 + homepage = "https://github.com/mitranim/gow"; 33 + description = "Missing watch mode for Go commands"; 34 + mainProgram = "gox"; 35 + license = lib.licenses.unlicense; 36 + maintainers = with lib.maintainers; [ baloo ]; 37 + }; 38 + })
+3 -3
pkgs/by-name/ha/harper/package.nix
··· 7 7 8 8 rustPlatform.buildRustPackage rec { 9 9 pname = "harper"; 10 - version = "0.57.0"; 10 + version = "0.58.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "Automattic"; 14 14 repo = "harper"; 15 15 rev = "v${version}"; 16 - hash = "sha256-w9nDvjAFPd2cVJhOigGW61RZAsqo64EN1AFdeAIiAQ0="; 16 + hash = "sha256-KGi/toi02JPDYdNvrhIg9hh+188C5jP41Zk3IKOgO/E="; 17 17 }; 18 18 19 19 buildAndTestSubdir = "harper-ls"; 20 20 21 - cargoHash = "sha256-Ljkrpk1O+WXL0GDBv7sJbSllJuhoLXMLgFfi4sI50fE="; 21 + cargoHash = "sha256-Er056RhUW33UrRMP412/tj+Qa878Jk+nIcFuF8Ytaes="; 22 22 23 23 passthru.updateScript = nix-update-script { }; 24 24
+2 -2
pkgs/by-name/ni/niriswitcher/package.nix
··· 11 11 12 12 python3Packages.buildPythonPackage rec { 13 13 pname = "niriswitcher"; 14 - version = "0.7.0"; 14 + version = "0.7.1"; 15 15 pyproject = true; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "isaksamsten"; 19 19 repo = "niriswitcher"; 20 20 tag = version; 21 - hash = "sha256-V3G4eKKEysCyjAFUW2a94lOo82TVaZVfRXv/dL+LHNo="; 21 + hash = "sha256-qsw2D9Q9ZJYBsRECzT+qoytYMda4uZxX321/YxNWk9o="; 22 22 }; 23 23 24 24 build-system = [ python3Packages.hatchling ];
+4 -4
pkgs/by-name/pk/pkgsite/package.nix
··· 7 7 8 8 buildGoModule { 9 9 pname = "pkgsite"; 10 - version = "0-unstable-2025-07-21"; 10 + version = "0-unstable-2025-08-14"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "golang"; 14 14 repo = "pkgsite"; 15 - rev = "d4de6668b91034bd7c6315aff98f232c1339335f"; 16 - hash = "sha256-H3yL82obJ/z8BDeyLdR1DVCxsPwrn0xxHLoMFHKhQn8="; 15 + rev = "ed9d06afb3a5d788c2bd4d6eef1b2a667cff4782"; 16 + hash = "sha256-HROCrvfpHiRmZSE+P9uL5mwqkcI9uwxFEI7fSjzOHiI="; 17 17 }; 18 18 19 - vendorHash = "sha256-sHpWI3oUuazFlWJhHB5uZ89z1GPbPfLoFQL12Jk3NP0="; 19 + vendorHash = "sha256-MUd0AGYDLx6o1uItjk3UVHBIXfPjN6AjjhYQCz5BIeQ="; 20 20 21 21 subPackages = [ "cmd/pkgsite" ]; 22 22
+3 -1
pkgs/by-name/ra/rapidjson/package.nix
··· 69 69 (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error") 70 70 ]; 71 71 72 - doCheck = !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin); 72 + doCheck = 73 + !(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isDarwin) 74 + && lib.meta.availableOn stdenv.hostPlatform valgrind; 73 75 74 76 nativeCheckInputs = [ 75 77 valgrind
+19 -1
pkgs/by-name/re/rerun/package.nix
··· 6 6 # nativeBuildInputs 7 7 binaryen, 8 8 lld, 9 + llvmPackages, 9 10 pkg-config, 10 11 protobuf, 11 12 rustfmt, ··· 31 32 "map_view" 32 33 ], 33 34 }: 34 - 35 35 rustPlatform.buildRustPackage (finalAttrs: { 36 36 pname = "rerun"; 37 37 version = "0.24.0"; ··· 98 98 rustfmt 99 99 nasm 100 100 ]; 101 + 102 + # NOTE: Without setting these environment variables the web-viewer 103 + # preBuild step uses the nix wrapped CC which doesn't support 104 + # multiple targets including wasm32-unknown-unknown. These are taken 105 + # from the following issue discussion in the rust ring crate: 106 + # https://github.com/briansmith/ring/discussions/2581#discussioncomment-14096969 107 + env = 108 + let 109 + inherit (llvmPackages) clang-unwrapped; 110 + major-version = builtins.head (builtins.splitVersion clang-unwrapped.version); 111 + # resource dir + builtins from the unwrapped clang 112 + resourceDir = "${lib.getLib clang-unwrapped}/lib/clang/${major-version}"; 113 + includeDir = "${lib.getLib llvmPackages.libclang}/lib/clang/${major-version}/include"; 114 + in 115 + { 116 + CC_wasm32_unknown_unknown = lib.getExe clang-unwrapped; 117 + CFLAGS_wasm32_unknown_unknown = "-isystem ${includeDir} -resource-dir ${resourceDir}"; 118 + }; 101 119 102 120 buildInputs = [ 103 121 freetype
+2 -2
pkgs/development/python-modules/aioamazondevices/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "aioamazondevices"; 18 - version = "4.0.0"; 18 + version = "4.0.1"; 19 19 pyproject = true; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "chemelli74"; 23 23 repo = "aioamazondevices"; 24 24 tag = "v${version}"; 25 - hash = "sha256-Ch3IP7fMEDYYRFDk3eoZWjhjnkQY0qcAFJdmkoW4o/0="; 25 + hash = "sha256-FTIACTsDFg+TUvtQOI46ecOZxFmyeUSlOZm9xXAlkhY="; 26 26 }; 27 27 28 28 build-system = [ poetry-core ];
+14 -11
pkgs/development/python-modules/allure-behave/default.nix
··· 1 1 { 2 2 lib, 3 - fetchPypi, 3 + fetchFromGitHub, 4 4 buildPythonPackage, 5 - pythonOlder, 6 5 behave, 7 6 allure-python-commons, 8 7 setuptools-scm, ··· 11 10 buildPythonPackage rec { 12 11 pname = "allure-behave"; 13 12 version = "2.15.0"; 14 - format = "setuptools"; 13 + pyproject = true; 15 14 16 - disabled = pythonOlder "3.7"; 17 - 18 - src = fetchPypi { 19 - inherit pname version; 20 - hash = "sha256-puJuaeA6uFJRF1ZS7jWY55Mmk2Y4SQiuhZGEGi7yexs="; 15 + src = fetchFromGitHub { 16 + owner = "allure-framework"; 17 + repo = "allure-python"; 18 + tag = version; 19 + hash = "sha256-I3Zh9frOplcPqLd8b4peNM9WtbNmQjHX6ocVJJwPzyc="; 21 20 }; 22 21 23 - nativeBuildInputs = [ setuptools-scm ]; 22 + sourceRoot = "${src.name}/allure-behave"; 24 23 25 - pythonImportsCheck = [ "allure_behave" ]; 24 + build-system = [ setuptools-scm ]; 26 25 27 - propagatedBuildInputs = [ 26 + dependencies = [ 28 27 allure-python-commons 29 28 behave 30 29 ]; 30 + 31 + doCheck = false; # no tests 32 + 33 + pythonImportsCheck = [ "allure_behave" ]; 31 34 32 35 meta = with lib; { 33 36 description = "Allure behave integration";
+8 -4
pkgs/development/python-modules/aws-encryption-sdk/default.nix
··· 4 4 boto3, 5 5 buildPythonPackage, 6 6 cryptography, 7 - fetchPypi, 7 + fetchFromGitHub, 8 8 mock, 9 9 pytest-mock, 10 10 pytestCheckHook, ··· 20 20 21 21 disabled = pythonOlder "3.8"; 22 22 23 - src = fetchPypi { 24 - inherit pname version; 25 - hash = "sha256-kRqQCYBzLlCbhuBEP+O9zuSAdgpGDg9wLzYFZaIPOIg="; 23 + src = fetchFromGitHub { 24 + owner = "aws"; 25 + repo = "aws-encryption-sdk-python"; 26 + tag = "v${version}"; 27 + hash = "sha256-yuehAxVEqnlNMMIqA0imAJaIjV5nzYbQk84l8STtBVo="; 26 28 }; 27 29 28 30 build-system = [ setuptools ]; ··· 39 41 pytest-mock 40 42 pytestCheckHook 41 43 ]; 44 + 45 + enabledTestPaths = [ "test" ]; 42 46 43 47 disabledTestPaths = [ 44 48 # Tests require networking
+7 -7
pkgs/development/python-modules/bc-python-hcl2/default.nix
··· 1 1 { 2 2 lib, 3 3 buildPythonPackage, 4 - fetchPypi, 4 + fetchFromGitHub, 5 5 lark, 6 6 pythonOlder, 7 7 setuptools, ··· 14 14 15 15 disabled = pythonOlder "3.6"; 16 16 17 - src = fetchPypi { 18 - inherit pname version; 19 - hash = "sha256-+uYrKkGmda0zDRNNgldlJtt1X3K70OWoUN49hfwkxA4="; 17 + src = fetchFromGitHub { 18 + owner = "bridgecrewio"; 19 + repo = "python-hcl2"; 20 + tag = version; 21 + hash = "sha256-Auk5xDLw2UhMzWa7YMKzwUSjhD9s6xHt8RcXMzzL8M0="; 20 22 }; 21 23 22 24 build-system = [ setuptools ]; ··· 34 36 This parser only supports HCL2 and isn't backwards compatible with HCL v1. 35 37 It can be used to parse any HCL2 config file such as Terraform. 36 38 ''; 37 - # Although this is the main homepage from PyPi but it is also a homepage 38 - # of another PyPi package (python-hcl2). But these two are different. 39 - homepage = "https://github.com/amplify-education/python-hcl2"; 39 + homepage = "https://github.com/bridgecrewio/python-hcl2"; 40 40 license = licenses.mit; 41 41 maintainers = with maintainers; [ anhdle14 ]; 42 42 mainProgram = "hcl2tojson";
+7 -9
pkgs/development/python-modules/dbutils/default.nix
··· 1 1 { 2 2 lib, 3 3 buildPythonPackage, 4 - fetchPypi, 4 + fetchFromGitHub, 5 5 setuptools, 6 6 pytestCheckHook, 7 - pythonOlder, 8 7 }: 9 8 10 9 buildPythonPackage rec { ··· 12 11 version = "3.1.1"; 13 12 pyproject = true; 14 13 15 - disabled = pythonOlder "3.6"; 16 - 17 - src = fetchPypi { 18 - inherit version; 19 - pname = "DBUtils"; 20 - hash = "sha256-reefvFeG10ltQThyL7yiQ0DPfHO11m3wUpb2Vv8Ia78="; 14 + src = fetchFromGitHub { 15 + owner = "WebwareForPython"; 16 + repo = "DBUtils"; 17 + tag = "Release-${lib.replaceStrings [ "." ] [ "_" ] version}"; 18 + hash = "sha256-YyZKGN7oNuCR4lU7pxkY+vLOWGQzQjqvAIOZc7LlvUM="; 21 19 }; 22 20 23 - nativeBuildInputs = [ setuptools ]; 21 + build-system = [ setuptools ]; 24 22 25 23 nativeCheckInputs = [ pytestCheckHook ]; 26 24
+2 -2
pkgs/development/python-modules/google-genai/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "google-genai"; 23 - version = "1.29.0"; 23 + version = "1.31.0"; 24 24 pyproject = true; 25 25 26 26 src = fetchFromGitHub { 27 27 owner = "googleapis"; 28 28 repo = "python-genai"; 29 29 tag = "v${version}"; 30 - hash = "sha256-EOwIXZ373hsEfGxCE6DRjPRuqPQQoFHTzIDGK1K9X6Q="; 30 + hash = "sha256-pzW0SYLlj7XjJSEqCY3uSYZI8asn451LANpcpr/lxI4="; 31 31 }; 32 32 33 33 build-system = [
+4 -4
pkgs/development/python-modules/ipyniivue/default.nix
··· 14 14 15 15 buildPythonPackage rec { 16 16 pname = "ipyniivue"; 17 - version = "2.4.0"; 17 + version = "2.1.0"; 18 18 pyproject = true; 19 19 20 20 disabled = pythonOlder "3.7"; ··· 22 22 src = fetchFromGitHub { 23 23 owner = "niivue"; 24 24 repo = "ipyniivue"; 25 - tag = "v${version}"; 26 - hash = "sha256-APxxYflEYcjQGloLvdOGMlOnOL/0ttGVvTCLEMqp1W0="; 25 + rev = "v${version}"; 26 + hash = "sha256-rgScBBJ0Jqr5REZ+YFJcKwWcV33RzJ/sn6RqTL/limo="; 27 27 }; 28 28 29 29 npmDeps = fetchNpmDeps { ··· 58 58 meta = with lib; { 59 59 description = "Show a nifti image in a webgl 2.0 canvas within a jupyter notebook cell"; 60 60 homepage = "https://github.com/niivue/ipyniivue"; 61 - changelog = "https://github.com/niivue/ipyniivue/releases/tag/${src.tag}"; 61 + changelog = "https://github.com/niivue/ipyniivue/releases/tag/${version}"; 62 62 license = licenses.bsd3; 63 63 maintainers = with maintainers; [ bcdarwin ]; 64 64 };
+11 -10
pkgs/development/python-modules/jug/default.nix
··· 2 2 lib, 3 3 bottle, 4 4 buildPythonPackage, 5 - fetchPypi, 5 + fetchFromGitHub, 6 6 numpy, 7 7 pytestCheckHook, 8 - pythonOlder, 9 8 pyyaml, 10 9 redis, 10 + setuptools, 11 11 }: 12 12 13 13 buildPythonPackage rec { 14 14 pname = "jug"; 15 15 version = "2.4.0"; 16 - format = "setuptools"; 16 + pyproject = true; 17 17 18 - disabled = pythonOlder "3.7"; 19 - 20 - src = fetchPypi { 21 - pname = "Jug"; 22 - inherit version; 23 - hash = "sha256-B6We+9bW0dfT5DUsxU212e7ueyRc8GgBVPVnIek8ckU="; 18 + src = fetchFromGitHub { 19 + owner = "luispedro"; 20 + repo = "jug"; 21 + tag = "v${version}"; 22 + hash = "sha256-zERCY9JxceBmhJbytfsm/6rDwipqQ1XjzY/2QFsEEEg="; 24 23 }; 25 24 26 - propagatedBuildInputs = [ bottle ]; 25 + build-system = [ setuptools ]; 26 + 27 + dependenciesk = [ bottle ]; 27 28 28 29 nativeCheckInputs = [ 29 30 numpy
+23 -22
pkgs/development/python-modules/mezzanine/default.nix
··· 6 6 chardet, 7 7 django, 8 8 django-contrib-comments, 9 - fetchPypi, 9 + fetchFromGitHub, 10 10 filebrowser-safe, 11 - future, 12 11 grappelli-safe, 13 12 isPyPy, 14 - pep8, 15 13 pillow, 16 - pyflakes, 14 + pytestCheckHook, 15 + pytest-cov-stub, 16 + pytest-django, 17 17 pythonOlder, 18 18 pytz, 19 19 requests, 20 20 requests-oauthlib, 21 + requirements-parser, 22 + setuptools, 21 23 tzlocal, 22 24 }: 23 25 ··· 28 30 29 31 disabled = pythonOlder "3.7" || isPyPy; 30 32 31 - src = fetchPypi { 32 - pname = "Mezzanine"; 33 - inherit version; 34 - hash = "sha256-RZ/9ltvZUz1eXxeaVqS9ZE69+a9XWt6fxMcss+yTVP4="; 33 + src = fetchFromGitHub { 34 + owner = "stephenmcd"; 35 + repo = "mezzanine"; 36 + tag = "v${version}"; 37 + hash = "sha256-TdGWlquS4hsnxIM0bhbWR7C0X4wyUcqC+YrBDSShRhg="; 35 38 }; 36 39 37 - buildInputs = [ 38 - pyflakes 39 - pep8 40 + patches = [ 41 + # drop git requirement from tests and fake stable branch 42 + ./tests-no-git.patch 40 43 ]; 41 44 42 - propagatedBuildInputs = [ 45 + build-system = [ setuptools ]; 46 + 47 + dependencies = [ 43 48 beautifulsoup4 44 49 bleach 45 50 chardet 46 51 django 47 52 django-contrib-comments 48 53 filebrowser-safe 49 - future 50 54 grappelli-safe 51 55 pillow 52 56 pytz ··· 56 60 ] 57 61 ++ bleach.optional-dependencies.css; 58 62 59 - # Tests Fail Due to Syntax Warning, Fixed for v3.1.11+ 60 - doCheck = false; 61 - 62 - # sed calls will be unnecessary in v3.1.11+ 63 - preConfigure = '' 64 - sed -i 's/==/>=/' setup.py 65 - ''; 66 - 67 - LC_ALL = "en_US.UTF-8"; 63 + nativeCheckInputs = [ 64 + pytest-django 65 + pytest-cov-stub 66 + pytestCheckHook 67 + requirements-parser 68 + ]; 68 69 69 70 meta = with lib; { 70 71 description = "Content management platform built using the Django framework";
+17
pkgs/development/python-modules/mezzanine/tests-no-git.patch
··· 1 + diff --git a/tests/test_core.py b/tests/test_core.py 2 + index 40cd39fe..57abbec0 100644 3 + --- a/tests/test_core.py 4 + +++ b/tests/test_core.py 5 + @@ -47,11 +47,7 @@ from mezzanine.utils.sites import current_site_id, override_current_site_id 6 + from mezzanine.utils.tests import TestCase 7 + from mezzanine.utils.urls import admin_url 8 + 9 + -BRANCH_NAME = ( 10 + - subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]) 11 + - .decode() 12 + - .strip() 13 + -) 14 + +BRANCH_NAME = "stable" 15 + VERSION_WARN = ( 16 + "Unpinned or pre-release dependencies detected in Mezzanine's requirements: {}" 17 + )
+45
pkgs/development/python-modules/miraie-ac/default.nix
··· 1 + { 2 + lib, 3 + buildPythonPackage, 4 + fetchPypi, 5 + 6 + # build-system 7 + poetry-core, 8 + 9 + # dependencies 10 + aiomqtt, 11 + aiohttp, 12 + certifi, 13 + }: 14 + 15 + buildPythonPackage rec { 16 + pname = "miraie-ac"; 17 + version = "1.1.1"; 18 + pyproject = true; 19 + 20 + src = fetchPypi { 21 + inherit version; 22 + pname = "miraie_ac"; 23 + hash = "sha256-IiRDPz5IcD3Df+vw4YvR3zc0oThGjb7pBJfD4d98h/g="; 24 + }; 25 + 26 + build-system = [ poetry-core ]; 27 + 28 + dependencies = [ 29 + aiomqtt 30 + aiohttp 31 + certifi 32 + ]; 33 + 34 + pythonRemoveDeps = [ "asyncio" ]; 35 + 36 + pythonImportsCheck = [ "miraie_ac" ]; 37 + 38 + meta = { 39 + homepage = "https://github.com/rkzofficial/miraie-ac"; 40 + changelog = "https://github.com/rkzofficial/miraie-ac/releases"; 41 + description = "Python library for controlling Panasonic Miraie ACs"; 42 + license = lib.licenses.mit; 43 + maintainers = with lib.maintainers; [ ananthb ]; 44 + }; 45 + }
+2 -2
pkgs/development/python-modules/rocketchat-api/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "rocketchat-api"; 12 - version = "1.35.1"; 12 + version = "1.35.2"; 13 13 pyproject = true; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "jadolg"; 17 17 repo = "rocketchat_API"; 18 18 tag = version; 19 - hash = "sha256-8HGu/vkth6ofZD05Pc+IlTZlT+12jWTTYINLQzAHExk="; 19 + hash = "sha256-U5r7SKCKneBgCSwCJRm+Tl/wPmMOrj93K5VVCO/OPCk="; 20 20 }; 21 21 22 22 build-system = [ setuptools ];
+2 -2
pkgs/development/python-modules/tidalapi/default.nix
··· 12 12 }: 13 13 buildPythonPackage rec { 14 14 pname = "tidalapi"; 15 - version = "0.8.5"; 15 + version = "0.8.6"; 16 16 pyproject = true; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "EbbLabs"; 20 20 repo = "python-tidal"; 21 21 tag = "v${version}"; 22 - hash = "sha256-DI1EtjwHGsdneyW3Av6ZEWoKf0MzkXs0NJkD55W5pD0="; 22 + hash = "sha256-SsyO0bh2ayHfGzINBW1BTTPS/ICvIymIhQ1HUPRFOwU="; 23 23 }; 24 24 25 25 build-system = [
+9 -20
pkgs/development/tools/electron/common.nix
··· 86 86 87 87 patches = 88 88 base.patches 89 - # Fix building with Rust 1.86+ 90 - # electron_33 and electron_34 use older chromium versions which expect rust 91 - # to provide the older `adler` library instead of the newer `adler2` library 92 - # This patch makes those older versions also use the new adler2 library 93 - ++ lib.optionals (lib.versionOlder info.version "35") [ 94 - ./use-rust-adler2.patch 95 - ] 96 - # Requirements for the next section 97 - ++ lib.optionals (lib.versionOlder info.version "35") [ 98 - (fetchpatch { 99 - name = "Avoid-build-rust-PartitionAlloc-dep-when-not-build_with_chromium.patch"; 100 - url = "https://github.com/chromium/chromium/commit/ee94f376a0dd642a93fbf4a5fa8e7aa8fb2a69b5.patch"; 101 - hash = "sha256-qGjy9VZ4d3T5AuqOrBKEajBswwBU/7j0n80rpvHZLmM="; 102 - }) 103 - (fetchpatch { 104 - name = "Suppress-unsafe_libc_call-warning-for-rust-remap_alloc-cc.patch"; 105 - url = "https://github.com/chromium/chromium/commit/d5d79d881e74c6c8630f7d2f3affd4f656fdeb4e.patch"; 106 - hash = "sha256-1oy5WRvNzKuUTJkt8kULUqE4JU+EKEV1PB9QN8HF4SE="; 107 - }) 108 - ] 109 89 # Fix building with Rust 1.87+ 110 90 # https://issues.chromium.org/issues/407024458 111 91 ++ lib.optionals (lib.versionOlder info.version "37") [ ··· 150 130 name = "Dont-apply-FALLTHROUGH-edit-to-gperf-3-2-output.patch"; 151 131 url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch"; 152 132 hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA="; 133 + }) 134 + ] 135 + # Fix build with Rust 1.89.0 136 + ++ lib.optionals (lib.versionOlder info.version "38") [ 137 + # https://chromium-review.googlesource.com/c/chromium/src/+/6624733 138 + (fetchpatch { 139 + name = "Define-rust-no-alloc-shim-is-unstable-v2.patch"; 140 + url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch"; 141 + hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM="; 153 142 }) 154 143 ]; 155 144
-13
pkgs/development/tools/electron/use-rust-adler2.patch
··· 1 - diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn 2 - index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644 3 - --- a/build/rust/std/BUILD.gn 4 - +++ b/build/rust/std/BUILD.gn 5 - @@ -89,7 +89,7 @@ if (toolchain_has_rust) { 6 - # These are no longer present in the Windows toolchain. 7 - stdlib_files += [ 8 - "addr2line", 9 - - "adler", 10 - + "adler2", 11 - "gimli", 12 - "libc", 13 - "memchr",
+4 -3
pkgs/misc/tmux-plugins/default.nix
··· 260 260 261 261 extrakto = mkTmuxPlugin { 262 262 pluginName = "extrakto"; 263 - version = "0-unstable-2024-08-25"; 263 + version = "0-unstable-2025-07-27"; 264 264 src = fetchFromGitHub { 265 265 owner = "laktak"; 266 266 repo = "extrakto"; 267 - rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2"; 268 - hash = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk="; 267 + rev = "b04dcf14496ffda629d8aa3a2ac63e4e08d2fdc9"; 268 + hash = "sha256-lknfek9Fu/RDHbq5HMaiNqc24deni5phzExWOkYRS+o"; 269 269 }; 270 270 nativeBuildInputs = [ pkgs.makeWrapper ]; 271 271 buildInputs = [ pkgs.python3 ]; ··· 292 292 maintainers = with lib.maintainers; [ 293 293 kidd 294 294 fnune 295 + deejayem 295 296 ]; 296 297 }; 297 298 };
+36
pkgs/servers/home-assistant/custom-components/miraie/package.nix
··· 1 + { 2 + lib, 3 + buildHomeAssistantComponent, 4 + fetchFromGitHub, 5 + miraie-ac, 6 + aiomqtt, 7 + nix-update-script, 8 + }: 9 + 10 + buildHomeAssistantComponent rec { 11 + owner = "rkzofficial"; 12 + domain = "miraie"; 13 + version = "1.1.6"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "rkzofficial"; 17 + repo = "ha-miraie-ac"; 18 + tag = "v${version}"; 19 + hash = "sha256-5VpLfTKOLdx8P693jaW4o79CH2NKkgkgl7ai+I6JRQs="; 20 + }; 21 + 22 + dependencies = [ 23 + miraie-ac 24 + aiomqtt 25 + ]; 26 + 27 + passthru.updateScript = nix-update-script { }; 28 + 29 + meta = { 30 + changelog = "https://github.com/rkzofficial/ha-miraie-ac/releases/tag/v${version}"; 31 + description = "Home Assistant component for Miraie ACs"; 32 + homepage = "https://github.com/rkzofficial/ha-miraie-ac"; 33 + maintainers = with lib.maintainers; [ ananthb ]; 34 + license = lib.licenses.asl20; 35 + }; 36 + }
+2
pkgs/top-level/python-packages.nix
··· 9282 9282 9283 9283 mir-eval = callPackage ../development/python-modules/mir-eval { }; 9284 9284 9285 + miraie-ac = callPackage ../development/python-modules/miraie-ac { }; 9286 + 9285 9287 mirakuru = callPackage ../development/python-modules/mirakuru { }; 9286 9288 9287 9289 misaka = callPackage ../development/python-modules/misaka { };