diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-03-31 11:31:55 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-27 18:09:53 -0400 |
| commit | e7b5b44f9df793129be5610d91d1256626c8b181 (patch) | |
| tree | a61fc2855b39a292a2f7f9053bac3a36a521fc86 /pkgs/top-level | |
| parent | c88b49062a8beda372c0a3ab35667881f828bdb9 (diff) | |
darwin.libiconv: remove and add to darwin-aliases
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/darwin-aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index d43f0502064e8..ae6cd59722789 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -51,6 +51,10 @@ mapAliases ({ builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 + ### L ### + + libiconv = pkgs.libiconv; # 2024-03-27 + ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c71519110ba4..bee7827f79dec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2558,7 +2558,6 @@ self: super: with self; { cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; cryptography = callPackage ../development/python-modules/cryptography { - inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; @@ -2583,7 +2582,6 @@ self: super: with self; { css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { }; css-inline = callPackage ../development/python-modules/css-inline { - inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -11613,9 +11611,7 @@ self: super: with self; { pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { }; - pyreadstat = callPackage ../development/python-modules/pyreadstat { - inherit (pkgs.darwin) libiconv; - }; + pyreadstat = callPackage ../development/python-modules/pyreadstat { }; pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true; |