Unverified Commit 55f94d9f authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

python3Packages: Fix and document the removal of the local `.overrideAttrs` attribute (#350127)

parents 6bd0af7a 38e77220
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -215,8 +215,9 @@

- The NVIDIA driver no longer defaults to the proprietary kernel module with versions >= 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open modules.

- The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`.
- The `(buildPythonPackage { ... }).override` and `(buildPythonPackage { ... }).overrideDerivation` attributes is now deprecated and removed in favour of `overridePythonAttrs` and `lib.overrideDerivation`.
  This change does not affect the override interface of most Python packages, as [`<pkg>.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute.
  The `<pkg>.overrideDerivation` attribute of Python packages called with `callPackage` will also remain available after this change.

- All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ in {
      };
      passthru.tests = import ./python-catch-conflicts-hook-tests.nix {
        inherit pythonOnBuildForHost runCommand;
        inherit lib;
        inherit (pkgs) coreutils gnugrep writeShellScript;
      };
    } ./python-catch-conflicts-hook.sh) {};
+2 −2
Original line number Diff line number Diff line
{ pythonOnBuildForHost, runCommand, writeShellScript, coreutils, gnugrep }: let
{ lib, pythonOnBuildForHost, runCommand, writeShellScript, coreutils, gnugrep }: let

  pythonPkgs = pythonOnBuildForHost.pkgs;

@@ -38,7 +38,7 @@
  );

  # in order to test for a failing build, wrap it in a shell script
  expectFailure = build: errorMsg: build.overrideDerivation (old: {
  expectFailure = build: errorMsg: lib.overrideDerivation build (old: {
    builder = writeShellScript "test-for-failure" ''
      export PATH=${coreutils}/bin:${gnugrep}/bin:$PATH
      ${old.builder} "$@" > ./log 2>&1
+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ let
    ];

    passthru.tests = {
      all-tests = self.override { doCheck = true; };
      all-tests = self.overridePythonAttrs { doCheck = true; };
    };

    meta = {