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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-09-11 22:52:53 +02:00
parent c86eb1da5f c3887f0253
commit 628b6c0e9d
126 changed files with 2687 additions and 2186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/ascii/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ascii-${version}";
version = "3.15";
version = "3.18";
src = fetchurl {
url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
sha256 = "0pzzfljg2ijnnys3fzj3f2p288sl5cgk83a2mpcm679pcj5xpqdc";
sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j";
};
prePatch = ''
pkgs/tools/text/xml/basex/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "basex-${version}";
version = "8.6.4";
version = "8.6.6";
src = fetchurl {
url = "http://files.basex.org/releases/${version}/BaseX864.zip";
sha256 = "14320hfw53m0zl1v4377p0vcjvdnwfpa4gkj2y2wlrplma76y0w7";
url = "http://files.basex.org/releases/${version}/BaseX866.zip";
sha256 = "1kws6swisdaa17yhijjvkh2ikwz9rd5cw8mdjvkqw6vlcp1nq6m4";
};
buildInputs = [ unzip jre ];