Jan Tojnar
da76deffd1
Merge branch 'master' into staging-next
2019-11-14 23:25:36 +01:00
John Ericson
bca2e8255e
treewide: CAML_LD_LIBRARY_PATH may be undefined
2019-11-14 13:44:07 -05:00
adisbladis
e578b8499f
fetchgitPrivate: Remove fetcher
...
Since Nix 2.0 we have `builtins.fetchGit` which is a much better
option since it runs in the evaluator and has access to the regular
users ssh keys.
2019-11-14 09:34:12 -08:00
Frederik Rietdijk
d688c7cd05
Merge staging-next into staging
2019-11-12 14:32:56 +01:00
John Ericson
16f0fe7fe3
Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads
2019-11-11 20:48:14 -05:00
John Ericson
38ebb8ff82
fetchurl: Eliminate pointless cross differences
2019-11-11 00:25:24 -05:00
John Ericson
f7fdc997bf
Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars
2019-11-08 13:58:27 -05:00
John Ericson
ca782498a9
emacs package setup hook: Fix
...
1. Make the test more robust
2. EMACSLOADPATH may be initially undefined.
3. did `targetOffset` twice when meant `hostOffset` too
2019-11-08 13:28:59 -05:00
John Ericson
fae8d2627d
cc-wrapper, bintools-wrapper: Remove now unneeded set {+,-}u
2019-11-04 19:57:14 -05:00
John Ericson
c5cf009996
multiple-outputs setup hook: Remove accidentally added tab
...
I don't want to just rebase this away because the original commit is
also in #72074 .
2019-11-04 19:51:04 -05:00
Sebastian Jordan
8db9c3ef45
nix-prefetch-github: Delete redundant source, build from python3Packages instead
2019-11-04 09:14:00 +01:00
John Ericson
7eecf4f8fb
find-xml-catalogues: Ensure XML_CATALOG_FILES is defined
2019-11-01 14:44:44 -04:00
John Ericson
2811b032d6
treewide: Make still dont* Variables are optional in most cases
...
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:
- cc-wrapper's `dontlink`, because it already is handled.
Also, in nix files escaping was manually added.
EMP
2019-11-01 14:44:44 -04:00
John Ericson
545e7518a8
bintools-wrapper: Don't stop set -u
-ing
...
Same justification as previous commit.
2019-11-01 14:44:43 -04:00
John Ericson
43a98868ae
common setup hooks: set -u robustness
...
Explicitly handle `dont*` and friends not being defined.
2019-11-01 14:44:43 -04:00
Jörg Thalheim
56240d7f20
Merge pull request #71899 from decentriq/aslemmer/build-rust-package-add-target
...
build-support/rust: Add target option
2019-11-01 15:46:47 +00:00
exfalso
a588b1dfbc
build-support/rust: Add target option
2019-10-24 11:39:08 +01:00
Lassulus
f417dd9c89
Merge pull request #71586 from Lassulus/writers
...
writers: fix writeC & tests
2019-10-23 21:45:29 +02:00
lassulus
6d807882ad
writers test: use writeC with library for testing
2019-10-23 20:47:27 +02:00
lassulus
e7cccb74ee
writers test: fix python2 linter errors
2019-10-23 20:47:27 +02:00
lassulus
a5d874935e
writers: fix writeC libraries detection
2019-10-23 20:47:27 +02:00
Frederik Rietdijk
d7a921cad9
Merge pull request #71221 from NixOS/staging-next
...
Staging next
2019-10-22 09:15:19 +02:00
Andreas Rammhold
8d77a83e96
Merge pull request #70259 from andir/rust-checkflags
...
rust introduce `checkFlags` to parametrize test execution
2019-10-21 17:33:10 +02:00
Frederik Rietdijk
ad8bd84fc9
Merge master into staging-next
2019-10-20 16:22:45 +02:00
Andreas Rammhold
d13022417f
buildRustPackage: support checkFlags and checkFlagsArray
2019-10-20 02:31:13 +02:00
Profpatsch
bbcdd01f6b
Revert "skawarePackages.execline: wrap execlineb with tools"
...
Using wrapProgram adds a call to `bash` around every call
of `execline`, which clearly misses the basic idea behind
`execline` in the first place …
This reverts commit b64d25c447
.
2019-10-18 16:43:51 +02:00
Eelco Dolstra
328796d734
makeInitrd: Use stdenvNoCC
2019-10-11 17:12:09 +02:00
Eelco Dolstra
cae6db88d3
nukeReferences: Use stdenvNoCC
2019-10-11 17:12:09 +02:00
Robin Gloster
356464388f
Merge pull request #69370 from chkno/no-extra-flags
...
makeWrapper: Remove unused extraFlagsArray feature
2019-10-09 01:32:28 +02:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next
2019-10-03 01:47:08 +02:00
Nikolay Amiantov
280f17c893
buildBazelPackage: remove rules_cc
...
It's a new builtin dependency from Bazel 0.29.
2019-10-02 00:46:55 +03:00
zimbatm
f8d67ec135
buildRustPackage: add verifyCargoDeps option
...
One issue with cargoSha256 is that it's hard to detect when it needs to
be updated or not. It's possible to upgrade a package and forget to
update cargoSha256 and run with old versions of the program or
libraries.
This commit introduces `verifyCargoDeps` which, when enabled, will check
that the Cargo.lock is not out of date in the cargoDeps by comparing it
with the package source.
2019-09-30 17:09:52 +00:00
Frederik Rietdijk
503081fa5b
Merge staging into staging-next
2019-09-29 11:05:22 +02:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next
2019-09-27 22:13:02 +02:00
adisbladis
17a388d9dd
Merge pull request #69045 from rycee/emacs-wrapper-using-runcommand
...
emacs: use runCommand to generate wrapper
2019-09-27 12:58:38 +01:00
Jörg Thalheim
c0cba22090
Add intel-compute-runtime / Intel NEO driver stack ( #63705 )
...
Add intel-compute-runtime / Intel NEO driver stack
2019-09-27 11:52:55 +01:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
...
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
...
Quoting from the splitString docstring:
NOTE: this function is not performant and should never be used.
This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Chuck
a45b3ad89f
makeWrapper: Remove unused extraFlagsArray feature
...
There is a bug in this feature: It allows extra arguments to leak in
from the environment. For example:
$ export extraFlagsArray=date
$ man ls
Note that you get the man page for date rather than for ls. This happens
because 'man' happens to use a wrapper (to add groff to its PATH).
An attempt to fix this was made in 5ae18574fc
in PR #19328 for
issue #2537 , but 1. That change didn't actually fix the problem because
it addressed makeWrapper's environment during the build process, not the
constructed wrapper script's environment after installation, and 2. That
change was apparently accidentally lost when merged with 7ff6eec5fd
.
Rather than trying to fix the bug again, we remove the extraFlagsArray
feature, since it has never been used in the public repo in the ten
years it has been available.
wrapAclocal continues to use its own, separate flavor of extraFlagsArray
in a more limited context. The analogous bug there was fixed in
4d7d10da6b
in 2011.
2019-09-25 09:23:09 -07:00
Vladimír Čunát
192fb9d11b
Merge branch 'staging-next' into staging
2019-09-24 08:15:01 +02:00
Vladimír Čunát
eab41878ac
Merge branch 'master' into staging-next
2019-09-24 08:14:34 +02:00
Jörg Thalheim
71daf2ddb2
Merge pull request #65817 from bgamari/add-appimage-deps
...
build-support: Add p11_kit to appimage dependency set
2019-09-23 21:36:30 +01:00
Robin Gloster
602282538b
Merge pull request #69022 from mayflower/buildenv
...
buildEnv: check pathsToLink before checking collisions
2019-09-23 15:52:42 +02:00
Mario Rodas
aed74e8284
cargo-vendor: drop
...
Cargo 1.37 imported `cargo-vendor` as built-in command [1]
[1] https://github.com/rust-lang/cargo/pull/6869
2019-09-22 20:20:20 -05:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372
, reversing
changes made to f0fec244ca
.
Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
Matthew Bauer
268d510024
Merge pull request #69131 from xzfc/subshells
...
Avoid subshells
2019-09-20 17:47:15 -04:00
Albert Safin
26547013a5
bintools-wrapper: avoid subshells: glob match
2019-09-20 02:45:56 +00:00
Albert Safin
bbc5b22ad8
bintools-wrapper: avoid subshells: upcase
2019-09-20 02:45:56 +00:00
Frederik Rietdijk
0b12d44c06
Merge master into staging-next
2019-09-19 16:59:42 +02:00