diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 63 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 38 |
3 files changed, 43 insertions, 59 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6130e5afc10..9cae4a790a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -147,9 +147,14 @@ with pkgs; autorestic = callPackage ../tools/backup/autorestic { }; - autoPatchelfHook = makeSetupHook - { name = "auto-patchelf-hook"; deps = [ bintools ]; } - ../build-support/setup-hooks/auto-patchelf.sh; + autoPatchelfHook = makeSetupHook { + name = "auto-patchelf-hook"; + deps = [ bintools ]; + substitutions = { + pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; + autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; + }; + } ../build-support/setup-hooks/auto-patchelf.sh; appflowy = callPackage ../applications/office/appflowy { }; @@ -13976,8 +13981,18 @@ with pkgs; pipenv = callPackage ../development/tools/pipenv {}; - pipewire = callPackage ../development/libraries/pipewire {}; + pipewire = callPackage ../development/libraries/pipewire { + # ffmpeg depends on SDL2 which depends on pipewire by default. + # Break the cycle by disabling pipewire support in our ffmpeg. + ffmpeg = ffmpeg.override { + SDL2 = SDL2.override { + pipewireSupport = false; + }; + }; + }; + pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; + pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; @@ -20535,41 +20550,27 @@ with pkgs; wxformbuilder = callPackage ../development/tools/wxformbuilder { }; wxGTK = wxGTK28; - wxGTK30 = wxGTK30-gtk2; - wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { + wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; - wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { + wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { withGtk2 = true; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; + wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; + wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; - wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { - withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; - wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { - withGtk2 = true; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; - - wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { - withGtk2 = false; - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; - }; - - wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; + wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; + wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; @@ -25382,6 +25383,10 @@ with pkgs; fnott = callPackage ../applications/misc/fnott { }; + furnace = callPackage ../applications/audio/furnace { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + gg-scm = callPackage ../applications/version-management/git-and-tools/gg { }; gigalixir = with python3Packages; toPythonApplication gigalixir; @@ -32105,6 +32110,8 @@ with pkgs; blas = callPackage ../build-support/alternatives/blas { }; + blas-ilp64 = blas.override { isILP64 = true; }; + blas-reference = callPackage ../development/libraries/science/math/blas { }; bonmin = callPackage ../development/libraries/science/math/bonmin { }; @@ -32129,6 +32136,8 @@ with pkgs; lapack = callPackage ../build-support/alternatives/lapack { }; + lapack-ilp64 = lapack.override { isILP64 = true; }; + lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; liblapack = lapack-reference; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44c5c11ceb9..4e0f922e168 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 + pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7424da88332..8be1c2205df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -135,16 +135,6 @@ in { venvShellHook wheelUnpackHook; - # Not all packages are compatible with the latest pytest yet. - # We need to override the hook to select an older pytest, however, - # it should not override the version of pytest that is used for say - # Python 2. This is an ugly hack that is needed now because the hook - # propagates the package. - pytestCheckHook_6_1 = if isPy3k then - self.pytestCheckHook.override { pytest = self.pytest_6_1; } - else - self.pytestCheckHook; - # helpers # We use build packages because we are making a setup hook to be used as a @@ -2210,7 +2200,7 @@ in { distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - django = self.django_2; + django = self.django_3; # Current LTS django_2 = callPackage ../development/python-modules/django/2.nix { }; @@ -7753,28 +7743,12 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; - pytest = self.pytest_6; - - pytest_6 = - callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; + pytest = callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; }; - - pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { - version = "6.1.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; - }; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - }); + }; pytest-aio = callPackage ../development/python-modules/pytest-aio { }; |