Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-05-05 19:51:09 +02:00
372 changed files with 3551 additions and 1619 deletions

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl /*, xmlto */}:
stdenv.mkDerivation rec {
name = "colordiff-1.0.18";
name = "colordiff-1.0.19";
src = fetchurl {
urls = [
"https://www.colordiff.org/${name}.tar.gz"
"http://www.colordiff.org/archive/${name}.tar.gz"
];
sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9";
sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26";
};
buildInputs = [ perl /* xmlto */ ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "4.9";
version = "4.9.1";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17";
sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];

View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "shfmt";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh";
sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8";
};
modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z";