diff options
author | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:45 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-12-04 18:33:52 +0100 |
commit | c32bf83301bc4063df924ee442d8e35c1b96d912 (patch) | |
tree | 5a0821f9960cfa2508fc6b451fbaf8bfa6326367 /pkgs/tools/text | |
parent | 88c7b4c7fee42c1ae5167fd1e7806d600e4451e4 (diff) | |
parent | 41f0e6ad9203a1859996e53323321a758c1fc7c4 (diff) |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/ascii/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/text/ebook-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/uni2ascii/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/wdiff/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/xml/basex/default.nix | 6 |
5 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 769cf389426cb..071b936832944 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { name = "ascii-${version}"; - version = "3.12"; + version = "3.14"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; - sha256 = "17jhmmdbhzzaai0lr5aslg0nmqchq1ygdxwd8pgl7qn2jnxhc6ci"; + sha256 = "1ldwi4cs2d36r1fv3j13cfa8h2pc4yayq5qii91758qqwfzky3kz"; }; prePatch = '' - sed -i -e 's|$(DESTDIR)/usr|$(out)|g' Makefile + sed -i -e "s|^PREFIX = .*|PREFIX = $out|" Makefile ''; preInstall = '' mkdir -vp "$out/bin" "$out/share/man/man1" ''; - meta = { + meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; homepage = "http://www.catb.org/~esr/ascii/"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index abb766928d74f..2fafec02d816a 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -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 ]; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index b4573118a49f3..0f54644eba56f 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -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 = { diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 63de9c3069394..70b9bf69e290e 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "GNU wdiff, comparing files on a word by word basis"; license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 4f120601c8e73..2484aac8b0d15 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { - name = "basex-7.7"; + name = "basex-7.7.2"; src = fetchurl { - url = "http://files.basex.org/releases/7.7/BaseX77.zip"; - sha256 = "1wnndq8lcnfx29bc3j2sgswk6dxgv2nln2chmwbf7h4a05fcavdj"; + url = "http://files.basex.org/releases/7.7.2/BaseX772.zip"; + sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a"; }; buildInputs = [ unzip jre ]; |