diff options
author | the-furry-hubofeverything <hubblethewolverine@gmail.com> | 2023-10-29 20:39:27 -0700 |
---|---|---|
committer | the-furry-hubofeverything <hubblethewolverine@gmail.com> | 2023-11-02 23:03:34 -0700 |
commit | fe4c776ae9c4289d848096fba1621b3c5c6d0bde (patch) | |
tree | 73a0e918c09cab9d6be8575713f7b832020248b4 /pkgs/top-level | |
parent | bbb31295845463773eabbf178f86813b9b5b4d23 (diff) | |
download | nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar.gz nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar.bz2 nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar.lz nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar.xz nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.tar.zst nixpkgs-fe4c776ae9c4289d848096fba1621b3c5c6d0bde.zip |
blender: allow functional declaration within withPackages
Based on #257780, separated since it introduces significant changes. bpycv: update passthru.tests.render blender-with-packages: deprecated it is still backwards compatible, but no longer preferred.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 38c4126a20f..927a0b530d4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,6 +92,9 @@ mapAliases ({ bird2 = bird; # Added 2022-02-21 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + blender-with-packages = args: + lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" + (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53d02142446..2d6f150549d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30674,8 +30674,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; - blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { }; - blender-hip = blender.override { hipSupport = true; }; blflash = callPackage ../tools/misc/blflash { }; |