diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-29 00:12:29 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-29 00:12:29 +0200 |
| commit | 32b4375f107315edc9066de21bf2de030d90c43d (patch) | |
| tree | 8b3869f8ff2b0e2e272605b46b56348addf2d976 /pkgs/development | |
| parent | a7218d691483260bbf2ed726196f17481e2f9500 (diff) | |
| parent | 695fd81e02ced2a9591cf2ac3183c360de763c07 (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development')
101 files changed, 1994 insertions, 664 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index efd68988c9b2..7fbec79cbd46 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,27 +39,22 @@ let elixir = elixir_1_10; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { - inherit rebar erlang; - debugInfo = true; - }; - - elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix index 1eb233b90b7f..6ab729cd3139 100644 --- a/pkgs/development/compilers/dasm/default.nix +++ b/pkgs/development/compilers/dasm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dasm"; - version = "2.20.13"; + version = "2.20.14"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; rev = version; - sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf"; + sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp"; }; configurePhase = false; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 7acbff95357d..b4d6a0933e9a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -102,4 +102,15 @@ rec { x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8"; }; }; + + # v5.0.0 + + sdk_5_0 = buildNetCoreSdk { + version = "5.0.100-rc.1.20452.10"; + sha512 = { + x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b"; + aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f"; + x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac"; + }; + }; } diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix new file mode 100644 index 000000000000..baa1d879b53e --- /dev/null +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -0,0 +1,174 @@ +{ stdenv +, fetchurl, perl, gcc +, ncurses6, gmp, glibc, libiconv, numactl +, llvmPackages +}: + +# Prebuilt only does native +assert stdenv.targetPlatform == stdenv.hostPlatform; + |