Commit Graph

9539 Commits

Author SHA1 Message Date
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
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