diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-23 09:33:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-23 09:33:09 +0200 |
| commit | 14673d61ed94bcb9c54d24bacd7b15420d3e3fab (patch) | |
| tree | d50eedbd1cd4bb2090c1cf2ad41cc118ea5127e8 /pkgs/development/compilers | |
| parent | fcde178ed5f76626d57b3b02848f2fedf5fd9928 (diff) | |
| parent | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff) | |
| download | nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.gz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.bz2 nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.lz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.xz nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.tar.zst nixlib-14673d61ed94bcb9c54d24bacd7b15420d3e3fab.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/iasl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/kotlin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 36ef9d0cc73d..d4f2f931c31c 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -78,12 +78,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180810"; + version = "8.6.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz"; - sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 84265151dc41..22f80ae559f7 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20180629"; + version = "20180313"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh"; + sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 757773eed52d..718628d8ad41 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.61"; + version = "1.2.70"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy"; + sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d2295d2d79b0..1ed6d2c6db22 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (args // rec { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06"; + broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06"; }; }) |