diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-04-24 20:22:01 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-04-24 20:22:01 +0200 |
| commit | a4585468d17466d6e77fd2f5aaab31ac772bac01 (patch) | |
| tree | 1d794c98e484d4da9f6cf973fdf55df37c2d2de9 /pkgs/development/interpreters | |
| parent | e815efb8249d581b0bd6284a2b9ea98c7782c3ff (diff) | |
| parent | e630e9da793adc42294f91fae2a4ab6dc682c569 (diff) | |
| download | nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar.gz nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar.bz2 nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar.lz nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar.xz nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.tar.zst nixlib-a4585468d17466d6e77fd2f5aaab31ac772bac01.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/eff/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/interpreters/supercollider/default.nix | 4 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 28ea05066c23..258aebe81727 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: +{ stdenv, fetchFromGitHub, which, ocamlPackages }: -let inherit (stdenv.lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "3.12"; +let version = "5.0"; in stdenv.mkDerivation { - name = "eff-20140928"; + name = "eff-${version}"; - src = fetchgit { - url = "https://github.com/matijapretnar/eff.git"; - rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64"; - sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; + src = fetchFromGitHub { + owner = "matijapretnar"; + repo = "eff"; + rev = "v${version}"; + sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka"; }; - buildInputs = [ ocaml findlib ocamlbuild menhir which ]; + buildInputs = [ which ] ++ (with ocamlPackages; [ + ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild + ]); doCheck = true; checkTarget = "test"; @@ -29,7 +30,7 @@ stdenv.mkDerivation { backtracking, multi-threading, and much more... ''; license = licenses.bsd2; - platforms = ocaml.meta.platforms or []; + inherit (ocamlPackages.ocaml.meta) platforms; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 2d3509542135..2737fd6fae04 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.2"; + version = "3.9.3"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44"; + sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr"; }; hardeningDisable = [ "stackprotector" ]; |