Merge branch 'staging-next' into staging

2021-03-04 22:16:45 +01:00
parent 9f7ce23482 a992d68671
commit 6d1958ad2d
325 changed files with 4167 additions and 1748 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  makeFlags = [
    "-C sources"
-    "CC=${stdenv.cc}/bin/cc"
+    "CC=${stdenv.cc.targetPrefix}cc"
  ];

  preInstall = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
    description = "A portable Forth compiler";
    homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
    license = licenses.lgpl3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/cseed/arachne-pnr";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ shell thoughtpolice ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
@@ -1,4 +1,4 @@
-{ newScope } :
+{ lib, newScope } :
 let
  callPackage = newScope self;

@@ -18,4 +18,4 @@ let
    egg2nix = callPackage ./egg2nix.nix { };
  };

-in self
+in lib.recurseIntoAttrs self
@@ -1,4 +1,4 @@
-{ eggDerivation, fetchurl, chickenEggs }:
+{ lib, eggDerivation, fetchurl, chickenEggs }:

 # Note: This mostly reimplements the default.nix already contained in
 # the tarball. Is there a nicer way than duplicating code?
@@ -1,4 +1,4 @@
-{ newScope } :
+{ lib, newScope } :
 let
  callPackage = newScope self;

@@ -18,4 +18,4 @@ let
    egg2nix = callPackage ./egg2nix.nix { };
  };

-in self
+in lib.recurseIntoAttrs self
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }:
+{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }:

 crystal.buildCrystalPackage rec {
  pname = "crystal2nix";
@@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "gleam";
-  version = "0.14.1";
+  version = "0.14.2";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-KAcb+YNfdNc5LJIApuzjXKnPTFOK0C5Jui32nij4O4U=";
+    sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ] ++
    lib.optionals stdenv.isDarwin [ Security ];

-  cargoSha256 = "sha256-Hxat6UZziIxHGLPydnnmgzdwtvjaeeqOgD+ZC823uJU=";
+  cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY=";

  meta = with lib; {
    description = "A statically typed language for the Erlang VM";
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
    '';

    maintainers = [ lib.maintainers.peti ];
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
    "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
  ] ++ lib.optionals (stdenv.isDarwin) [
    "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON"
+    "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
  ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
    "-DCOMPILER_RT_BUILD_XRAY=OFF"
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
+{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:

@@ -15,7 +15,14 @@ stdenv.mkDerivation {
    mv llvm-* llvm
  '';

-  patches = lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+  patches = [
+    (fetchpatch {
+      # Backported from LLVM 12, avoids clashes with commonly used "block.h" header.
+      url = "https://github.com/llvm/llvm-project/commit/19bc9ea480b60b607a3e303f20c7a3a2ea553369.patch";
+      sha256 = "sha256-aWa66ogmPkG0xHzSfcpD0qZyZQcNKwLV44js4eiun78=";
+      stripLen = 1;
+    })
+  ] ++ lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;

  preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
    patchShebangs utils/cat_files.py
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, callPackage, wrapCCWith }:
+{ lib, fetchFromGitHub, callPackage, wrapCCWith }:

 let
  version = "4.0.1";
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
    homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/";
    license = licenses.bsd2;
    maintainers = with maintainers; [ siraben ];
+    platforms = platforms.all;
  };
 }
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  buildPhase = ''
    mkdir -p $out/bin $out/share/mu
    cp -r lib $out/share/mu
-    gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c
+    ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c
  '';

  installPhase = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/nickmqb/muon";
    license = licenses.mit;
    maintainers = with maintainers; [ Br1ght0ne ];
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.all;
  };
 }
@@ -1,6 +1,6 @@
 import ./generic.nix {
  major_version = "4";
  minor_version = "11";
-  patch_version = "1";
-  sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa";
+  patch_version = "2";
+  sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z";
 }
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
-, ffmpeg_3, python, ruby }:
+, ffmpeg, python3, ruby }:

 let
  major = "15";
@@ -21,8 +21,8 @@ let
      sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
    };

-    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
-    nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
+    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+    nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];

    dontUseCmakeConfigure = true;

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  buildPhase = ''
      # according to official documentation
-      cc rasm_v*.c -O2 -lm -lrt -o rasm
+      ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm
  '';

  installPhase = ''
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    # use -n option to display all licenses
    license = licenses.mit; # expat version
    maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
@@ -14,6 +14,10 @@ stdenv.mkDerivation {
    sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs";
  };

+  postPatch = ''
+    substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++'
+  '';
+
  installPhase = ''
    mkdir -p $out/bin
    mv serpent $out/bin
@@ -33,6 +37,6 @@ stdenv.mkDerivation {
    homepage = "https://github.com/ethereum/wiki/wiki/Serpent";
    license = with licenses; [ wtfpl ];
    maintainers = with maintainers; [ chris-martin ];
-    platforms = with platforms; linux;
+    platforms = platforms.all;
  };
 }