diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-23 19:27:14 +0100 |
| commit | 50ac037864dc0bedcea2bd6f8d420f71fa1e7347 (patch) | |
| tree | e4942eb779306ab89563dbfa5be423f4409e0a51 /pkgs/tools/misc | |
| parent | b89ab32c60373ae4c8ca7b6604ea3445afabca85 (diff) | |
| parent | 6518480c1b6c3720eb899a5a1860fdb89c5735ec (diff) | |
| download | nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.gz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.bz2 nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.lz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.xz nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.tar.zst nixlib-50ac037864dc0bedcea2bd6f8d420f71fa1e7347.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/bogofilter/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 2ec7f433596c..09d8e888837e 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, bdb}: +{fetchurl, stdenv, flex, db4}: stdenv.mkDerivation rec { name = "bogofilter-1.2.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # FIXME: We would need `pax' as a "propagated build input" (for use # by the `bf_tar' script) but we don't have it currently. - buildInputs = [ flex bdb ]; + buildInputs = [ flex db4 ]; meta = { homepage = http://bogofilter.sourceforge.net/; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index cab3e69688ca..eb6baf41fe47 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2013.12.17.2"; + version = "2013.12.20"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1dmv14v623v9afxfn0rw1gfdd91sngfgj4dg7hwbmnqsja0qxydv"; + sha256 = "0cqr0rpa247gfk5fg65sj94x4d9a1s85343gnqmc763h5h8v50zb"; }; buildInputs = [ python ]; |