Commit graph

9603 commits

Author SHA1 Message Date
Vincent Laporte ab51ade9a3 haxe: build versions < 4.2 with OCaml 4.10 2021-04-27 08:42:50 +02:00
Arnout Engelen 48c952c039
Merge pull request #112928 from baloo/baloo/gcc/reproducible
stdenv: provide a deterministically built gcc
2021-04-26 11:07:34 +02:00
github-actions[bot] 1626c4772a
Merge staging-next into staging 2021-04-25 12:06:12 +00:00
Frederik Rietdijk c648f7ee2a Merge master into staging-next 2021-04-25 13:54:29 +02:00
sternenseemann 4a67076273 koka: make sure runtime dependencies are host -> target
buildPackages.stdenv.cc.cc is a C compiler that runs on the build
platform and produces binaries for the host platform. This is not
what we want. Also pkgsHostTarget.stdenv.cc is not the compiler we
want as stdenv always runs on the previous stage so to say (the stdenv
is used to build the package set, in the case of cross compiling
this is not done natively). Thus pkgsHostTarget.targetPackages.stdenv.cc
is what we want.
2021-04-25 12:36:06 +02:00
Jan Tojnar c1f851b2ee
Merge branch 'staging-next' into staging 2021-04-25 08:22:13 +02:00
Jan Tojnar 0f1c4558d3
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Michael Weiss e4f8498c0b
llvmPackages_12: Create subdirectories for the last two packages
For consistency. Now all packages will have their own subdirectory
(continuation of 781e69d19c).
2021-04-24 11:43:29 +02:00
Michael Weiss a902d99422
llvmPackages_12: Always use the attribute name for pname
This might be a bit debatable but upstream uses "xx" instead of "++"
when using it as identifier / in the code (file/directory names, build
scripts, website URLs, etc.) so we should probably too.
And at least the attribute name and pname will be consistent now.
2021-04-24 11:43:29 +02:00
github-actions[bot] 944e32775d
Merge staging-next into staging 2021-04-24 00:16:20 +00:00
Alyssa Ross 4f4d95bbc2
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyvex/default.nix
	pkgs/top-level/python-packages.nix
2021-04-23 13:49:12 +00:00
Valentin Lorentz 92c77733ac mrustc: init at 0.9
mrustc is mostly patched to use shared LLVM sources but still uses
in-tree source for compiler-rt from LLVM 7. This needs to be patched to
compile under glibc 2.31 or later. It's easy enough to reapply all our
compiler-rt patches here.
2021-04-23 10:19:37 +00:00
github-actions[bot] 0d97d9f23b
Merge staging-next into staging 2021-04-23 00:15:42 +00:00
github-actions[bot] 481a9bc47c
Merge master into staging-next 2021-04-23 00:15:39 +00:00
Robert Hensing fb45a00d63
Merge pull request #115523 from raboof/jre_minimal-strip-library
jre_minimal: strip libraries
2021-04-22 21:34:25 +02:00
github-actions[bot] cdece2032d
Merge staging-next into staging 2021-04-22 18:14:30 +00:00
github-actions[bot] b95da5efb6
Merge master into staging-next 2021-04-22 18:14:27 +00:00
Alyssa Ross 407e448114 gcc8,gcc9: fix ctypes on NetBSD
This patch was applied to gcc7 in aab8c7ba43 ("netbsd: add cross target"),
but it hasn't been brought forward to newer compilers that have the
same problem.

GCC 6 and (probably) GCC 4.9 also have the issue, but the patch
doesn't apply cleanly to them so I'm leaving them alone for now.

GCC 10, our current default, appears to have finally fixed this.
2021-04-22 12:23:55 +00:00
github-actions[bot] 6faea022df
Merge staging-next into staging 2021-04-21 00:15:23 +00:00
github-actions[bot] 99c7bab106
Merge master into staging-next 2021-04-21 00:15:20 +00:00
OPNA2608 14b5ddf085 haxe_4_1,haxe_4_2: fix build on Darwin 2021-04-20 23:22:20 +02:00
github-actions[bot] ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00:00
github-actions[bot] 6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Alyssa Ross 7eb3d024ae
gcc: don't build libssp on NetBSD
On NetBSD, this is provided by libc, and the GCC version clashes with it.
Disabling it matches the behaviour of pkgsrc on NetBSD.

