lzma: deprecate alias

This commit is contained in:
Sandro Jäckel
2021-03-14 19:12:53 +01:00
parent d24e2d1b0b
commit 3453b89f4b
76 changed files with 708 additions and 149 deletions

View File

@@ -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
'';

View File

@@ -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'"

View File

@@ -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 ];

View File

@@ -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 \