diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:51 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:51 +0200 |
commit | 71f67f178df91c42ff230c41ab724dd3a90a5bb5 (patch) | |
tree | b55f27e4cc46982ebddabf4935268e4ea38610c9 /pkgs/development/compilers | |
parent | eeaf3a131fbe8611d59592ae2e215131b23c70e5 (diff) | |
parent | 6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204 (diff) | |
download | nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.gz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.bz2 nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.lz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.xz nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.tar.zst nixlib-71f67f178df91c42ff230c41ab724dd3a90a5bb5.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/futhark/default.nix | 55 | ||||
-rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 6 |
3 files changed, 59 insertions, 3 deletions
diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix new file mode 100644 index 000000000000..890be3431c3a --- /dev/null +++ b/pkgs/development/compilers/futhark/default.nix @@ -0,0 +1,55 @@ +# Generated using `cabal2nix --hpack .`, then replace src +{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html +, bytestring, containers, data-binary-ieee754, directory +, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy +, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty +, markdown, mtl, neat-interpolation, parallel, parsec, process +, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa +, srcloc, stdenv, template-haskell, temporary, test-framework +, test-framework-hunit, test-framework-quickcheck2, text +, th-lift-instances, transformers, vector, vector-binary-instances +, zlib, fetchFromGitHub +}: +mkDerivation { + pname = "futhark"; + version = "0.6.2"; + src = fetchFromGitHub { + owner = "diku-dk"; + repo = "futhark"; + rev = "v0.6.2"; + sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process raw-strings-qq + regex-tdfa srcloc template-haskell text th-lift-instances + transformers vector vector-binary-instances zlib + ]; + libraryToolDepends = [ alex happy hpack ]; + executableHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev haskeline json language-c-quote mainland-pretty + markdown mtl neat-interpolation parallel parsec process + process-extras random raw-strings-qq regex-tdfa srcloc + template-haskell temporary text th-lift-instances transformers + vector vector-binary-instances zlib + ]; + testHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process QuickCheck + raw-strings-qq regex-tdfa srcloc template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 text + th-lift-instances transformers vector vector-binary-instances zlib + ]; + preConfigure = "hpack"; + homepage = "https://futhark-lang.org"; + description = "An optimising compiler for a functional, array-oriented language"; + license = stdenv.lib.licenses.isc; +} diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index de063500b709..23f44331dd89 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -150,6 +150,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + knownVulnerabilities = [ "Support ended in September 2018. Use OpenJDK or JDK 8." ]; }; }; in result diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 47415ac9177b..7d785093f9b3 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,11 +6,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.0"; - cargoVersion = "1.29.0"; + version = "1.29.1"; + cargoVersion = "1.29.1"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4"; + sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; }; in rec { rustc = callPackage ./rustc.nix { |