Fixes: https://github.com/NixOS/nixpkgs/issues/119839
2021-04-19 14:11:05 +00:00
sternenseemann 56ba373d16 haxe_4_0: init at 4.0.5 2021-04-19 14:42:42 +02:00
sternenseemann a77870adf6 haxe_4_1: init at 4.1.5 2021-04-19 14:42:42 +02:00
github-actions[bot] 96df3c3794
Merge staging-next into staging 2021-04-19 12:06:26 +00:00
github-actions[bot] 965c8e08a5
Merge master into staging-next 2021-04-19 12:06:23 +00:00
Daniël de Kok cf00ef6548
Merge pull request #119783 from danieldk/remove-cuda-9
cudatoolkit-{9,9_0,9_1,9_2}: remove
2021-04-19 08:30:10 +02:00
github-actions[bot] c577e0ee09
Merge staging-next into staging 2021-04-19 00:15:24 +00:00
github-actions[bot] a28d31ed86
Merge master into staging-next 2021-04-19 00:15:22 +00:00
Robert Scott 90725c7c6d
Merge pull request #119701 from Stekke/sdcc
sdcc: 4.0.0 -> 4.1.0
2021-04-18 20:18:31 +01:00
github-actions[bot] 2095c2cd0d
Merge staging-next into staging 2021-04-18 12:06:03 +00:00
github-actions[bot] 9e804db1da
Merge master into staging-next 2021-04-18 12:06:01 +00:00
Daniël de Kok f75286e063 cudatoolkit-{9,9_0,9_1,9_2}: remove
Remove old CUDA toolkits (and corresponding CuDNN versions).

- Not supported by upstream anymore.
- We do not use them in nixpkgs.
- We do not test or actively maintain them.
- Anything but ancient GPUs is supported by newer toolkits.

Fixes #107131.
2021-04-18 11:55:10 +02:00
Bjørn Forsman c6df94ce56 sdcc: use nativeBuildInputs
Ref https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/build-tools-in-build-inputs.md
2021-04-18 10:32:43 +02:00
Bjørn Forsman 73fdc55b4f sdcc: clarify license
Ref https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/unclear-gpl.md
2021-04-18 10:32:43 +02:00
John Ericson 3af7e98470 llvmPackages_7.libcxxabi: Fix Darwin bootstrap
In 486e12ad68 cmake flags were added matching
later compilers use of libunwind for `useLLVM = true`. Unfortunately, `useLLVM`
on Darwin was not something tested before, and so the other compilers led us
astray: one of the new flags tried to make libunwind be used when it wasn't a
dep.

This is now fixed with more conditional code, but I hope things can perhaps be
made simpler with more insight into why libunwind is skipped. Perhaps it is
included in libSystem?

Finally, I moved the definition of `cmakeFlags` to match the order in the other
llvm versions.

CC @sternenseemann and @thefloweringash
2021-04-18 00:24:03 -04:00
github-actions[bot] da0e7f5fab
Merge staging-next into staging 2021-04-18 00:15:39 +00:00
github-actions[bot] 0ef3d3e462
Merge master into staging-next 2021-04-18 00:15:36 +00:00
John Ericson d4d49c1066
Merge pull request #119717 from sternenseemann/libunwind-7.1.0
Make cross stdenv with llvmPackages_7 and useLLVM work again
2021-04-17 19:59:19 -04:00
Austin Seipp e9254e10bc
Merge pull request #101423 from wamserma/ghdl-llvm
ghdl: fix llvm backend, add passthru.tests
2021-04-17 15:20:29 -05:00
github-actions[bot] 33182b194a
Merge staging-next into staging 2021-04-17 18:10:41 +00:00
github-actions[bot] 8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
sternenseemann 49ff6509a2 llvmPackages_7.clang: backport patch introducing --unwindlib flag
This flag was introduced for clang 9, but we use it in the `lldClang`
wrapper for `llvmPackages` 7, 8 and 9. For this purpose the patch was
backported for `llvmPackages_8.clang`, but not for `llvmPackages_7.clang`
which has been done in this commit.

`lldClang` is mostly used when cross compiling and
`stdenv.hostPlatform.useLLVM` is true. Most likely this problem wasn't
noticed since `useLLVM` with `llvmPackages_7` was broken for other
reasons as well and all cross targets (like `wasi32`) which have
`useLLVM` at the moment use `llvmPackages_8`.

