diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
commit | fca582bff0ab8887835ca10495620d0ac15ab10a (patch) | |
tree | 0934656b725b9a5da0acb8025f3a9ceab2e63d90 /pkgs/tools/misc | |
parent | 2291f661b03f29fd59549165721a1426e5d04264 (diff) | |
parent | 89a3dc9adac5aa195ec9334c2f7e255e02388157 (diff) | |
download | nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.gz nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.bz2 nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.lz nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.xz nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.zst nixpkgs-fca582bff0ab8887835ca10495620d0ac15ab10a.zip |
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bc/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/screen/default.nix | 8 |
3 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index b8c3657bb64..2d3d70d5ead 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,20 +1,23 @@ {stdenv, fetchurl, flex, readline}: -stdenv.mkDerivation { - name = "bc-1.0.6"; +stdenv.mkDerivation rec { + name = "bc-1.06"; src = fetchurl { - url = mirror://gnu/bc/bc-1.06.tar.gz; - md5 = "d44b5dddebd8a7a7309aea6c36fda117"; + url = "mirror://gnu/bc/${name}.tar.gz"; + sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf"; }; patches = [ ./readlinefix.patch ]; - configureFlags = "--with-readline"; + configureFlags = [ "--with-readline" ]; buildInputs = [flex readline]; + doCheck = true; + meta = { description = "GNU software calculator"; homepage = http://www.gnu.org/software/bc/; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 7b60bc3f583..05c1ffaa965 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20100906"; + name = "parallel-20100922"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw"; + sha256 = "0bn1pka242pgm5dm0wkd4zf63rwv0wxxb0fjdjivlxyid72r7g8d"; }; patchPhase = diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 39e763c4ca7..f31a28c221a 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -8,4 +8,12 @@ stdenv.mkDerivation { }; buildInputs = [ncurses]; + + meta = { + homepage = "http://www.gnu.org/software/screen/"; + description = "Full-screen window manager that multiplexes a physical terminal"; + + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; } |