diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/tools/misc | |
parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/expect/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/recutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 31 |
4 files changed, 41 insertions, 10 deletions
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index a32e5abbb29bc..d9f9b09271b5e 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}: +{stdenv, fetchurl, tcl, tk, xproto, libX11}: stdenv.mkDerivation { name = "expect-5.44.1"; - + src = fetchurl { url = http://expect.nist.gov/old/expect-5.44.1.tar.gz; sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4"; }; - buildInputs = [tcl tk autoconf xproto libX11]; + buildInputs = [tcl tk xproto libX11]; #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; @@ -22,9 +22,9 @@ stdenv.mkDerivation { sed -e '1i\#include <tclInt.h>' -i exp_inter.c export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" ''; - - configureFlags = ["--with-tcl=${tcl}/lib" - "--with-tclinclude=${tcl}/include" + + configureFlags = ["--with-tcl=${tcl}/lib" + "--with-tclinclude=${tcl}/include" "--with-tk=${tk}/lib" "--exec-prefix=$out"]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 621bc79a27795..2c46b11645076 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-20111122"; + name = "parallel-20111222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1czcflprhbhyj3mj7dc986gll0kfc6n8qiqazclph172rbq3acpd"; + sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b"; }; patchPhase = diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 95ced6784ae28..8e159f48b63f0 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gettext, emacs, curl, check, bc }: stdenv.mkDerivation rec { - name = "recutils-1.4"; + name = "recutils-1.5"; src = fetchurl { url = "mirror://gnu/recutils/${name}.tar.gz"; - sha256 = "1kakmzmkdkgqmvqfzrpkwjjkg492rk3k7xfgnwcjacap9l79z9pv"; + sha256 = "1v2xzwwwhc5j5kmvg4sv6baxjpsfqh8ln7ilv4mgb1408rs7xmky"; }; doCheck = true; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix new file mode 100644 index 0000000000000..0422383ed3bcc --- /dev/null +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchgit, python}: + +let pkgname = "youtube-dl"; + pkgver = "2011.12.08"; + +in +stdenv.mkDerivation { + name = "${pkgname}-${pkgver}"; + + src = fetchgit { + url = "git://github.com/rg3/${pkgname}"; + rev = "661a807c65a154eccdddb875b45e4782ca86132c"; + sha256 = "32fd193b867b122400e9d5d32f6dfaf15704f837a9dc2ff809e1ce06712857ba"; + }; + + buildInputs = [python]; + buildPhase = "sed -i 's|#!/usr/bin/env python|#!#{python}/bin/python|' youtube-dl"; + + installPhase = '' + ensureDir $out/bin + cp youtube-dl $out/bin + ''; + + meta = { + description = "A small command-line program to download videos from YouTube.com and a few more sites"; + homepage = http://rg3.github.com/youtube-dl/; + maintainers = [ + stdenv.lib.maintainers.bluescreen303 + ]; + }; +} |