diff options
Diffstat (limited to 'pkgs/tools')
20 files changed, 39 insertions, 40 deletions
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 571798fcd2e..80664a6a449 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, zlib, bzip2, lzma, lzo, lz4, zstd, xz +, zlib, bzip2, lzo, lz4, zstd, xz , libgcrypt, e2fsprogs, util-linux, libgpgerror }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - zlib bzip2 lzma lzo lz4 zstd xz + zlib bzip2 xz lzo lz4 zstd xz libgcrypt e2fsprogs util-linux libgpgerror ]; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index d1cb93093d3..4822ea82d1e 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, makeWrapper -, boost, lzma +, boost, xz , withGog ? false, unar ? null }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; - buildInputs = [ lzma boost ]; + buildInputs = [ xz boost ]; # Python is reported as missing during the build, however # including Python does not change the output. diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 94c7e711267..3d908dd24a1 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libsodium -, llvmPackages, clang, lzma +, llvmPackages, clang, xz , Security }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; - buildInputs = [ openssl libsodium lzma ] + buildInputs = [ openssl libsodium xz ] ++ (lib.optional stdenv.isDarwin Security); configurePhase = '' diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 2804ed7a0b5..8a57d483ab2 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, lzma, xar}: +{stdenv, lib, fetchFromGitHub, xz, xar}: stdenv.mkDerivation rec { pname = "pbzx"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; - buildInputs = [ lzma xar ]; + buildInputs = [ xz xar ]; buildPhase = '' cc pbzx.c -llzma -lxar -o pbzx ''; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 833dcae8850..d0418ffdd60 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, lzma + , libarchive, xz }: stdenv.mkDerivation rec { baseName = "pixz"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool asciidoc libxslt libxml2 docbook_xml_dtd_45 docbook_xsl - libarchive lzma + libarchive xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index e337ccdd4ae..eb1f5d3570b 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, xz, lzma }: +{ lib, stdenv, fetchgit, xz }: let name = "pxz"; version = "4.999.9beta+git"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; }; - buildInputs = [ lzma ]; + buildInputs = [ xz ]; patches = [ ./_SC_ARG_MAX.patch ]; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 5d7c2b09220..32b6c6d005c 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: +{ lib, stdenv, fetchurl, libxml2, xz, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 lzma openssl zlib bzip2 fts autoconf ]; + buildInputs = [ libxml2 xz openssl zlib bzip2 fts autoconf ]; prePatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 7f92da6a224..66f74944150 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -2,7 +2,6 @@ , fetchurl , lz4 ? null , lz4Support ? false -, lzma , lzo , lib, stdenv , xz @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; - buildInputs = [ lzma lzo xz zlib ] + buildInputs = [ xz lzo xz zlib ] ++ lib.optional lz4Support lz4; patches = [ patch ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 5d3259c4b6e..de2b809eea5 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -8,7 +8,7 @@ , libarchive , libconfuse , libsodium -, lzma +, xz , zlib , coreutils , dosfstools @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libarchive libconfuse libsodium - lzma + xz zlib ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index cb3e8bd057a..4ee1749c6d3 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 -, libxslt, libarchive, bzip2, lzma, json-glib, libsoup +, libxslt, libarchive, bzip2, xz, json-glib, libsoup }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; - buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; + buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 xz libsoup ]; meta = with lib; { description = "Tools for managing the osinfo database"; diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 1537da36163..3fd40f8a7ba 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -17,7 +17,7 @@ , libhsts , libidn2 , libpsl -, lzma +, xz , nghttp2 , sslSupport ? true , openssl @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ]; - buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl lzma nghttp2 pcre2 zlib zstd ] + buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl xz nghttp2 pcre2 zlib zstd ] ++ lib.optional sslSupport openssl; # TODO: include translation files diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 178103cdb38..86982bf7f3a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest -, gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev +, gnutls, libtasn1, xz, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 # used when WITH_DOC=ON @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ - perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg + perlPackages.perl curl gnutls libtasn1 xz bzip2 lz4 zstd libseccomp udev db dpkg ] ++ lib.optionals withDocs [ doxygen perlPackages.Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 7f06cbbd3c2..631274cb722 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, xz, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; + buildInputs = [ curl gpgme libarchive bzip2 xz attr acl libxml2 ]; meta = with lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 771454cd409..48fa91c7966 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, -lzma, curl, runtimeShell }: +xz, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; + buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ]; postFixup = '' substituteInPlace $out/bin/repo-add \ diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 107bf56cf82..2444d1f1d72 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -2,7 +2,7 @@ , glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango , makeWrapper , python2Packages, lib -, lsof, curl, libuuid, cups, mesa, lzma, libxkbcommon +, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon }: let @@ -38,7 +38,7 @@ let curl libuuid cups - lzma + xz libxkbcommon ]); package = stdenv.mkDerivation { diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index f040b17f892..0291d7bb3aa 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks -, libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests +, libseccomp, systemd, libcap, xz, zstd, scrypt, nixosTests , writeShellScript # for update.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ + buildInputs = [ libevent openssl zlib xz zstd scrypt ] ++ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; patches = [ ./disable-monotonic-timer-tests.patch ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 5e42a791835..4d2ca811837 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -10,7 +10,7 @@ , libevdev , libtool , libxml2 -, lzma +, xz , pkg-config , lib, stdenv , upower @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dbus-glib libevdev libxml2 - lzma + xz upower ]; diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 6f8ba2b07eb..b4b92b8f90f 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, lzma }: +{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, xz }: stdenv.mkDerivation rec { version = "20180311"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libuuid libyaml lzma ]; + buildInputs = [ openssl libuuid libyaml xz ]; enableParallelBuilding = true; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 177c556a337..8cd67b99263 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, lzma}: +{lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, pcre, zlib, xz}: stdenv.mkDerivation rec { pname = "silver-searcher"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pcre zlib lzma ]; + buildInputs = [ pcre zlib xz ]; meta = with lib; { homepage = "https://github.com/ggreer/the_silver_searcher/"; diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix index c2600ec46f6..9a7e495df2b 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -9,7 +9,7 @@ , file , icu , gumbo -, lzma +, xz , xapian , zimlib , zlib @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = [ file icu gumbo lzma zimlib zlib xapian ]; + buildInputs = [ file icu gumbo xz zimlib zlib xapian ]; setSourceRoot = '' sourceRoot=$(echo */zimwriterfs) ''; |