diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/development/interpreters/groovy | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/development/interpreters/groovy')
| -rw-r--r-- | pkgs/development/interpreters/groovy/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 793fa0a1b4da..bdd138418969 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "2.5.7"; + version = "2.5.8"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1q69xg7p790dfk09wyijpx8y85n8g9lfd0fikl6qr73k9zz5v41x"; + sha256 = "0hl7m9fpmrn9ppxbb3pm68048xpzig7q6hqyg121gvcziywi9ys9"; }; buildInputs = [ unzip makeWrapper ]; |