public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into glibc-2.18

Browse Source
This commit is contained in:
Eelco Dolstra
2013-12-18 15:42:54 +01:00
parent 04c364d181 580c339699
commit 134ba27ea2
487 changed files with 5102 additions and 1831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/diffstat/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{fetchurl, stdenv}:
stdenv.mkDerivation rec {
name = "diffstat-1.45";
name = "diffstat-1.58";
src = fetchurl {
url = "ftp://invisible-island.net/diffstat/"+ name +".tgz";
md5 = "cfe06ffcdbeaaa2fd296db867157ef78";
sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
};
meta = {
pkgs/tools/text/ebook-tools/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }:
stdenv.mkDerivation rec {
name = "ebook-tools-0.2.1";
name = "ebook-tools-0.2.2";
src = fetchurl {
url = "mirror://sourceforge/ebook-tools/${name}.tar.gz";
sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2";
sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb";
};
buildInputs = [ cmake pkgconfig libxml2 libzip ];
pkgs/tools/text/enscript/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec {
name = "enscript-1.6.5.2";
name = "enscript-1.6.6";
src = fetchurl {
url = "mirror://gnu/enscript/${name}.tar.gz";
sha256 = "0xfblj3liwf1zxpx8bdcl2dwqi2lkfm1zsl6ld9757kgnfyk6gnv";
sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
};
buildInputs = [ gettext ];
pkgs/tools/text/uni2ascii/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "uni2ascii-4.15";
name = "uni2ascii-4.18";
src = fetchurl {
url = "http://billposer.org/Software/Downloads/${name}.tar.gz";
sha256 = "0vlwsqrzmdsb2mx0hbhmw1dvzy56jk8779hphnj6yxijryva6g2v";
sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y";
};
meta = {
pkgs/tools/text/wgetpaste/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, wget, bash, coreutils}:
stdenv.mkDerivation rec {
version = "2.20";
version = "2.23";
name = "wgetpaste-${version}";
src = fetchurl {
url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e";
sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n";
};
# currently zsh-autocompletion support is not installed