diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26 12:42:03 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-26 12:42:03 +0100 |
commit | db9d204d331e6a3942d71c6c1e24f0e0113822ba (patch) | |
tree | e2cae54366497660587e864672440dc1c27f2467 /pkgs/tools/misc | |
parent | 77a49e5813351bcfb6541a1ff4be62cbe70e590a (diff) | |
parent | b5de8156cb64fd873e27e0ef3d26925c17ee0cd5 (diff) | |
download | nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar.gz nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar.bz2 nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar.lz nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar.xz nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.tar.zst nixlib-db9d204d331e6a3942d71c6c1e24f0e0113822ba.zip |
Merge remote-tracking branch 'origin/master' into glibc-2.19
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/bogofilter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/i3minator/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/man-db/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/misc/man-db/share.patch | 110 | ||||
-rw-r--r-- | pkgs/tools/misc/memtest86/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/plantuml/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
7 files changed, 22 insertions, 141 deletions
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 09d8e888837e..f7c121d825e2 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, flex, db4}: +{fetchurl, stdenv, flex, db}: 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 db4 ]; + buildInputs = [ flex db ]; meta = { homepage = http://bogofilter.sourceforge.net/; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index cb12cb33c76d..08e012128c24 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -15,11 +15,11 @@ let }; in buildPythonPackage rec { name = "i3minator-${version}"; - version = "0.0.3"; + version = "0.0.4"; src = fetchurl { - url = "https://github.com/carlesso/i3minator/archive/v${version}.tar.gz"; - sha256 = "0ksb0frrhq10k5rjzk72kj5rjzak1irr9q4x4f22w2vylxq19xxa"; + url = "https://github.com/carlesso/i3minator/archive/${version}.tar.gz"; + sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; }; propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ]; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 5374cb743618..f664bcc6917d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,32 +1,23 @@ -{stdenv, fetchurl, db4, groff}: +{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: -stdenv.mkDerivation { - name = "man-db-2.5.1"; +stdenv.mkDerivation rec { + name = "man-db-2.6.6"; src = fetchurl { - url = mirror://savannah/man-db/man-db-2.5.1.tar.gz; - sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3"; + url = "mirror://savannah/man-db/${name}.tar.xz"; + sha256 = "1hv6byj6sg6cp3jyf08gbmdm4pwhvd5hzmb94xl0w7prin6hzabx"; }; - buildInputs = [db4 groff]; + buildInputs = [ pkgconfig libpipeline db groff ]; configureFlags = '' --disable-setuid - --with-nroff=${groff}/bin/nroff - --with-tbl=${groff}/bin/tbl - --with-eqn=${groff}/bin/eqn - --with-neqn=${groff}/bin/neqn ''; - troff = "${groff}/bin/troff"; - - patches = [ - # Search in "share/man" relative to each path in $PATH (in addition to "man"). - ./share.patch - ]; - - meta = { - homepage = http://www.nongnu.org/man-db/; + meta = with stdenv.lib; { + homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/man-db/share.patch b/pkgs/tools/misc/man-db/share.patch deleted file mode 100644 index 95582a50269d..000000000000 --- a/pkgs/tools/misc/man-db/share.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -rc man-db-2.5.1-orig/src/manp.c man-db-2.5.1/src/manp.c -*** man-db-2.5.1-orig/src/manp.c 2008-01-07 03:23:11.000000000 +0100 ---- man-db-2.5.1/src/manp.c 2008-02-07 14:20:20.000000000 +0100 -*************** -*** 96,102 **** - - static void mkcatdirs (const char *mandir, const char *catdir); - static inline char *get_manpath_from_path (const char *path); -! static inline char *has_mandir (const char *p); - static inline char *fsstnd (const char *path); - static char *def_path (int flag); - static void add_dir_to_list (char **lp, const char *dir); ---- 96,102 ---- - - static void mkcatdirs (const char *mandir, const char *catdir); - static inline char *get_manpath_from_path (const char *path); -! static inline char *has_mandir (const char *p, const char *mandir); - static inline char *fsstnd (const char *path); - static char *def_path (int flag); - static void add_dir_to_list (char **lp, const char *dir); -*************** -*** 928,934 **** - } else { - debug ("is not in the config file\n"); - -! t = has_mandir (p); - if (t) { - debug ("but does have a ../man or man " - "subdirectory\n"); ---- 928,934 ---- - } else { - debug ("is not in the config file\n"); - -! t = has_mandir (p, "man"); - if (t) { - debug ("but does have a ../man or man " - "subdirectory\n"); -*************** -*** 938,943 **** ---- 938,952 ---- - } else - debug ("and doesn't have ../man or man " - "subdirectories\n"); -+ -+ t = has_mandir (p, "share/man"); -+ if (t) { -+ debug ("but does have a ../share/man or share/man subdirectory\n"); -+ -+ add_dir_to_list (tmplist, t); -+ free (t); -+ } else -+ debug ("and doesn't have ../share/man or share/man subdirectories\n"); - } - } - -*************** -*** 1013,1019 **** - - /* path does not exist in config file: check to see if path/../man or - path/man exist. If so return it, if not return NULL. */ -! static inline char *has_mandir (const char *path) - { - char *newpath = NULL; - ---- 1022,1028 ---- - - /* path does not exist in config file: check to see if path/../man or - path/man exist. If so return it, if not return NULL. */ -! static inline char *has_mandir (const char *path, const char *mandir) - { - char *newpath = NULL; - -*************** -*** 1023,1031 **** - char *subdir = strrchr (path, '/'); - if (subdir) { - const int prefix_len = subdir + 1 - path; -! newpath = xmalloc (prefix_len + sizeof ("man") + 1); - strncpy (newpath, path, prefix_len); -! strcpy (newpath + prefix_len, "man"); - - if (is_directory (newpath) == 1) - return newpath; ---- 1032,1040 ---- - char *subdir = strrchr (path, '/'); - if (subdir) { - const int prefix_len = subdir + 1 - path; -! newpath = xmalloc (prefix_len + strlen (mandir) + 2); - strncpy (newpath, path, prefix_len); -! strcpy (newpath + prefix_len, mandir); - - if (is_directory (newpath) == 1) - return newpath; -*************** -*** 1033,1039 **** - *newpath = '\0'; - } - -! newpath = appendstr (newpath, path, "/man", NULL); - - if (is_directory (newpath) == 1) - return newpath; ---- 1042,1048 ---- - *newpath = '\0'; - } - -! newpath = appendstr (newpath, path, "/", mandir, NULL); - - if (is_directory (newpath) == 1) - return newpath; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 978bb2729f84..ebf0a89a7075 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86-4.1.0"; + name = "memtest86-4.3.3"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz; - sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq"; + url = http://www.memtest86.com/downloads/memtest86-4.3.3-src.tar.gz; + sha256 = "1fzpk0s97lx8h1wbv2bgr6m8v4ag8i58kzr8fa25bvwyl8hks9sl"; }; preBuild = '' diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 10886e969a2c..6ba3d9a4f59f 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "7982"; + version = "7991"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "0hxs0whjgx36j5azdcna40rw2c7smhg0qm3kzld9vx88m0c51dgl"; + sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a8863da40380..ef4bc68b1c80 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 = "2014.02.10"; + version = "2014.02.19.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0grxdbvzjnxd26c80rr22mjp89y4i6bghmqyp5bpzd53sgkpl0zs"; + sha256 = "0bilardg46xikw4gl4n50bg9wrmarmnzhrhhwhdcyrx0p0idl4fn"; }; buildInputs = [ python ]; |