diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-03-14 19:12:53 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-04-04 19:49:52 +0200 |
commit | 3453b89f4bba270e2d82f6248b09b9595bb47f4b (patch) | |
tree | 4b2b84a0ae5d4ba15360e8317b5dfaefbe7ab340 | |
parent | d24e2d1b0ba77da1ea5b91fcf6cf869d42880dc5 (diff) |
lzma: deprecate alias
76 files changed, 708 insertions, 149 deletions
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index c67abe1a7438..47defd44c640 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -12,7 +12,7 @@ , dxflib , curl , libiodbc -, lzma +, xz , libharu , opencv , vigra @@ -64,7 +64,7 @@ mkDerivation rec { vigra postgresql libiodbc - lzma + xz qhull giflib ] diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 365dbb66b653..df1fcc9eb661 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, lzma +, xz , qt5 , wrapQtAppsHook , miniupnpc_2 @@ -39,7 +39,7 @@ pythonPackages.buildPythonPackage rec { service-identity twisted lz4 - lzma + xz pysocks matplotlib qtpy diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index da5aa7bf6efe..14a130d7f412 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,5 +1,5 @@ { boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkg-config, qtbase +, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, pkg-config, qtbase , qtmultimedia, qtscript, lib, stdenv, superlu, wrapQtAppsHook, }: let source = import ./source.nix { inherit fetchFromGitHub; }; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { libtiff libusb1 lz4 - lzma + xz lzo openblas qtbase diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 71f9f4f77213..fd662d7e9926 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, - signond, lzma, + signond, xz, }: mkDerivation { @@ -21,7 +21,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin - ki18n kiconthemes kio kwindowsystem lzma accounts-qt qttools signond + ki18n kiconthemes kio kwindowsystem xz accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index e5282d79a28c..9a7551a6fff4 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib -, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkg-config, libev +, brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses xlibsWrapper bzip2 zlib brotli zstd lzma + ncurses xlibsWrapper bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] ++ lib.optional stdenv.isLinux gpm diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index d0db8cc10b95..f4535c9120cd 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -1,5 +1,5 @@ { autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, lzma, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli +, libpcap, libtins, libtool, xz, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { libpcap openssl libtins - lzma + xz libctemplate libmaxminddb ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 676902d68ef6..bfd4f28d0c0d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja , qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft -, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, xz, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft xz lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index fad87d44912f..b18f22b6c1dc 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -23,7 +23,7 @@ , libtool , libuuid , libxml2 -, lzma +, xz , nspr , nss , openssl @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { libuuid libxcb libxml2 - lzma + xz nspr nss openssl diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 80506bb79b6c..46d39c1a7ba3 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }: +{ lib, stdenv, fetchurl, htslib, zlib, bzip2, xz, curl, perl, python3, bash }: stdenv.mkDerivation rec { pname = "bcftools"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 xz curl ]; strictDeps = true; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index f5aad5d05543..aac36d2af310 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}: +{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, xz}: stdenv.mkDerivation rec { pname = "bedtools"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { python3 ]; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; + cxx = if stdenv.cc.isClang then "clang++" else "g++"; cc = if stdenv.cc.isClang then "clang" else "gcc"; buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index efaa4403f41d..fe81ff44d245 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; }; - buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; + buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; EBROOTHTSLIB = htslib; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 32ab614b9682..8646b8ca54a8 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, bzip2, lzma }: +{ lib, stdenv, fetchFromGitHub, zlib, bzip2, xz }: stdenv.mkDerivation rec { pname = "freebayes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 26c55d3dc383..12bbfa09c251 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -3,7 +3,7 @@ , libuuid , zlib , bzip2 -, lzma +, xz , openssl , curl , libmysqlclient @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; }; - buildInputs = [ libpng libuuid zlib bzip2 lzma openssl curl libmysqlclient ]; + buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; patchPhase = '' substituteInPlace ./src/checkUmask.sh \ diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index fa88e5c47b47..0ef48ec6413b 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: +{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost gmp htslib zlib lzma ]; + buildInputs = [ boost gmp htslib zlib xz ]; postInstall = '' mkdir $out/bin diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index 87b77f6ac045..1aed501919f9 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, bzip2, lzma, fetchFromGitHub } : +{ lib, stdenv, zlib, bzip2, xz, fetchFromGitHub } : stdenv.mkDerivation rec { version = "1.1.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ zlib bzip2 lzma ]; + buildInputs = [ zlib bzip2 xz ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 7d052c6c5e9e..47b826078f24 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig # data, compression -, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy +, bzip2, curl, hdf5, json_c, xz, lzo, protobuf, snappy # maths , blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = with lib; [ - blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + blas lapack bzip2 colpack curl ctags eigen hdf5 json_c lp_solve xz lzo protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 144827413b5e..75607fdda348 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, cmake |