diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-06 16:25:41 +0200 |
| commit | 70babe5bcf383629a6adff3f2874d1b661462146 (patch) | |
| tree | dfbbfa66d02e6ea8fd2d691defcd2307e8f9f16f /pkgs/development/interpreters/python | |
| parent | 52cd3538ff0214f0416455322cec299d2a43a436 (diff) | |
| parent | c04a14edd6096a2d55d3b62ca182739dac9b7ede (diff) | |
| download | nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.gz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.bz2 nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.lz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.xz nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.tar.zst nixpkgs-70babe5bcf383629a6adff3f2874d1b661462146.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 72b47b7afd3..38ee086a88f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -3,7 +3,7 @@ , expat , libffi , gdbm -, lzma +, xz , mime-types ? null, mimetypesSupport ? true , ncurses , openssl @@ -103,7 +103,7 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + zlib bzip2 expat xz libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b4e9343b5d4..a5ba4983e43 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security , sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, self, gdbm, db, lzma +, self, gdbm, db, xz , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) @@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec { buildInputs = [ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db ] ++ optionals isPy3k [ - lzma + xz ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ stdenv.cc.libc ] ++ optionals zlibSupport [ |