3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4758 commits

Author SHA1 Message Date
Alyssa Ross b898e958da
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/os-specific/linux/libfabric/default.nix
	pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00
Jörg Thalheim 57e69a608a
Merge pull request #109636 from mroi/patch-vmtools
vmTools: fix cross compilation
2021-09-22 00:51:22 +01:00
github-actions[bot] 611b805c53
Merge master into staging-next 2021-09-21 18:01:16 +00:00
Bruno Bigras c426b46aee defaultCrateOverrides: add rdkafka-sys 2021-09-21 12:07:25 -04:00
Robert Hensing 1648346444
Merge pull request #136022 from hercules-ci/fetcher-testing
Fetcher testing
2021-09-21 14:50:28 +02:00
github-actions[bot] ecf5e75910
Merge master into staging-next 2021-09-20 18:01:12 +00:00
Daniël de Kok 24b5074348
Merge pull request #137395 from dermetfan/cargo-lock-restricted
importCargoLock: introduce alternative parameter `lockFileContents`
2021-09-20 18:05:08 +02:00
Robin Stumm d3018c4522 importCargoLock: introduce alternative parameter lockFileContents
In restricted mode (and therefore with flakes) `builtins.readFile` may not be the result of `builtins.toFile`,
making it impossible to use a generated lockFile (with or without IFD),
and thereby causing evaluation to fail if `system != builtins.currentSystem` on Hydra
so the jobs are not delegated to eligible build machines that support that system.

This is done in a way that avoids rebuilds.
2021-09-20 14:54:40 +02:00
github-actions[bot] 9e5021eef4
Merge master into staging-next 2021-09-20 12:01:15 +00:00
Robert Hensing f44ece5469
Merge pull request #137302 from divanorama/patch-5
use --verbatim-files-from in dockerTools
2021-09-20 13:53:02 +02:00
Théo Zimmermann 20291381c1 coqPackages.mkCoqDerivation: rely on namePrefix to compute default opam-name
As suggested by Cyril Cohen in https://github.com/NixOS/nixpkgs/pull/134362#discussion_r698379405.
2021-09-20 11:10:23 +02:00
github-actions[bot] c4fd2a8f99
Merge master into staging-next 2021-09-18 00:01:33 +00:00
github-actions[bot] a21275cdae
Merge master into staging-next 2021-09-17 18:01:14 +00:00
John Ericson d3407f1a3b cc-wrapper: Add support for -mthumb / -marm 2021-09-17 17:12:54 +00:00
sternenseemann fb1348d433 bintools-wrapper: check if bintools to wrap isGNU, not stdenv
The wrapped bintools and the one used to build the wrapper can differ.
2021-09-17 17:06:24 +02:00
github-actions[bot] 6a10b23c61
Merge staging-next into staging 2021-09-16 00:02:05 +00:00
Markus Kowalewski 20b905a8df
alternatives/blas: fix ILP64 check
This fix allows for MKL ILP64 builds.
2021-09-15 17:07:21 +02:00
Dmitry Kalinkin 3e8668d9e5
Merge pull request #136535 from veprbl/pr/blas_id_fix_cblas
blas: fix library id on darwin for cblas
2021-09-15 10:33:43 -04:00
github-actions[bot] 0f78d9c4b7
Merge staging-next into staging 2021-09-15 00:02:12 +00:00
github-actions[bot] 728f30ca03
Merge master into staging-next 2021-09-15 00:01:33 +00:00
Guillaume Girol 3413d61035
Merge pull request #137351 from impl/autopatchelfhook-cross-fix
autoPatchelfHook: fix detection under crossSystem
2021-09-14 20:06:31 +00:00
github-actions[bot] 79a728d821
Merge staging-next into staging 2021-09-14 00:01:57 +00:00
github-actions[bot] 1db0c42d5a
Merge master into staging-next 2021-09-14 00:01:23 +00:00
Artturi dddf775e4c
Merge pull request #137045 from Artturin/fetchzipw
fetchzip: recursively run chmod +w on the unpackDir
2021-09-13 21:16:05 +03:00
Noah Fontes b79483d2b7
autoPatchelfHook: fix detection under crossSystem
In #84415, autoPatchelfHook was taught to use the correct path to the
readelf binary when a crossSystem is specified. Unfortunately, the
remainder of the functionality in the script depended on ldd, which only
reads ELF files of its own architecture. It has the further unfortunate
quality of not reporting any useful error, but rather that the file is
not a dynamic executable.

