public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3908 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/crystal/default.nix
View File

@@ -146,7 +146,7 @@ let
"CRYSTAL_CONFIG_VERSION=${version}"
];
LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config";
LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config";
FLAGS = [
"--release"

2
pkgs/development/compilers/dale/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v";
};
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config llvm_6.dev ];
buildInputs = [ libffi llvm_6 ];
inherit doCheck;

9
pkgs/development/compilers/ghc/head.nix
View File

@@ -38,7 +38,7 @@
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.11.20200824"
, version ? "9.3.20210504"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -110,8 +110,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "3f50154591ada9064351ccec4adfe6df53ca2439";
sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d";
rev = "049c3a83fbce67e58e70c727d89e8331608a4e04";
sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7";
};
enableParallelBuilding = true;
@@ -139,6 +139,9 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
# otherwise haddock fails when generating the compiler docs
export LANG=C.UTF-8
echo -n "${buildMK dontStrip}" > mk/build.mk
echo ${version} > VERSION
echo ${src.rev} > GIT_COMMIT_ID

2
pkgs/development/compilers/ldc/generic.nix
View File

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip
cmake ldcBootstrap lit lit.python llvm_11.dev makeWrapper ninja unzip
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Foundation

2
pkgs/development/compilers/mrustc/bootstrap.nix
View File

@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
# Use shared mrustc/minicargo/llvm instead of rebuilding them
"MRUSTC=${mrustc}/bin/mrustc"
"MINICARGO=${mrustc-minicargo}/bin/minicargo"
"LLVM_CONFIG=${llvm_7}/bin/llvm-config"
"LLVM_CONFIG=${llvm_7.dev}/bin/llvm-config"
"RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}"
];

4
pkgs/development/compilers/vala/default.nix
View File

@@ -90,7 +90,7 @@ let
# Wait for PR #59372
# passthru = {
# updateScript = gnome3.updateScript {
# updateScript = gnome.updateScript {
# attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}";
# packageName = pname;
# };
@@ -101,7 +101,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ];
maintainers = with maintainers; [ antono jtojnar peterhoeg ];
};
});