diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-06 06:17:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 06:17:06 +0000 |
| commit | 8a52c4c658c6543c481b00346ccdb3b358e5c4d1 (patch) | |
| tree | 440b28289cd1ec35cc360807edb465fe3b78c1d3 /pkgs/development/tools | |
| parent | 6ce08f74dc7518d35aa52f9b83fa84ae716854b8 (diff) | |
| parent | bb2a7b943917aba1c9c86f049e75a4a594040746 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/jenkins/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ktlint/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index b4cc2843c335..13a6d596599a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.3"; + version = "2.263.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "00lpqkkz7k0m2czz1sg54gb90sljc14i5a2kpikrkiw8aqfz3s4d"; + sha256 = "1wfn5r356fqy8ypqnw44ir0cy8qr5ck6xckxnnn2c9x324mypv8f"; }; buildCommand = '' diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index b26c328dba85..7e71c08ec4b1 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0lvi4d731ypdjcskj0hdfd37wa3ldspibs2dgaahg7d7zhp1l76g"; + sha256 = "17n1xdalz38h9p4ylcpkbbqp22b1np5l8y5l3r58kaf9k8p6cfa7"; }; nativeBuildInputs = [ makeWrapper ]; |