This change uses patchelf to directly analyze the DT_NEEDED tags in the
target files instead, which correctly works across architectures. It
also updates the use of objdump to be prefix-aware $OBJDUMP (which would
have been required in the PR mentioned above, but we never made it that
far into the script execution).
2021-09-12 15:07:15 -07:00
github-actions[bot] fef6f602e6
Merge staging-next into staging 2021-09-12 18:01:50 +00:00
github-actions[bot] a13bf1828b
Merge master into staging-next 2021-09-12 18:01:21 +00:00
Daniël de Kok 6f2ce2a65e treewide: remove danieldk as maintainer from a set of packages
I currently do not have much time to work on nixpkgs. Remove
myself as a maintainer from a bunch of packages to avoid that
people are waiting on me for a review.
2021-09-12 14:42:12 +00:00
github-actions[bot] 8bc930ca39
Merge staging-next into staging 2021-09-12 00:02:23 +00:00
github-actions[bot] 3f2255106a
Merge master into staging-next 2021-09-12 00:01:45 +00:00
Timothy DeHerrera 0171610faa
Merge pull request #73712 from virusdave/dnicponski/scratch/add_substitute_nix_support
substitute: init at 0
2021-09-11 15:21:40 -06:00
github-actions[bot] d370d9ee99
Merge staging-next into staging 2021-09-11 18:01:51 +00:00
github-actions[bot] c435b0e35f
Merge master into staging-next 2021-09-11 18:01:16 +00:00
Sandro bcced5deff
Merge pull request #137204 from SuperSandro2000/fetchCargoTarball
rust.fetchCargoTarball: remove phases
2021-09-11 19:31:03 +02:00
github-actions[bot] ff5297bcd3
Merge staging-next into staging 2021-09-11 12:01:45 +00:00
Alyssa Ross 56314db098
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/compilers/ghc/8.10.7.nix
	pkgs/development/compilers/ghc/8.8.4.nix

I've removed the isWindows check from useLdGold in ghc, since that should
be covered by the new hasGold check.
2021-09-11 10:49:13 +00:00
Jörg Thalheim f21712edaa importCargoLock: add docs how to run these tests 2021-09-11 11:14:58 +02:00
Yureka 34cc1821db
importCargoLock: add tests for branch and tag 2021-09-11 09:19:18 +02:00
Artturi fb2781ff0a
Merge pull request #134881 from OmnipotentEntity/dont-compress-xz
setup-hooks: compress-man-pages.sh: Do not attempt to compress .xz files
2021-09-11 04:03:12 +03:00
Yureka 00b1ac5b23 importCargoLock: git deps with rev, branch or tag
Previously importCargoLog only recognized git dependencies with `rev =`.
This adds support for git dependencies with `branch =` or `tag =`.
2021-09-10 23:00:46 +02:00
divanorama b012fe5e7e
use --verbatim-files-from in dockerTools
https://www.gnu.org/software/tar/manual/html_node/files.html
files starting with - can be treated as command line options, which isn't desirable here
2021-09-10 19:12:32 +02:00
Sandro Jäckel 012685943f
rust.fetchCargoTarball: remove phases 2021-09-09 19:17:48 +02:00
github-actions[bot] a84ab6724a
Merge staging-next into staging 2021-09-08 18:01:37 +00:00
github-actions[bot] 31efc58eb0
Merge master into staging-next 2021-09-08 18:01:03 +00:00
Geoff Reedy c524608dca
mkshell: small fix for #137005 (#137105)
I somehow accidentally left out the lib.flatten from mergeInputs. Without it, subtractLists won't ever remove anything from the inputs since the inputs will be a list of lists.
2021-09-08 16:54:24 +02:00
Théo Zimmermann 7136060765 mkCoqDerivation: use COQMF_COQLIB for dev versions of Coq 2021-09-08 15:15:28 +02:00
github-actions[bot] 888f8e8ac0
Merge staging-next into staging 2021-09-08 12:02:02 +00:00
github-actions[bot] 5ed67a849a
Merge master into staging-next 2021-09-08 12:01:27 +00:00
Geoff Reedy 087513bc11
mkShell: exclude inputsFrom from merged inputs (#137005)
The motivation for inputsFrom is to create a shell environment that is suitable for development of the packages listed in inputsFrom. This commit filters out any dependencies from one package in inputsFrom to another when computing the shell environment's inputs. This supports the use case where several closely related packages (perhaps even built from the same source tree) are being mutually developed. It is assumed that the user will configure their environment to resolve dependencies between these mutually developed packages.
2021-09-08 13:53:09 +02:00
Artturin 5c37214abb fetchzip: recursively run chmod +w on the unpackDir
Fixes https://github.com/NixOS/nixpkgs/issues/136030
2021-09-08 03:58:18 +03:00