diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-01-01 15:44:27 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-01-01 15:44:27 +0000 |
| commit | f75be37d703f64202bf093f45be1e20cf948f54e (patch) | |
| tree | c0d6ee9e7037e086a3f2832675bcc70c10ee9b2a | |
| parent | dcec5245e048510fc121eff759191f81c825c25d (diff) | |
| download | nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.gz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.bz2 nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.lz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.xz nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.tar.zst nixpkgs-f75be37d703f64202bf093f45be1e20cf948f54e.zip | |
Returned elfutils 0.127 as an option.. I do not see why ltrace fails with 0.131. Will investigate after the merge.
svn path=/nixpkgs/trunk/; revision=10041
| -rw-r--r-- | pkgs/development/tools/misc/elfutils/0.127.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/elfutils/0.131.nix (renamed from pkgs/development/tools/misc/elfutils/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/elfutils/0.127.nix b/pkgs/development/tools/misc/elfutils/0.127.nix new file mode 100644 index 00000000000..2337ebbdbd0 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/0.127.nix @@ -0,0 +1,9 @@ +args: with args; + +stdenv.mkDerivation { + name = "elfutils-"+version; + src = fetchurl { + url = http://nix.cs.uu.nl/dist/tarballs/elfutils-0.127.tar.gz; + sha256 = "12n3h5r3c24a6l2wxz0w2dqq072bvgms0dzckivrwp5vdn22lpdv"; + }; +} diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/0.131.nix index 1966acff17e..5efe046493d 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/0.131.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl}: +args: with args; stdenv.mkDerivation { - name = "elfutils-0.131"; + name = "elfutils-"+version; src = fetchurl { url = http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.131.orig.tar.gz; sha256 = "0vqfjpcv81m3q0gsk78qykakhz9rbfwd65i4zsi03xr2lrk9ayll"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac7fef880a5..429a7529706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1409,10 +1409,15 @@ rec { inherit fetchurl stdenv replace; }; - elfutils = import ../development/tools/misc/elfutils { - inherit fetchurl stdenv; + elfutilsFun = lib.sumArgs + (selectVersion ../development/tools/misc/elfutils) { + inherit fetchurl stdenv; }; + elfutils = elfutilsFun { + version = "0.131"; + } null; + epm = import ../development/tools/misc/epm { inherit fetchurl stdenv rpm; }; @@ -1493,8 +1498,8 @@ rec { }; ltrace = import ../development/tools/misc/ltrace { - inherit fetchurl stdenv builderDefs stringsWithDeps lib - elfutils; + inherit fetchurl stdenv builderDefs stringsWithDeps lib; + elfutils = elfutilsFun {version = "0.127";} null; }; mk = import ../development/tools/build-managers/mk { |