diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-21 21:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-21 21:11:49 +0100 |
| commit | f3bf8a1b9dd6c80299fdb6bfc24d273d905b817c (patch) | |
| tree | 024363f5287af083a269d04ca926edbb95195018 /pkgs/top-level | |
| parent | 53dff5c0285457a5e630ae0c6db3db87fd4c33ff (diff) | |
| parent | d155128b531a9b3a7a5dd1fe435f426071a2a7b7 (diff) | |
Merge pull request #196817 from SuperSamus/bottles
Closes https://github.com/NixOS/nixpkgs/issues/192292 closes https://github.com/NixOS/nixpkgs/issues/182539 closes https://github.com/NixOS/nixpkgs/issues/181501
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9520f6c98ad95..da512943f435b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27600,7 +27600,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; bottles = callPackage ../applications/misc/bottles { - wine = wineWowPackages.minimal; + wine = null; }; brave = callPackage ../applications/networking/browsers/brave { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d119be13e323b..8f23c6a7fa03a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3560,6 +3560,8 @@ self: super: with self; { fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + fvs = callPackage ../development/python-modules/fvs { }; + fx2 = callPackage ../development/python-modules/fx2 { }; g2pkk = callPackage ../development/python-modules/g2pkk { }; @@ -4403,6 +4405,8 @@ self: super: with self; { idasen = callPackage ../development/python-modules/idasen { }; + icoextract = callPackage ../development/python-modules/icoextract { }; + icontract = callPackage ../development/python-modules/icontract { }; identify = callPackage ../development/python-modules/identify { }; |