With this change tests.cross.llvm.hello.{musl64, …} works again.
2021-04-17 18:08:04 +02:00
sternenseemann 55a476b00b llvmPackages_7.libcxx: make sure to use compiler-rt if useLLVM
This reflects what the other llvmPackages sets are doing.
2021-04-17 18:08:04 +02:00
sternenseemann 486e12ad68 llvmPackages_7.libcxxabi: take libunwind as an optional dependency again
This reverts commit 76b54c75b3 and brings
llvmPackages_7.libcxxabi in line with what the other llvmPackages
sets are doing again (with llvmPackages_7 being the sole outlier).

This also fixes an evaluation error of llvmPackages_7.libcxxabi if
stdenv.hostPlatform.useLLVM is true as the nonexistant libunwind
argument would be overridden.
2021-04-17 18:08:00 +02:00
sternenseemann be4eb91b3c llvmPackages_7.libunwind: init at 7.1.0 2021-04-17 18:07:12 +02:00
Pavol Rusnak 29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
Stijn DW 65bb97ee72 sdcc: 4.0.0 -> 4.1.0 2021-04-17 14:00:52 +02:00
Luke Granger-Brown 9aa8ae999a llvmPackages_12.llvm: fix building on older CPUs
This commit patches one of the llvm-exegesis tests to swap out whatever
CPU model happens to be on the build host for bdver2 (AMD Family
15h/Piledriver), which was picked because it looks like that was the
intent of the test author. This provides a more predictable compilation
behaviour when running on older (or possibly even newer!) machines.

One of the machines that is currently part of the NixOS Hydra build
farm, wendy, is using an old AMD Opteron CPU for which LLVM has no
scheduling machine model. This causes one of the tests for llvm-exegesis
to fail, because it segfaults trying to use the machine model to produce
useful analysis results.

Note that this particular test only runs on x86-64 build hosts anyway;
aarch64 isn't affected.

This deliberately only patches LLVM 12 to limit the rebuilds; other
LLVM versions are going through staging.
2021-04-17 01:55:53 +00:00
github-actions[bot] f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
sternenseemann acdc783418 gcc*: always force --program-prefix and pass --target
Don't rely on gcc detecting from the passed platforms which prefix to
use, but always specify the prefix nixpkgs expects (or doesn't). This
allows us to work around problems where the configure script would add
prefix where nixpkgs doesn't expect one (if `--target` was specified,
but the same as `--host`) or doesn't add one if nixpkgs expects one (if
`--target` and `--host` are the same, but we are actually cross
compiling, but the relevant parts of the platform are not encoded into
the platform config.

