diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-19 12:01:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-19 12:01:35 +0000 |
commit | 782f18b6fedc29813ea94cea51c12600af108e4c (patch) | |
tree | de5bf7a18a67dcd0d12ccb254c2a012663a614ff /pkgs/development/compilers | |
parent | 1ee9f3c87c12262520c9aa6a1b4ff5f056dad652 (diff) | |
parent | 7467ab39493e17abc28c7f66179feb0a69a3dbd4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
8 files changed, 32 insertions, 16 deletions
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 02c20016bad09..9362ee8d1147d 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +{ lib, stdenv, llvm_meta, version, fetch +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -18,7 +19,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 18be4499d0fdb..e36aec42e905a 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, llvm_meta, version, src, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +{ lib, stdenv, llvm_meta, version, src +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -20,7 +21,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index 98ee8135b8fa0..3aa91bc953b21 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -29,7 +29,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index bfdeeff6db5b1..9817899345a9b 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -29,7 +29,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index 7add8fab0f91f..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/default.nix b/pkgs/development/compilers/llvm/17/compiler-rt/default.nix index 7add8fab0f91f..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/17/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/17/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 7add8fab0f91f..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 1fa448fe9d8e9..558a4e435a416 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.20231113"; + version = "0.1.0"; in stdenvNoCC.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { owner = "minoki"; repo = "LunarML"; rev = "refs/tags/v${version}"; - hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; + hash = "sha256-wM6ppH0g8yIi+4fwTejzZGn1uv/Wvlajn87A+IKbPXw="; }; outputs = [ "out" "doc" ]; |