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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt
2021-04-15 01:01:26 +02:00
committed by GitHub
parent eb8e023674 85cf6bed94
commit 7cf67850c0
60 changed files with 979 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/jetbrains-jdk/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
openjdk11.overrideAttrs (oldAttrs: rec {
pname = "jetbrains-jdk";
version = "11.0.10-b37";
version = "11.0.10-b1427";
src = fetchFromGitHub {
owner = "JetBrains";
repo = "JetBrainsRuntime";
rev = "jb${lib.replaceStrings ["."] ["_"] version}";
sha256 = "0bcvwnwi29z000b1bk5dhfkd33xfp9899zc3idzifdwl7q42zi02";
sha256 = "sha256-2cn+FiFfGpp7CBeQMAASVZwTm6DOFaXaWxAL/nVC2Nk=";
};
patches = [];
meta = with lib; {
pkgs/development/compilers/llvm/11/llvm/default.nix
+1 -1
View File
@@ -70,7 +70,7 @@ in stdenv.mkDerivation (rec {
--replace "Path.cpp" ""
rm unittests/Support/Path.cpp
'' + optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${../TLI-musl.patch}
patch -p1 -i ${../../TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp