Merge staging-next into staging

4 files changed, 113 insertions, 12 deletions

diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix
index ec0d8fe5c72..ac0f3312414 100644
--- a/pkgs/development/compilers/idris2/default.nix
+++ b/pkgs/development/compilers/idris2/default.nix
@@ -1,22 +1,35 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
-, clang, chez
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, clang
+, chez
+, gmp
+, zsh
 }:
 
+# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
+
 # Uses scheme to bootstrap the build of idris2
 stdenv.mkDerivation rec {
   pname = "idris2";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "idris-lang";
     repo = "Idris2";
     rev = "v${version}";
-    sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh";
+    sha256 = "105jybjf5s0k6003qzfxchzsfcpsxip180bh3mdmi74d464d0h8g";
   };
 
+  # We do not add any propagatedNativeBuildInputs because we do not want the
+  # executables idris2 produces to depend on the nix-store. As such, it is left
+  # to the user to guarantee chez (or any other codgen dependency) is available
+  # in the path during compilation of programs with idris2.
   strictDeps = true;
-  nativeBuildInputs = [ makeWrapper clang chez ];
-  buildInputs = [ chez ];
+  nativeBuildInputs = [ makeWrapper clang chez ]
+    ++ lib.optional stdenv.isDarwin [ zsh ];
+  buildInputs = [ gmp ];
 
   prePatch = ''
     patchShebangs --build tests
@@ -26,9 +39,9 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isDarwin "OS=";
 
   # The name of the main executable of pkgs.chez is `scheme`
-  buildFlags = [ "bootstrap-build" "SCHEME=scheme" ];
+  buildFlags = [ "bootstrap" "SCHEME=scheme" ];
 
-  checkTarget = "bootstrap-test";
+  checkTarget = "test";
 
   # TODO: Move this into its own derivation, such that this can be changed
   #       without having to recompile idris2 every time.
@@ -72,7 +85,7 @@ stdenv.mkDerivation rec {
     description = "A purely functional programming language with first class types";
     homepage = "https://github.com/idris-lang/Idris2";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ wchresta ];
+    maintainers = with lib.maintainers; [ fabianhjr wchresta ];
     inherit (chez.meta) platforms;
   };
 }
diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix
index 1bbbbd963f6..ef65827fbf2 100644
--- a/pkgs/development/compilers/llvm/git/default.nix
+++ b/pkgs/development/compilers/llvm/git/default.nix
@@ -21,8 +21,8 @@ let
   release_version = "13.0.0";
   candidate = ""; # empty or "rcN"
   dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
-  rev = "643b6407faf460915679f304420cfbee87c47734"; # When using a Git commit
-  rev-version = "unstable-2021-06-11"; # When using a Git commit
+  rev = "1605fce6c3074f8d1dff5a917a1840ffa66abd86"; # When using a Git commit
+  rev-version = "unstable-2021-06-19"; # When using a Git commit
   version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
   targetConfig = stdenv.targetPlatform.config;
 
@@ -30,7 +30,7 @@ let
     owner = "llvm";
     repo = "llvm-project";
     rev = if rev != "" then rev else "llvmorg-${version}";
-    sha256 = "0b06qqbks20m1cy9g1k8y4w8vh9zcbh9ag2bpk9xgg2xkmbq42az";
+    sha256 = "1jf0b9vn4qv5gsvhyg6xsqdkdl4vzn7j4sfcldl8bggcgjmzp0q1";
   };
 
   llvm_meta = {
diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix
new file mode 100644
index 00000000000..3120426210b
--- /dev/null
+++ b/pkgs/development/compilers/myrddin/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, bison
+, binutils
+, binutils-unwrapped
+, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  pname = "myrddin";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    repo = "mc";
+    owner = "oridb";
+    rev = "r${version}";
+    sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    pkg-config
+    makeWrapper
+  ];
+
+  postPatch = ''
+    substituteInPlace mk/c.mk \
+        --replace "-Werror" ""
+  '';
+
+  buildPhase = ''
+    make bootstrap
+    make
+  '';
+
+  postInstall = ''
+    for b in $out/bin/*; do
+        wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]}
+    done
+  '';
+
+  checkPhase = ''
+    make check
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Systems language that is both powerful and fun to use";
+    homepage = "https://myrlang.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix
new file mode 100644
index 00000000000..e379bf4e38e
--- /dev/null
+++ b/pkgs/development/compilers/scala-runners/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, jre, coursier }:
+
+stdenv.mkDerivation rec {
+  pname = "scala-runners";
+  version = "unstable-2020-02-02";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "dwijnand";
+    rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31";
+    sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner
+    cp scala-runner $out/lib
+    ln -s $out/lib/scala-runner $out/bin/scala
+    ln -s $out/lib/scala-runner $out/bin/scalac
+    ln -s $out/lib/scala-runner $out/bin/scalap
+    ln -s $out/lib/scala-runner $out/bin/scaladoc
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/dwijnand/scala-runners";
+    description = "An alternative implementation of the Scala distribution's runners";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrhino ];
+  };
+}