diff options
author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-10 00:55:07 +0000 |
---|---|---|
committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-10 00:55:07 +0000 |
commit | 085518614c1feb8b47b601f5e4c53eb1f4003a2f (patch) | |
tree | 8a1c5d35ee717382690d94c358129951901cb065 /pkgs | |
parent | 4f21598f2f7fbd5cfe9f9e148cda3a1d17686d89 (diff) |
Added bc :P
svn path=/nixpkgs/trunk/; revision=4045
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/misc/bc/default.nix | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 20901e6859603..f300ca236d4f9 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -35,6 +35,10 @@ rec { ### TOOLS + bc = (import ../tools/misc/bc) { + inherit fetchurl stdenv flex; + }; + coreutils = (import ../tools/misc/coreutils) { inherit fetchurl stdenv; }; @@ -639,7 +643,8 @@ rec { }; apacheAnt14 = (import ../development/tools/build-managers/apache-ant) { - inherit fetchurl stdenv jdk; + inherit fetchurl stdenv; + jdk = j2sdk14x; name = "ant-jdk-1.4.2"; }; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix new file mode 100644 index 0000000000000..18d00169729d2 --- /dev/null +++ b/pkgs/tools/misc/bc/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, flex}: + +stdenv.mkDerivation { + name = "bc-1.0.6"; + src = fetchurl { + url = http://ftp.gnu.org/pub/gnu/bc/bc-1.06.tar.gz; + md5 = "d44b5dddebd8a7a7309aea6c36fda117"; + }; + + buildInputs = [flex]; +} |