Commit graph

9603 commits

Author SHA1 Message Date
github-actions[bot] 12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Jan Tojnar 9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
Robert Hensing eb4372d68f
Merge pull request #122005 from sternenseemann/ghc-binary-src-urls
haskell.compiler.ghc*Binary: update source URLs
2021-05-07 11:59:14 +02:00
sternenseemann 952a2866a2 haskell.compiler.ghc*Binary: update source URLs
The tarball download URLs seem to have changed, so we adjust them in
case anyone wants to reproduce the source of ghc8102Binary and
ghc865Binary.

Tested for x86_64-linux, i686-linux, aarch64-linux, x86_64-darwin.

Resolves #121804.
2021-05-07 11:20:19 +02:00
R. RyanTM 1f5e612b48 gleam: 0.14.4 -> 0.15.0 2021-05-07 15:38:34 +09:00
Vincent Laporte b333692c87 compcert: add support for Coq 8.13 2021-05-07 08:35:13 +02:00
github-actions[bot] c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Robert Hensing 377f9ca78d elmPackages.elm-json: 0.2.7 -> 0.2.10 2021-05-06 11:21:40 +02:00
Jan Tojnar c3c368d62c
vala_0_48: 0.48.14 → 0.48.17 2021-05-05 22:42:16 +02:00
Maxine Aubrey 3411c7ee1a
vala_0_52: init at 0.52.2, make default 2021-05-05 22:42:16 +02:00
Ivan Babrou 99d0c004d1 gcc6, gcc7, gcc8, gcc9, gcc10, gcc11: do not modify code in prePatch
Doing any modifications before patching risks invalidating patch base.
2021-05-04 22:53:21 -07:00
Ivan Babrou 8cf144d139 gnat11: extract gnat-cflags-11.patch from gnat-cflags.patch 2021-05-04 20:14:01 -07:00
github-actions[bot] 4cbb35eba8
Merge staging-next into staging 2021-05-04 18:21:27 +00:00
Dmitry Kalinkin f65f1a4047
Merge pull request #121605 from regnat/fix-openjfx-with-ca
openjfx: Fix for CA derivations
2021-05-04 13:16:56 -04:00
regnat de2afd359d openjfx: Fix for CA derivations
Manipulating the store paths on the Nix side doesn’t work with CA
derivations (because these paths are just placeholders of the form
`/{hash}` at eval-time)
2021-05-03 18:01:02 +02:00
Arnout Engelen afdee7e058
Merge pull request #106737 from taku0/set_classpath
adoptopenjdk: set CLASSPATH
2021-05-03 08:51:13 +02:00
github-actions[bot] 0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
Anderson Torres 4e78613c05
Merge pull request #121424 from dotlambda/ophis-fix
ophis: fix build
2021-05-02 14:58:43 -03:00
github-actions[bot] a7e07bddd5
Merge staging-next into staging 2021-05-02 12:24:53 +00:00
239 6bffd187eb kotlin: 1.4.21 -> 1.4.32 2021-05-02 14:08:43 +02:00
Emery Hemingway c576998594 nim: 1.4.4 -> 1.4.6 2021-05-02 10:52:26 +02:00
taku0 5ec403bf3f doptopenjdk: set CLASSPATH
See: #106716.
2021-05-02 16:19:30 +09:00
Robert Schütz 92041277ce ophis: fix build 2021-05-01 21:22:32 +02:00
John Ericson 50b6631929 rustc: Fix build
Thanks @jonringer for catching, and sorry I didn't myself!
2021-04-30 23:09:15 -07:00
John Ericson 17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
github-actions[bot] d7882499f8
Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Sandro 3d078c89a7
Merge pull request #120933 from skykanin/dotty-update
dotty: 0.26.0-RC1 -> 3.0.0-RC3
2021-04-30 08:46:22 +02:00
github-actions[bot] c6548b2832
Merge staging-next into staging 2021-04-30 06:21:40 +00:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Ivan Babrou d75d0b9c62 gcc11: init at 11.0.0
Pretty much copy-pasted from gcc10 with changed version and sha256.
2021-04-29 22:05:32 -07:00
github-actions[bot] b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Sandro 75a24a5bc9
Merge pull request #121170 from samuelgrf/add-mainProgram-to-packages 2021-04-30 01:20:37 +02:00
Samuel Gräfenstein 84f214928c
oraclejdk*: add meta.mainProgram 2021-04-29 16:01:18 +02:00
Samuel Gräfenstein dd8da26322
adoptopenjdk-*: add meta.mainProgram 2021-04-29 15:48:57 +02:00
Samuel Gräfenstein 5ed648975c
openjdk*: add meta.mainProgram 2021-04-29 15:43:50 +02:00
Samuel Gräfenstein 9abf4f8758
zulu*: add meta.mainProgram 2021-04-29 15:28:57 +02:00
github-actions[bot] 54e69b71cd
Merge staging-next into staging 2021-04-29 12:26:05 +00:00
Vladimír Čunát 537d9687d1
Merge #119219: gcc10: 10.2 -> 10.3 (into staging) 2021-04-29 10:38:18 +02:00
Robert Hensing 3f98c6e86c
Merge pull request #121043 from raboof/jre_minimal-add-test
jre_minimal: add basic test
2021-04-29 09:01:11 +02:00
Jan Tojnar 76c3a6aafd
Merge branch 'staging-next' into staging 2021-04-29 02:35:54 +02:00
Arnout Engelen b21d1ae872
jre_minimal: add 2 simple tests 2021-04-28 21:01:46 +02:00
Pontus Stenetorp dd88dcee62
julia: add README
Provides a few hopefully helpful pointers that would not work well as
inline comments in the expressions themselves. Most likely the README
will need to be expanded upon over time to cover how we handle the Julia
release process, but I hope this is a good starting point.
2021-04-28 06:55:53 +00:00
Pontus Stenetorp e633d97cb3
julia: remove julia_15 update script
Provides very little comfort compared what is outlined in the
manual [1], only supports a single version, and would probably be better
to implement as a general Nixpkg tool.

[1]: https://nixos.org/manual/nixpkgs/stable/#sec-source-hashes
2021-04-28 06:55:52 +00:00
Pontus Stenetorp 75a93dfecc
julia: move patches into separate directories
Makes the top-level directory organisation easier with an increasing
number of patches.
2021-04-28 06:55:52 +00:00
Pontus Stenetorp 5926635765
julia: remove redundant diagonal test patch
Fix merged upstream and backported to Julia 1.0.5:

    https://github.com/JuliaLang/julia/pull/31443
2021-04-28 06:55:52 +00:00
Pontus Stenetorp 4c97cf823f
julia: remove redundant Nix-specific mtime patch
As far as I can tell this patch is redundant as all pre-compiled code
generated at build time is baked into the Julia system image and will
thus never get invalidated: Note that for both julia_10 and julia_15
there are no `.ji` files produced in the derivations.
2021-04-28 06:55:52 +00:00
Pontus Stenetorp a4f2b97a24
julia: enable parallel building
Erroneously disabled by 3ae5e6ce03 as it
mistook Julia for using CMake (it is used by some of the vendored
dependencies).
2021-04-28 06:55:51 +00:00
Pontus Stenetorp a0b0f99458
julia: drop julia_13 as it lacks support upstream
Closes #82008.
2021-04-28 06:55:47 +00:00
skykanin b0f0e1d175 dotty: 0.26.0-RC1 -> 3.0.0-RC3 2021-04-27 22:26:25 +02:00
github-actions[bot] c01456266d
Merge staging-next into staging 2021-04-27 12:07:01 +00:00
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