Commit graph

9710 commits

Author SHA1 Message Date
Sandro aed59366ff
Merge pull request #125378 from nagy/purescript-mainprogram
purescript: add meta.mainProgram
2021-06-03 16:38:12 +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
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
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
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
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
Christian Kögler ba677b14dd halide: Fix build 2021-05-30 14:18:57 +02: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
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
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
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
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
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
Jonathan Ringer c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Dennis Gosnell b76684aff7
Merge pull request #122719 from NixOS/haskell-updates
haskell: update package set
2021-05-19 10:52:35 +09:00
(cdep)illabout 721c8ab307
haskell.compiler.ghcHEAD: disable Hydra build on aarch64-linux 2021-05-19 10:30:23 +09:00
github-actions[bot] 7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
Stéphan Kochen e726f8034f cc65: fix darwin build 2021-05-18 18:56:00 +02:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Louis Bettens 50cb5bc35c oraclejdk*: use latest ffmpeg 2021-05-18 15:03:45 +02:00
Samuel Ainsworth 1e7f3bf0be julia_15: add comment clarifying broken-ness 2021-05-18 01:01:34 -07:00
Samuel Ainsworth 9ab3e892fe julia_15: run test suite and mark as broken
Fixes https://github.com/NixOS/nixpkgs/issues/121101.
2021-05-18 01:00:59 -07:00
Pontus Stenetorp 61b8bf948e
julia: mark julia_10-bin as insecure 2021-05-18 07:37:24 +00:00
Timothy Klim a98f5738d2 scala_2_13: 2.13.5 → 2.13.6
dotty: 3.0.0-RC3 → 3.0.0
2021-05-18 09:43:12 +07:00
John Ericson 6ad0e5cab2
Merge pull request #123419 from sternenseemann/gcc-native-cross
gcc*: force building a cross compiler if host and target platform differ
2021-05-17 16:05:03 -07:00
sternenseemann 2d176b593b gcc*: force building a cross compiler if host and target platform differ
gcc's configure system has the nasty habit (for us) of judging for
itself if it is building a cross compiler (or cross compiling), but on
the limited information of the build, host and target platforms' config
which only contains a subset of the information we encode in
`stdenv.*Platform`. The practical consequence was that prior to this
change building `pkgsLLVM.buildPackages.gcc` actually fails because it
refuses to use `--with-headers` with something it believes to not be a
cross compiler.

As a workaround we force the appropriate variable in the configure
script to always be `yes` regardless of its own conditional check.

At some point we probably should report this issue in some capacity, so
future gcc versions don't force us into workarounds like this and
acdc783418.
2021-05-18 00:16:54 +02:00
Sandro cf6be149b8
Merge pull request #123116 from SubhrajyotiSen/kotlin-1.5
kotlin: 1.4.32 -> 1.5.0
2021-05-17 19:11:05 +02:00
sternenseemann f90244c970 haskell.compiler.ghcHEAD: disable DWARF on non x86
The broken build of ghcHEAD on aarch64-linux results from rts/Libdw.c
not supporting that platform. Seemingly this particular file is only
relevant for DWARF support in GHC, so we disable that on unsupported
platforms.
2021-05-17 17:22:47 +02:00
Jonathan Ringer c227fb4b17
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
2021-05-17 07:01:38 -07:00
Michael Raskin 183350a3e1
Merge pull request #123188 from ninjin/julia-bin
julia: init julia_10-bin and julia_16-bin
2021-05-17 11:55:37 +00:00
github-actions[bot] 3ff6965554
Merge master into staging-next 2021-05-17 06:22:23 +00:00
Lorenzo Manacorda e906410c9a solc: remove 0.7 release
They're failing on Hydra, the workload to keep them working is not worth it.
2021-05-16 22:44:21 -07:00
Ben Siraphob 682578af42 openjdk: move unzip to nativeBuildInputs 2021-05-16 19:29:28 -07:00