3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

9695 commits

Author SHA1 Message Date
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
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
Jonathan Ringer d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro 700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Stéphan Kochen 9716355b45 inform6: fix darwin build 2021-05-16 14:31:43 -07:00
Elliot Cameron 08ab7e10f3 go_2-dev: 2021-03-22 -> 2021-04-13 2021-05-17 06:15:35 +10:00
sternenseemann 9e5896496c Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 21:39:44 +02:00
Andrew Childs 56fcbcd154 llvmPackages_11: darwin cross compilation and bootstrapping 2021-05-17 00:28:05 +09:00
Finn Behrens 417a96c8be sbcl: update to 2.1.2 and add arm64-darwin
(cherry picked from commit 49d2ad093ecd54f40550745f240dda8dbf0ce920)
2021-05-17 00:28:04 +09:00
Andrew Childs c99904e113 clang_11: revert -fno-common default 2021-05-17 00:27:02 +09:00
Pontus Stenetorp 8949ae188a
julia: init julia_10-bin at 1.0.5
Almost as clean as it could be, but was forced to set `LD_LIBRARY_PATH`
to work around a `Libdl` failure that is unique to v1.0.x.
2021-05-16 14:12:37 +00:00
Pontus Stenetorp 351f9114b0
julia: init julia_16-bin at 1.6.1
Relevant patches lifted from the `release-1.6` branch of my Julia fork:

    https://git.sr.ht/~ninjin/julia-nix/tree/release-1.6
2021-05-16 14:12:36 +00:00
(cdep)illabout f75fe9394f
Merge remote-tracking branch 'origin/master' into haskell-updates 2021-05-16 16:56:34 +09:00
(cdep)illabout d1de348fdc
haskell.compiler.ghcHEAD: mark broken on aarch64 2021-05-16 16:52:08 +09:00
github-actions[bot] 5c18268a6b
Merge staging-next into staging 2021-05-16 06:22:08 +00:00
github-actions[bot] d6fe7f78a8
Merge master into staging-next 2021-05-16 06:22:05 +00:00
Jörg Thalheim 3280de8b8c
Merge pull request #123125 from lopsided98/rustc-armv5tel
rustc: allowing building for ARMv5
2021-05-16 04:48:16 +01:00