nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

* acl, attr: updated, and use libtool 2.

Browse Source 
* Removed libtoolOld.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14792
This commit is contained in:
Eelco Dolstra 2009-03-30 15:55:10 +00:00
parent 0a4dd9c4d9
commit 9455f37ce9
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/acl/default.nix
View File

@ -4,9 +4,8 @@ stdenv.mkDerivation {
name = "acl-2.2.47"; name = "acl-2.2.47";
src = fetchurl { src = fetchurl {
# The file cannot be downloaded from sgi.com. # The SGI site throws away old versions, so don't use it.
#url = ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz; url = mirror://gentoo/distfiles/acl_2.2.47-1.tar.gz;
url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/acl_2.2.47-1.tar.gz";
sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294"; sha256 = "1j39g62fki0iyji9s62slgwdfskpkqy7rmjlqcnmsvsnxbxhc294";
}; };
@ -15,4 +14,9 @@ stdenv.mkDerivation {
configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk"; configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";
installTargets = "install install-lib install-dev"; installTargets = "install install-lib install-dev";
meta = {
homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/;
description = "Library and tools for manipulating access control lists";
};
} }

14
pkgs/development/libraries/attr/default.nix
View File

@ -1,13 +1,12 @@
{stdenv, fetchurl, libtool, gettext}: {stdenv, fetchurl, libtool, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "attr-2.4.41"; name = "attr-2.4.43";
src = fetchurl { src = fetchurl {
# The file cannot be downloaded from sgi.com. # The SGI site throws away old versions, so don't use it.
#url = ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz; url = mirror://gentoo/distfiles/attr_2.4.43-1.tar.gz;
url = "http://gentoo.chem.wisc.edu/gentoo/distfiles/attr_2.4.41-1.tar.gz"; sha256 = "1gy5zspj8ynxv6q29r24d18cfvq06zirg1pxcdg27bg2ncrv4n6k";
sha256 = "0dc286g8vr402aca6wg945sdm92bys8a142vrkwx6bkjz4bwz6gp";
}; };
buildInputs = [libtool gettext]; buildInputs = [libtool gettext];
@ -15,4 +14,9 @@ stdenv.mkDerivation {
configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk"; configureFlags = "MAKE=make LIBTOOL=libtool MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
installTargets = "install install-lib install-dev"; installTargets = "install install-lib install-dev";
meta = {
homepage = ftp://oss.sgi.com/projects/xfs/cmd_tars/;
description = "Library and tools for manipulating extended attributes";
};
} }

10
pkgs/development/tools/misc/libtool/old.nix
View File

@ -1,10 +0,0 @@
{stdenv, fetchurl, m4, perl}:
stdenv.mkDerivation rec {
name = "libtool-1.5.26";
src = fetchurl {
url = "mirror://gnu/libtool/" + name + ".tar.gz";
sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w";
};
buildInputs = [m4 perl];
}

10
pkgs/top-level/all-packages.nix
View File

@ -2466,10 +2466,6 @@ let
inherit fetchurl stdenv lzma perl m4; inherit fetchurl stdenv lzma perl m4;
}; };
libtoolOld = lowPrio (import ../development/tools/misc/libtool/old.nix {
inherit fetchurl stdenv perl m4;
});
lsof = import ../development/tools/misc/lsof { lsof = import ../development/tools/misc/lsof {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -2608,8 +2604,7 @@ let
acl = useFromStdenv "acl" acl = useFromStdenv "acl"
(import ../development/libraries/acl { (import ../development/libraries/acl {
inherit stdenv fetchurl gettext attr; inherit stdenv fetchurl gettext attr libtool;
libtool = libtoolOld;
}); });
adns = selectVersion ../development/libraries/adns "1.4" { adns = selectVersion ../development/libraries/adns "1.4" {
@ -2663,8 +2658,7 @@ let
attr = useFromStdenv "attr" attr = useFromStdenv "attr"
(import ../development/libraries/attr { (import ../development/libraries/attr {
inherit stdenv fetchurl gettext; inherit stdenv fetchurl gettext libtool;
libtool = libtoolOld;
}); });
axis = import ../development/libraries/axis { axis = import ../development/libraries/axis {