See also ca9be0511b.
2021-04-16 22:54:05 +02:00
Maxine Aubrey 0f1e22421e go_1_16: 1.16.2 -> 1.16.3 2021-04-17 06:11:56 +10:00
Sandro f93a4f2add
Merge pull request #119456 from oxalica/bump/dotnet-sdk-5-0 2021-04-16 21:40:20 +02:00
JonathanILevi b623794aba
dmd: mark unbroken (#119647)
It is building fine locally, tested by myself and @SuperSandro2000 (who had added the broken tag).

Should this be tested on hydra before removing it?  I don't know if that is even possible.
2021-04-16 21:33:08 +02:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
Sandro 3783fb8475
Merge pull request #116826 from OPNA2608/update/libsidplayfp-2.1.1/21.05 2021-04-15 23:57:58 +02:00
Milan Pässler 893972affb jdk: update darwin to 16 as well 2021-04-15 23:12:11 +02:00
Milan Pässler 9dde9d8b9e jdk: 15.0.1-ga -> 16+36 2021-04-15 23:12:11 +02:00
github-actions[bot] dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Michael Weiss 28887e7fe5
llvmPackages_12: Improve and extend the meta attributes 2021-04-15 18:41:38 +02:00
Michael Weiss 2c2e8662b9
llvmPackages_12: 12.0.0-rc5 -> 12.0.0
Release notes: https://releases.llvm.org/12.0.0/docs/ReleaseNotes.html
2021-04-15 16:31:32 +02:00
Michael Weiss 978fa19ae2
Merge pull request #119528 from sternenseemann/llvmPackages_12-reorganize-files
llvmPackages_12: reorganize files
2021-04-15 16:25:17 +02:00
github-actions[bot] 9c190d28df
Merge master into staging-next 2021-04-15 12:06:13 +00:00
oxalica 1d2ea5bceb
roslyn: regenerate deps 2021-04-15 19:44:38 +08:00
oxalica bfe4151219
dotnetCorePackages.sdk_5_0: 5.0.200 -> 5.0.202
This fix NuGet issue https://github.com/NuGet/Home/issues/10491
2021-04-15 19:44:38 +08:00
sternenseemann 081b9423d4 llvmPackages*: fix paths to libcxx-0001-musl-hacks.patch
This patches are included from libcxx and libcxxabi when
stdenv.hostPlatform.isMusl. After #117433 the patchs to that patch
wasn't adjusted for the new structure, likely because it doesn't come up
during normal eval. This fixes (among other attribute paths):

* pkgsMusl.llvmPackages_12.libcxxabi
* pkgsMusl.llvmPackages_12.libcxx
* pkgsMusl.llvmPackages_11.libcxxabi
* pkgsMusl.llvmPackages_11.libcxx
* pkgsMusl.llvmPackages_10.libcxxabi
* pkgsMusl.llvmPackages_10.libcxx
* pkgsMusl.llvmPackages_9.libcxxabi
* pkgsMusl.llvmPackages_9.libcxx
* pkgsMusl.llvmPackages_8.libcxxabi
* pkgsMusl.llvmPackages_8.libcxx
* pkgsMusl.llvmPackages_7.libcxxabi
* pkgsMusl.llvmPackages_7.libcxx
* pkgsMusl.llvmPackages_6.libcxxabi
* pkgsMusl.llvmPackages_6.libcxx
* pkgsMusl.llvmPackages_5.libcxxabi
* pkgsMusl.llvmPackages_5.libcxx

Only evaluation was tested, not compilation though.
2021-04-15 13:24:04 +02:00
sternenseemann 781e69d19c llvmPackages_12: reorganize files
Restructure pkgs/development/compilers/llvm/12 in a similar spirit
as #117433 to mirror the other llvm directories.
2021-04-15 12:44:05 +02:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Rien Maertens 78927e608f jetbrains.jdk: 11.0.10-b37 -> 11.0.10-b1427 2021-04-14 21:54:58 +02:00
OPNA2608 f6519a5191 dxa: add fallback download url 2021-04-14 07:45:10 +02:00
OPNA2608 2cedaac1cb xa: add fallback download url, fix substitution, enable tests 2021-04-14 07:45:10 +02:00
Tyson Whitehead 9f7fb75168
llvm_11: Correct path for TLI-musl patch 2021-04-14 00:29:29 -04:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Sandro 2be7176ab3
Merge pull request #107977 from corngood/msbuild 2021-04-12 20:09:16 +02:00
Martin Weinelt 28626eb553
Merge pull request #117996 from mweinelt/edk2
edk2: 202011 -> 202102
2021-04-12 13:52:17 +02:00
Tobias Mayer d09936ea84
gcc10: 10.2 -> 10.3 2021-04-12 12:22:31 +02:00
Roman Volosatovs 7f35119b94 go_2-dev: 2020-12-08 -> 2021-03-22 2021-04-12 18:48:50 +10:00
Sandro 36d6015eed
Merge pull request #116576 from wunderbrick/juniper 2021-04-12 02:26:00 +02:00
wunderbrick ddb3399c3a juniper: init at 2.3.0 2021-04-11 14:51:54 -04:00
R. RyanTM f549f4c86d ciao: 1.19.0 -> 1.20.0 2021-04-10 06:44:18 +00:00
Finn Behrens 30e6c07310 rustc: reenable aarch64-darwin for 1.51.0 2021-04-09 13:53:51 +02:00
github-actions[bot] c99b6f5343
Merge master into staging-next 2021-04-09 00:16:01 +00:00
tnias 01cf5e4d68
dtc: add yaml support and enable tests (#118700) 2021-04-09 02:02:36 +02:00
Edward Tjörnhammar af45b82a37
jetbrains.jdk: 11.0.7-b64 -> 11.0.10-b37 2021-04-09 00:47:31 +02:00
github-actions[bot] 85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Michael Weiss 2b95bf44b8
llvmPackages_12: 12.0.0-rc4 -> 12.0.0-rc5
Note: Tested in #116646.
2021-04-08 16:12:48 +02:00
github-actions[bot] bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
kraem 004584d3b6
go_1_15: 1.15.10 -> 1.15.11 2021-04-08 10:00:47 +02:00
github-actions[bot] 8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
Vincent Laporte e66af6a67e reason: 3.6.2 → 3.7.0 2021-04-07 20:34:26 +02:00
Jan Tojnar c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Sandro be0b9616ca
Merge pull request #116671 from electrified/sjasmplus-1.18.2 2021-04-06 01:07:42 +02:00
Sandro 5d2f7bcfe2
Merge pull request #118418 from erictapen/ispc-1.15.0
ispc: 1.13.0 -> unstable-2021-04-02
2021-04-05 18:32:11 +02:00
Sandro Jäckel 3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
github-actions[bot] 3bf92ca4db
Merge master into staging-next 2021-04-03 18:18:51 +00:00
Justin Humm 92e64428d1 ispc: 1.13.0 -> unstable-2021-04-02 2021-04-03 19:44:36 +02:00
Frederik Rietdijk 94fa194b9f
Merge pull request #117593 from FRidh/python2alias
Python: be explicit on whether it is python2 or python3 that is used
2021-04-03 18:01:09 +02:00
Frederik Rietdijk 8527e634c3 intel-graphics-compiler: use python3 2021-04-03 17:06:10 +02:00
Austin Seipp 24ad481a61
bluespec: unstable-2021.02.14 -> 2021.03.29
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-04-03 09:58:05 -05:00
github-actions[bot] 74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Raphael Megzari 85b9527301
gleam: 0.14.3 -> 0.14.4 (#118120)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-02 21:13:02 +02:00
github-actions[bot] b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Michael Weiss a960fead6e
llvmPackages_12: 12.0.0-rc3 -> 12.0.0-rc4 2021-04-02 14:35:23 +02:00
oxalica 354d262db8
lib.meta: introduce availableOn 2021-04-02 19:20:23 +08:00
Arthur Gautier 6f73a8570c rust: 1.50.0 -> 1.51.0
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-04-02 06:03:40 +10:00
github-actions[bot] 78b864aeee
Merge staging-next into staging 2021-04-01 18:15:42 +00:00
Michael Weiss cc12a82cf2
llvmPackages_12: Fix libunwind, openmp, libcxx, and libcxxabi
All builds succeed now: nix-build -A llvmPackages_12
2021-04-01 20:08:20 +02:00
Daniel Nagy b5d78dbc52
ecl: add changelog 2021-04-01 17:59:49 +02:00
github-actions[bot] 85e9b4acf4
Merge staging-next into staging 2021-04-01 12:06:32 +00:00
Sandro 356e52c844
Merge pull request #117116 from kolaente/update/flutter 2021-04-01 13:48:07 +02:00
Michael Weiss 493131d70b
llvmPackages: Add an update script
This is based on a combination of Gabor Greif's update script [0] and my
script to verify the hashes [1]. It's a bit hacky / unconventional but
it should be very useful and worked fine so far (but it might require
changes for some edge-cases).

[0]: https://github.com/NixOS/nixpkgs/issues/100725#issuecomment-710055349
[1]: https://github.com/NixOS/nixpkgs/issues/100725#issuecomment-781323979
2021-04-01 13:31:48 +02:00
Gabor Greif 7c27d49815
llvmPackages_12: init at 12.0.0-rc3
https://lists.llvm.org/pipermail/release-testers/2021-March/001496.html
2021-04-01 12:32:19 +02:00
Michael Weiss 2fd9e41719
llvmPackages_12: Copy from llvmPackages_11 2021-04-01 12:32:18 +02:00
github-actions[bot] ebc5b12a40
Merge staging-next into staging 2021-04-01 06:05:50 +00:00
Peter Hoeg 34b5e46f73 mint: 0.9.0 -> 0.11.0 2021-04-01 11:12:47 +08:00
Peter Hoeg befefe6f3f crystal: init at 1.0.0 2021-04-01 11:12:47 +08:00
github-actions[bot] b152812791
Merge staging-next into staging 2021-04-01 00:15:44 +00:00
Pavol Rusnak cfe4e1c3db
yosys: 0.9+3962 -> 0.9+4052 2021-03-31 23:11:34 +02:00
github-actions[bot] d466353dd5
Merge staging-next into staging 2021-03-30 12:06:28 +00:00
github-actions[bot] c9e9ff786b
Merge master into staging-next 2021-03-30 12:06:24 +00:00
Ben Siraphob 11027de7ae koka: init at 2.1.1 2021-03-30 12:28:57 +02:00
Martin Weinelt c8ac1ce19e
edk2: 202011 -> 202102
Fixes: CVE-2021-28210, CVE-2021-28211
2021-03-30 02:20:31 +02:00
github-actions[bot] 884cf463fd
Merge staging-next into staging 2021-03-29 12:06:29 +00:00
github-actions[bot] b1788736fd
Merge master into staging-next 2021-03-29 12:06:25 +00:00
Peter Hoeg 3f358d4574 crystal2nix: 0.1.0 -> 0.1.1 2021-03-29 18:12:25 +08:00
github-actions[bot] f311dede4c
Merge staging-next into staging 2021-03-29 00:15:53 +00:00
github-actions[bot] b9456ca263
Merge master into staging-next 2021-03-28 18:14:11 +00:00
Michael Raskin b722e3ff4c
Merge pull request #117892 from 7c6f434c/quicklisp-updates
quicklispPackages: update, sbcl: 2.0.8 -> 2.1.2, and related stuff
2021-03-28 17:01:57 +00:00
Michael Raskin b4d085cb9a sbcl: init 2.1.2, default 2.0.8 -> 2.1.2 2021-03-28 16:41:53 +02:00
github-actions[bot] cbd2c726fb
Merge staging-next into staging 2021-03-28 12:06:24 +00:00
github-actions[bot] 25268aeaf7
Merge master into staging-next 2021-03-28 12:06:21 +00:00
Ben Siraphob 6a2a2d6503 julia: use system blas only when not darwin 2021-03-28 17:46:05 +07:00
github-actions[bot] 2ed7687b19
Merge staging-next into staging 2021-03-28 00:15:43 +00:00
github-actions[bot] 732dc6ef8f
Merge master into staging-next 2021-03-28 00:15:41 +00:00
sternenseemann a3f74559cf llvmPackages_6.llvm-manpages: unbreak
enableSharedLibraries defaulted to true which caused a phase to
try to use the $lib output which doesn't exist for the llvm-manpages
derivation.
2021-03-27 22:40:44 +01:00
John Ericson 8179fdc3d1
Merge pull request #117660 from Ericson2314/organize-llvm
llvmPackages_*.libunwind: Move into own directory
2021-03-26 10:25:23 -04:00
github-actions[bot] 219312a10b
Merge staging-next into staging 2021-03-26 12:06:44 +00:00
github-actions[bot] eddd1a74ec
Merge master into staging-next 2021-03-26 12:06:41 +00:00
Michael Raskin 36f2c10ca5
Merge pull request #117240 from eraserhd/fix-gambit-compiler-paths
gambit: fix compiler paths
2021-03-26 12:04:04 +00:00
Emery Hemingway 56592ea293 nim: cross-compilation fixes
* Import with callPackages
* Use buildPackages for building a cross-compiler
* Patch-out potential conflicts in nim.cfg
* Generate a configuration with toolchain detection
* Build with strictDeps enabled
2021-03-26 11:36:38 +01:00
Jan Tojnar b3c854b60b
Merge branch 'staging-next' into staging 2021-03-26 07:53:44 +01:00
github-actions[bot] 26fdaef6b2
Merge master into staging-next 2021-03-26 06:05:54 +00:00
John Ericson 0ae1182489 llvmPackages_*.libunwind: Move into own directory
I expect to soon give it some patches that would go in there too, but
either way it's good to match the others.
2021-03-26 05:06:15 +00:00
taku0 44ccf965bd
Merge pull request #116781 from cust0dian/adoptopenjdk-16
adoptopenjdk-bin: add 16.0.0
2021-03-26 10:34:23 +09:00
github-actions[bot] b068d2e437
Merge master into staging-next 2021-03-26 00:15:53 +00:00
sternenseemann 91b91ebe40 haxe*: set licenses according to upstream opam file
Upstream specifies MIT and GPL2+ in its opam file, so we run with this.
There doesn't seem to have been any license change and I couldn't track
down the mentioned docs/license.txt.
2021-03-25 22:11:00 +01:00
sternenseemann f8544f96f1 neko: try to list applying licenses more accurately
As a side note: This change shows why `with` can be dangerous business:
It doesn't shadow any existing bindings which can be unexpected. If I
were to use with licenses; [ … ] here, zlib in the with block would
actually be the zlib passed via the function arguments instead of the
zlib from licenses which would be expected. This was what caused the
previous eval error.
2021-03-25 22:11:00 +01:00