diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
commit | de13527000165c566e47d2146a1a6480fc67da59 (patch) | |
tree | 12f84ad99f15678dde1c6282ed78db37e776914a /pkgs/development/libraries/libxml2 | |
parent | a1b3ae0c8121b932beeceb46bef816bdb2a9f180 (diff) |
* Finally got stdenv-nix-linux working again. Still not perfect,
though. * libxml2: upgrade to latest. * octavefront/rna: keep debug info. svn path=/nixpkgs/trunk/; revision=830
Diffstat (limited to 'pkgs/development/libraries/libxml2')
-rwxr-xr-x | pkgs/development/libraries/libxml2/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libxml2/libxml2-2.6.5.nix | 15 |
3 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh index 7d59790532796..d787dee7071ad 100755 --- a/pkgs/development/libraries/libxml2/builder.sh +++ b/pkgs/development/libraries/libxml2/builder.sh @@ -3,7 +3,7 @@ buildinputs="$zlib" . $stdenv/setup -tar xvfz $src +tar xvfj $src cd libxml2-* ./configure --prefix=$out make diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 3e2fb8b13e564..4eb33f53d012c 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,12 +3,12 @@ assert !isNull zlib; derivation { - name = "libxml2-2.6.2"; + name = "libxml2-2.6.7"; system = stdenv.system; builder = ./builder.sh; src = fetchurl { - url = http://rpmfind.net/pub/libxml/libxml2-2.6.2.tar.gz; - md5 = "56e7f74d3d44cc16790ad08624faef64"; + url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.7.tar.bz2; + md5 = "bdbef92cbdc5b4bd0365313ba22b75ce"; }; stdenv = stdenv; zlib = zlib; diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix deleted file mode 100644 index a3a4e0df36d07..0000000000000 --- a/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, zlib}: - -assert !isNull zlib; - -derivation { - name = "libxml2-2.6.5"; - system = stdenv.system; - builder = ./builder.sh; - src = fetchurl { - url = http://rpmfind.net/pub/libxml/libxml2-2.6.5.tar.gz; - md5 = "0ac5dd9902c9bf20f7bc50de1034d49f"; - }; - stdenv = stdenv; - zlib = zlib; -} |