diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
| commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
| tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/development/interpreters | |
| parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
| parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
| download | nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixpkgs-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/groovy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 6c0a9c2d375..968d9f1e8fb 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.14"; + version = "2.4.15"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0an5ddfajg8jwdi1zdkpcz1g8ij1iyp0xh7zck2bl84j3pi4dj7r"; + sha256 = "1vaa1wjnaza04hvp1n4kh10hvxx8370liz2ndm908dqv9mxa6k5x"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 13184ad50e8..2d350954213 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { name = "supercollider-${version}"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "150fgnjcmb06r3pa3mbsvb4iwnqlimjwdxgbs6p55zz6g8wbln7a"; + sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44"; }; hardeningDisable = [ "stackprotector" ]; |