Commit Graph

9937 Commits

Author SHA1 Message Date
Sandro
045784e3fc
Merge pull request #127106 from fzakaria/faridzakaria/jdk11-patch-library
openjdk11: remove default library path
2021-06-17 13:42:10 +02:00
github-actions[bot]
538d5cc5d0
Merge staging-next into staging 2021-06-17 00:09:51 +00:00
github-actions[bot]
51bf815af0
Merge master into staging-next 2021-06-17 00:09:48 +00:00
Sandro
71a97e076d
Merge pull request #125498 from Atemu/jetbrains-mainProgram 2021-06-17 01:45:47 +02:00
Sandro
ec9b2e2424
openjdk: update meta.homepage 2021-06-17 01:22:29 +02:00
Subhrajyoti Sen
6847861652 kotlin: 1.5.0 -> 1.5.10 2021-06-17 02:36:47 +05:30
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
Farid Zakaria
f9f5f4986b openjdk11: remove default library path
This is a follow up to #123708 which does the similar patch but for
OpenJDK11.

Please see the linked issue for more detailed rationale.
2021-06-16 09:30:24 -07:00
Atemu
9dc58496dd openjdk: correct license 2021-06-16 12:41:18 +02:00
Atemu
75d0e4645e openjdk: extract common meta
Also expands Darwin's openjdk.meta to include most attrs of Linux'
2021-06-16 12:40:34 +02:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
NANASHI0X74
af734f5a8c
dart: 2.12.2 -> 2.13.1 (#126979)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-16 03:42:30 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Emery Hemingway
84a4536e58 nim: 1.4.6 -> 1.4.8
https://nim-lang.org/blog/2021/05/25/version-148-released.html

Set a default $CC and $CXX in the Nim wrapper script, this makes
the wrapper usuable outside of build environments.
2021-06-15 10:55:34 +02:00
Sandro
c1a8f04935
Merge pull request #126725 from SuperSandro2000/cargo-no-ruby 2021-06-15 02:50:23 +02:00
Sandro
f380d32141
Merge pull request #126676 from marius851000/skytemple 2021-06-15 02:46:02 +02:00
AndersonTorres
2dfbbc0266 zig: checks are back! 2021-06-14 13:09:44 -03:00
Michael Weiss
83bf34642a
llvmPackages_git: Fix the libcxx and libcxxabi builds 2021-06-14 14:22:19 +02:00
Théo Zimmermann
2bbf6c8687
Move CompCert into coqPackages. (#126214)
* compcert: preparation to move in coqPackages

* compcert: move into coqPackages

* compcert: remove version 3.7

As a consequence, also remove VST version 2.6

These were broken.
2021-06-14 14:21:41 +02:00
github-actions[bot]
f2ba460019
Merge master into staging-next 2021-06-14 12:04:41 +00:00
Michael Weiss
542575ad48
llvmPackages_git: 2021-05-17 -> 2021-06-04
This also fixes the libunwind build (even with GCC 11 it fails with):
/build/source/libunwind/src/libunwind.cpp:19:5: warning: "__has_feature" is not defined, evaluates to 0 [-Wundef]
   19 | #if __has_feature(address_sanitizer)
      |     ^~~~~~~~~~~~~
/build/source/libunwind/src/libunwind.cpp:19:18: error: missing binary operator before token "("
   19 | #if __has_feature(address_sanitizer)
      |                  ^

And the openmp build which failed with this error:
/nix/store/a4yw1svqqk4d8lhwinn9xp847zz9gfma-bash-4.4-p23/bin/bash: CLANG_TOOL-NOTFOUND: command not found
/nix/store/a4yw1svqqk4d8lhwinn9xp847zz9gfma-bash-4.4-p23/bin/bash: CLANG_TOOL-NOTFOUND: command not found
make[2]: *** [libomptarget/deviceRTLs/amdgcn/CMakeFiles/libomptarget-amdgcn-gfx906.dir/build.make:307: libomptarget/deviceRTLs/amdgcn/task.gfx906.bc] Error 127
make[2]: *** [libomptarget/deviceRTLs/amdgcn/CMakeFiles/libomptarget-amdgcn-gfx900.dir/build.make:307: libomptarget/deviceRTLs/amdgcn/task.gfx900.bc] Error 127
2021-06-14 12:58:32 +02:00
github-actions[bot]
13f31f60bf
Merge master into staging-next 2021-06-14 00:08:48 +00:00
Michael Weiss
1a33abcaaa
Merge pull request #125698 from primeos/llvm_git
llvmPackages_git: 12.0.0 -> 2021-05-17
2021-06-13 22:05:07 +02:00
Sandro Jäckel
f3ce27d2db
rust: remove ruby from rustPlatform 2021-06-13 20:38:22 +02:00
Michael Weiss
0d02b47ddd
llvmPackages_git: 12.0.0 -> 2021-05-17
TODO: Only llvmPackages_git.stdenv builds right now, other packages
still fail. Help is welcome.
2021-06-13 16:21:27 +02:00
marius david
f5b6846c21 armips: init at 0.11.0 2021-06-13 11:31:44 +02:00
Sable Seyler
709dd2dc64
terra: delete now-unnecessary patches 2021-06-13 01:22:52 -07:00
Sable Seyler
999e5d9cdf
terra: add override for CLANG_RESOURCE_DIR 2021-06-13 01:22:37 -07:00
Sable Seyler
c4e14f4818
Merge branch 'master' of github.com:nixos/nixpkgs into terra 2021-06-13 01:10:09 -07:00
github-actions[bot]
65a7d168af
Merge master into staging-next 2021-06-12 18:04:56 +00:00
Malte Brandy
105bb9c5c3
Merge branch 'master' into haskell-updates 2021-06-12 19:28:35 +02:00
github-actions[bot]
45799b7162
Merge master into staging-next 2021-06-12 12:07:03 +00:00
Vincent Laporte
0887d7a747 ocaml-ng.ocamlPackages_4_13.ocaml: init at 4.13.0-α1 2021-06-12 09:21:31 +02:00
sternenseemann
922a444b27 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-11 21:14:29 +02:00
github-actions[bot]
69f9534853
Merge master into staging-next 2021-06-11 18:05:07 +00:00
Maximilian Bosch
2c31bc7f20
Merge pull request #125918 from chris-martin/crypto-maintainer
Removing myself from some maintainer lists
2021-06-11 19:49:38 +02:00
github-actions[bot]
dcfc502458
Merge master into staging-next 2021-06-11 00:09:47 +00:00
Michael Raskin
6c32f4e172
Merge pull request #126091 from tcmal/master
lldb: fix python lldb library
2021-06-10 20:53:55 +00:00
tcmal
674a24e5bb lldb: fix 8&9 2021-06-10 21:01:10 +01:00
Sandro
02d88b1ff1
Merge pull request #125488 from NANASHI0X74/bump-flutter-2.2
flutter 2.0.3 -> 2.2.1
2021-06-10 21:00:26 +02:00
nanashi0x74
d05d2113bb flutter: 2.0.3 -> 2.2.1 2021-06-10 20:30:03 +02:00
Sandro
49fa121284
Merge pull request #126402 from rossabaker/unison-m2g
unison-ucm: M1m -> M2g
2021-06-10 20:19:12 +02:00
github-actions[bot]
da8d931c82
Merge master into staging-next 2021-06-10 06:07:24 +00:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
github-actions[bot]
8d9549f31c
Merge master into staging-next 2021-06-10 00:06:41 +00:00
Ross A. Baker
6f1b0a7d73
unison: M1m -> M2g 2021-06-09 16:50:01 -04:00
Andreas Rammhold
cb51b41ccf
llvmPackages_git: fix variable shadowing
The first substitution was not passed to the 2nd re.sub call as seems to
be the intention of the original change.
2021-06-09 18:49:41 +02:00
tcmal
cc7740ae77 lldb: python into lib & wrap binary 2021-06-09 16:09:29 +01:00
Martin Weinelt
3da00fa467
Merge branch 'master' into staging-next 2021-06-09 14:18:55 +02:00
Alyssa Ross
77f3a9a3aa gcc: broaden platforms
Okay, GCC might not technically support _every_ platform in
platforms.unix, but I think it would be easier to subtract those as
they're discovered, if that even matters, rather than trying to
exhaustively list every Unix it does support.

(I ran into this because I wanted to build GCC for NetBSD, which it
definitely supports.)
2021-06-09 10:28:01 +00:00
Ben Siraphob
0d8332d2b9 koka: 2.1.1 -> 2.1.4 2021-06-09 12:16:11 +02:00
github-actions[bot]
f61a18a6e8
Merge master into staging-next 2021-06-09 06:09:56 +00:00
Victor Freire
06c19c70cc fsharp41: remove 2021-06-08 17:38:43 -07:00
github-actions[bot]
b61efd9db1
Merge master into staging-next 2021-06-09 00:09:07 +00:00
superherointj
e075fef89f
reason: ppxlib migration (#126066)
* reason: refactoring

* reason: add superherointj as maintainer

* reason: ppxlib migration

Migrate from ocaml-migrate-parsetree to ppxlib fixing conflicts in downstream dependencies.

* reason: add downloadPage to meta

* reason: removed maintainer volth by his request

* reason: add test hello
2021-06-08 23:20:38 +02:00
John Ericson
4f97d78936
Merge pull request #126205 from sternenseemann/ghc-linker-checks
ghc: check for targetPlatform.linker to determine if gold is available
2021-06-08 16:42:13 -04:00
sternenseemann
036eef1d1e haskell.compiler.*: use gold based on targetPlatform.linker
useLdGold previously just checked for useLLVM which (currently) implies
`linker == "lld"`. However more accurate is to check the `linker` of the
`targetPlatform` as it actually tells us which bintools package we can
expect.

`linker == "bfd"` implies that we are using the `binutils` package, so
gold is available, so we can use it unless musl is the libc. `linker ==
"gold"` implies that gold is the default linker already and we should
absolutely use it.
2021-06-08 22:17:24 +02:00
github-actions[bot]
e8f8906d68
Merge master into staging-next 2021-06-08 18:16:27 +00:00
Sandro
524dff3a2c
Merge pull request #126070 from siraben/acme-update
acme: unstable-2020-12-27 -> unstable-2021-02-14
2021-06-08 17:35:23 +02:00
tcmal
e097f7efc7 lldb: fix python lldb library
_lldb.so is now properly symlinked to the shared library.
applies to lldb 8 through 12.
fixes #125183
2021-06-08 13:36:06 +01:00
sternenseemann
118b28a127 haskell.compiler.*: pull in unwrapped bintools for darwin
GHC calls otool on darwin which is contained in the
stdenv.cc.bintools.bintools derivation and thus needs adding to the
runtime PATH of GHC. Since this is toolchain specific technically, we
check for cctools instead of darwin (although I don't know if GHC
or nixpkgs work on macOS without cctools).

This fixes usage of GHC in an environment where otool is not available
and more specifically in stdenvNoCC which is used by writers.writeHaskell.
Resolves #123228.
2021-06-08 14:20:09 +02:00
github-actions[bot]
45dbaf4c3d
Merge master into staging-next 2021-06-08 00:18:58 +00:00
Anderson Torres
fcc1f7752e
Merge pull request #126071 from siraben/cc65-darwin
cc65: fix build on darwin
2021-06-07 17:29:07 -03:00
Ben Siraphob
22ab1a4a00 cc65: enable parallel building 2021-06-07 21:13:21 +07:00
Ben Siraphob
1e1e19b6c7 cc65: fix darwin build 2021-06-07 21:10:55 +07:00
Ben Siraphob
a5afb78b95 acme: unstable-2020-12-27 -> unstable-2021-02-14 2021-06-07 21:03:01 +07:00
github-actions[bot]
6076dbb085
Merge master into staging-next 2021-06-06 12:14:32 +00:00
Robert Scott
20b3d65d34
Merge pull request #125472 from veprbl/pr/clang_12_darwin_fix
llvmPackages_12.compiler-rt: fix build on darwin
2021-06-06 11:40:58 +01:00
Chris Martin
53387621e5 remove chris-martin from maintainer list on various crypto packages 2021-06-06 02:38:34 -06:00
github-actions[bot]
47de0ebf63
Merge master into staging-next 2021-06-06 06:23:08 +00:00
Sable Seyler
0a44bbbb3d
terra: add toggle argument for CUDA support
Terra can be built with CUDA support, and this commit adds a toggle to
the arguments, `enableCUDA`, for enabling it.
2021-06-05 19:11:02 -07:00
Sable Seyler
59a07bc60f
terra: add seylerius as a maintainer 2021-06-05 19:06:46 -07:00
Sable Seyler
da04b1f00f
terra: update to use LLVM's split derivations
A patch has been added to inject environment variables into the CMake
test runner, the `INCLUDE_PATH` variable has been specified, and the
merged LLVM derivation has been updated to refer to the split outputs.
2021-06-05 19:01:51 -07:00
J. Neto
6cf3ec0947
terra: 1.0.0pre1175_ef6a75f -> 1.0.0-beta3
Contains the combined single-commit work by both @jnetod and myself
from NixOS/nixpkgs#122665. Brings the build up to LLVM 10, switches to
`symlinkJoin` for putting Clang where the CMake build expects it, and
updates to a fresh update of Terra that works around a few LLVM bugs.
2021-06-05 18:19:23 -07:00
(cdep)illabout
8f2ea9a961
purescript: add changelog 2021-06-06 09:48:12 +09:00
(cdep)illabout
d32c247083
purescript: 0.14.0 -> 0.14.2 2021-06-06 09:44:48 +09:00
github-actions[bot]
51ecdeca84
Merge master into staging-next 2021-06-06 00:15:19 +00:00
Sandro
cadb17b6ef
Merge pull request #125432 from redvers/ponyc-0.41.1
ponyc: 0.38.3 -> 0.41.1
2021-06-05 23:25:47 +02:00
Red Davies
ed22a2a78d ponyc: 0.38.3 -> 0.41.1
* Fix NullablePointer type constraint check being omitted in FFI declarations
* Change to Steed's model of subtyping
* Fix memory corruption with Array.chop and String.chop
* Improve error message for match on structs
* RFC 68: Mandatory FFI declarations
* Change return type of String.add to String iso^
* Improve error message on destructuring of non-tuple types
* Use built-in offset argument to cpointer
* Add IsPrime checker to math package
* Fix compiler crash related to type parameter references
* Fix literal inference through partial function
* Fix partial FFI declarations ignoring partial annotation
* Fix symbol table patching for overriding default methods
* Fix tuple related compiler segfaults
* Create a standalone libponyc on Linux
2021-06-05 14:39:29 -04:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next 2021-06-05 18:30:28 +00:00
Sandro
151ea58b76
Merge pull request #119054 from siraben/passerine-init
passerine: init at 0.9.2
2021-06-05 16:56:17 +02:00
Sandro
d01dd5444d
Merge pull request #109838 from noneucat/fix/ethminer 2021-06-05 16:52:34 +02:00
github-actions[bot]
68272fcebd
Merge master into staging-next 2021-06-05 12:14:47 +00:00
Michael Weiss
141b2b111d
Merge pull request #125785 from primeos/llvm-git-auto-update
llvmPackages_git: Add update-git.py
2021-06-05 13:59:52 +02:00
Michael Weiss
c330272504
llvmPackages_git: Add update-git.py
Not that pretty but it should get the job done.
2021-06-05 13:39:17 +02:00
Vincent Laporte
5ca9831cb1 ocamlPackages.menhir: 20190626 → 20210419
ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419
2021-06-05 13:38:01 +02:00
github-actions[bot]
775a491203
Merge master into staging-next 2021-06-05 00:20:33 +00:00
zowoq
88f1ca731c go: cleanup 2021-06-05 09:58:51 +10:00
zowoq
3a365e0e50 go: format with nixpkgs-fmt 2021-06-05 09:57:28 +10:00
zowoq
99697d891d go: add runHooks to bootstrap binary 2021-06-05 09:54:25 +10:00
zowoq
b3a05d2ccb go_1_16: 1.16.4 -> 1.16.5 2021-06-05 09:54:25 +10:00
zowoq
d038f95450 go_1_15: 1.15.12 -> 1.15.13 2021-06-05 09:54:25 +10:00
zowoq
51dbbde885 go_1_15: disable on aarch64-darwin
aarch64-darwin is only supported on >= 1.16
2021-06-05 09:54:25 +10:00
Anderson Torres
3255d05cac
Merge pull request #125722 from AndersonTorres/new-zig
zig: 0.7.1 -> 0.8.0
2021-06-04 20:09:29 -03:00
AndersonTorres
5971dc1aeb zig: 0.7.1 -> 0.8.0
Eliminated the check phase (file $src/test/stage1/behavior.zig not found).
2021-06-04 19:45:16 -03:00
Vincent Laporte
25964547fb compcert: 3.8 → 3.9 2021-06-04 21:43:08 +02:00
Philipp Mildenberger
4769ec74e1 shaderc: 2020.2 -> 2021.0 2021-06-04 15:22:35 +02:00
github-actions[bot]
5b9da195a0
Merge master into staging-next 2021-06-04 01:45:17 +00:00
John Ericson
67eb7b4acc
Merge pull request #120780 from primeos/llvm_git
llvmPackages_git: init at 12.0.0
2021-06-03 19:48:03 -04:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next 2021-06-03 19:52:02 +00:00
Michael Weiss
a7f062d898
llvmPackages_git: Build from Git
The version will initially remain the same so that no additional changes
to the packaging are required (i.e. this commit only includes the
required changes to build from the mono repository instead of individual
tarballs).
2021-06-03 20:33:35 +02:00
Michael Weiss
e458a01401
llvmPackages_git: Copy from llvmPackages_12
The purpose of this package is to continuously improve the LLVM
packaging in Nixpkgs without causing a lot of rebuilds and provide more
recent LLVM builds for users. For more details see:
https://github.com/NixOS/nixpkgs/issues/114828
2021-06-03 20:14:05 +02:00
Sandro
6a9a6b95c8
Merge pull request #113402 from siraben/zasm-xcompile 2021-06-03 16:58:18 +02:00
Sandro
aed59366ff
Merge pull request #125378 from nagy/purescript-mainprogram
purescript: add meta.mainProgram
2021-06-03 16:38:12 +02:00
github-actions[bot]
a12e0d5bff
Merge master into staging-next 2021-06-03 12:49:11 +00:00
Atemu
f6594d72ad jetbrains-jdk: set mainProgram 2021-06-03 14:40:19 +02:00
Atemu
e11cc89835 jetbrains-jdk: inherit license and platforms from openjdk 2021-06-03 14:40:16 +02:00
Domen Kožar
aeb44a891a
Merge pull request #125184 from domenkozar/aarch64-darwin-eval
Aarch64 darwin eval
2021-06-03 11:21:20 +02:00
Domen Kožar
9e6417f2a4
fix tarball job evaluation for aarch64-darwin 2021-06-03 10:52:46 +02:00
Dmitry Kalinkin
cf4e1b9e62
llvmPackages_12.compiler-rt: fix build on darwin
```
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:617:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:618:7: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  if (TARGET_OS_WATCH) return 13;
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:7: error: use of undeclared
      identifier 'TARGET_OS_IOS'
  if (TARGET_OS_IOS || TARGET_OS_TV)
      ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:687:24: error: use of undeclared
      identifier 'TARGET_OS_TV'
  if (TARGET_OS_IOS || TARGET_OS_TV)
                       ^
/tmp/nix-build-compiler-rt-libc-12.0.0.drv-0/compiler-rt-12.0.0.src/lib/sanitizer_common/sanitizer_mac.cpp:689:12: error: use of undeclared
      identifier 'TARGET_OS_WATCH'
  else if (TARGET_OS_WATCH)
           ^
6 errors generated.
```
2021-06-03 03:08:10 -04:00
github-actions[bot]
825cffa5ae
Merge master into staging-next 2021-06-02 20:25:05 +00:00
sternenseemann
e308370fc8 Merge remote-tracking branch 'origin/master' into haskell-updates 2021-06-02 17:07:43 +02:00
Daniel Nagy
9c14e1f92a
purescript: add meta.mainProgram 2021-06-02 15:53:11 +02:00
github-actions[bot]
1176851146
Merge master into staging-next 2021-06-02 07:51:53 +00:00
Farid Zakaria
fa44962db9 jdk8: fix sprintf patch
This fixes a recent commit via #123708
The patch itself had an additional '%s' in the sprintf which is unsafe
depending on the surrounding memory.
2021-06-01 20:14:20 -07:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next 2021-06-01 20:30:45 +00:00
Sandro
bf8430634a
Merge pull request #123708 from fzakaria/faridzakaria/nix-jdk8-library-path
jdk8: Remove default java.library.path
2021-06-01 20:25:28 +02:00
Guillaume Bouchard
81c8d158a8 ghc: add missing meta data
`haskellCompilerName` in cabal2nix and hence ghc 8.10.2 and 8.6.5
"-binary" were not working correctly in this context.
2021-06-01 12:46:55 +02:00
Andrew Childs
ccb99f68e5
(darwin) openjdk: 16.0.0 -> 16.0.1
Also adds aarch64-darwin support

(cherry picked from commit 4288adb8f66d9bb80a28f281ade07e4ca529bf31)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:47 +02:00
Andrew Childs
a5b2f798eb
(darwin) openjdk11: 11.0.9 -> 11.0.11
Also adds aarch64-darwin support

(cherry picked from commit 1b006e331cd4f9ef21c2ed81d095f2e2dd502cc0)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:26 +02:00
Andrew Childs
1629efe286
(darwin) openjdk8: 8.0.202 -> 8.0.292
Also adds aarch64-darwin support

(cherry picked from commit 00090e0fa438010344e76766aad7d8852940afa6)
Signed-off-by: Domen Kožar <domen@dev.si>
2021-06-01 09:58:11 +02:00
github-actions[bot]
65e3e9dc51
Merge master into staging-next 2021-06-01 07:50:21 +00:00
Jörg Thalheim
97098e5beb
Merge pull request #125132 from zhaofengli/rust-riscv
rust: Bootstrap riscv64
2021-06-01 06:46:18 +02:00
Zhaofeng Li
6288319a3a rust: Add support for riscv64 2021-05-31 14:55:35 -07:00
Zhaofeng Li
8f80568885 llvm{9,11}: Disable tests on RISC-V
The test suite leads to nothing but tears, sorrow, and wasted build
time. It probably should be disabled for all of them but doing only
9 (llvmPackages) and 11 (llvmPackages_latest, Rust) for now. Some of
the failures have been fixed in LLVM main:

- https://reviews.llvm.org/D97490
- https://reviews.llvm.org/D91043
2021-05-31 14:55:19 -07:00
github-actions[bot]
2867d5301f
Merge master into staging-next 2021-05-30 19:15:10 +00:00
Christian Kögler
ba677b14dd halide: Fix build 2021-05-30 14:18:57 +02:00
Ben Siraphob
766e933d9c passerine: init at 0.9.2 2021-05-29 18:42:30 +07:00
github-actions[bot]
f2a2e8f5e9
Merge master into staging-next 2021-05-28 12:48:40 +00:00
Daniël de Kok
1da0b1dbc9
Merge pull request #122158 from danieldk/import-cargo-lock
rustPlatform.buildRustPackage: support direct use of Cargo.lock
2021-05-28 12:07:25 +02:00
Daniël de Kok
b3969f3ad7 rustPlatform.buildRustPackage: support direct use of Cargo.lock
This change introduces the cargoLock argument to buildRustPackage,
which can be used in place of cargo{Sha256,Hash} or cargoVendorDir. It
uses the importCargoLock function to build the vendor
directory. Differences compared to cargo{Sha256,Hash}:

- Requires a Cargo.lock file.
- Does not require a Cargo hash.
- Retrieves all dependencies as fixed-output derivations.

This makes buildRustPackage much easier to use as part of a Rust
project, since it does not require updating cargo{Sha256,Hash} for
every change to the lock file.
2021-05-28 08:01:28 +02:00
Daniël de Kok
2f46d77e28 rustPlatform.importCargoLock: init
This function can be used to create an output path that is a cargo
vendor directory. In contrast to e.g. fetchCargoTarball all the
dependent crates are fetched using fixed-output derivations. The
hashes for the fixed-output derivations are gathered from the
Cargo.lock file.

Usage is very simple, e.g.:

importCargoLock {
  lockFile = ./Cargo.lock;
}

would use the lockfile from the current directory.

The implementation of this function is based on Eelco Dolstra's
import-cargo:

https://github.com/edolstra/import-cargo/blob/master/flake.nix

Compared to upstream:

- We use fetchgit in place of builtins.fetchGit.
- Sync to current cargo vendoring.
2021-05-28 08:01:25 +02:00
github-actions[bot]
a673990e6c
Merge master into staging-next 2021-05-25 18:43:22 +00:00
Daniël de Kok
7eddab91f5
Merge pull request #123867 from danieldk/maturin-0.10.5
maturin: 0.10.4 -> 0.10.6
2021-05-25 16:01:47 +02:00
github-actions[bot]
0615bb674f
Merge master into staging-next 2021-05-25 00:59:01 +00:00
Sandro
db2166a2d3
Merge pull request #121114 from samuela/patch-2 2021-05-25 02:30:22 +02:00
Sandro
f76f2011a8
Merge pull request #123513 from lourkeur/oraclejdk_ffmpeg 2021-05-25 02:28:32 +02:00
github-actions[bot]
141439f6f1
Merge master into staging-next 2021-05-24 18:41:50 +00:00
Patrick Hilhorst
3e91f422fd
gcc11: use maintainer team 2021-05-24 15:02:14 +02:00
Patrick Hilhorst
c913e53bdb
gcc*: use maintainer team 2021-05-24 15:01:05 +02:00
github-actions[bot]
2aa5735c09
Merge master into staging-next 2021-05-23 18:33:25 +00:00
Sandro
c069693226
Merge pull request #123441 from timothyklim/scala2_13_6 2021-05-23 17:10:05 +02:00
Daniël de Kok
11307c1d47 maturinBuildHook: add rustc to deps
maturin 0.10.5 uses rustc -vV to find the host:

e886c85f5a

We now need to make rustc visible to the hook for maturin to work
properly.
2021-05-21 07:51:27 +02:00
github-actions[bot]
0a0c0a9fb9
Merge staging-next into staging 2021-05-20 18:36:04 +00:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Robert Schütz
d2f2e638a9
openjfx11: use ffmpeg instead of ffmpeg_3 (#123500) 2021-05-19 23:35:43 +02:00
Jonathan Ringer
274a71f262 solc: make darwin friendly 2021-05-19 14:08:09 -07:00
Farid Zakaria
649f8b67ac jdk8: Remove default java.library.path
This patch fixes https://github.com/NixOS/nixpkgs/issues/103493 for JDK8
only.

I'm upstreaming only for JDK8 to get quorum on the approach and then
adding the patches to the remaining versions.

Improved JDK8 patch

Improved JDK8 patch
2021-05-19 12:36:32 -07:00
Andrew Childs
2987d66d0f llvmPackages_11.compiler-rt: fix build on x86_64-darwin
Amendment to changes in 56fcbcd154.

Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
2021-05-19 12:33:53 -07:00
github-actions[bot]
9c9882ecd9
Merge staging-next into staging 2021-05-19 18:34:13 +00:00