Andreas Rammhold
059faab65a
Merge pull request #73803 from andir/buildRustCrate-lib-output
...
buildRustCrate: add lib output
2019-11-28 15:36:45 +01:00
Andrew Dunham
3f86f21207
buildBazelPackage: allow specifying whether to remove rules_cc
2019-11-27 10:43:34 +01:00
Dima
df7f3e0f98
nix-prefetch-git: list --branch-name in help
...
Listing the option and brief explanation.
Addresses: https://github.com/NixOS/nixpkgs/issues/74182
2019-11-26 20:43:23 +01:00
Andreas Rammhold
1b748554d5
buildRustCrate: add lib output
...
This cuts down the dependency tree on some rust builds where a crate not
just exposes a binary but also a library. `$out/lib` contained a bunch
of extra support files that among other information carry linker flags
(including the full path to link-time dependencies). Worst case this led
to some binary outputs depending on the full build closure of rust
crates.
Moving all the `$out/lib` files to `$lib/lib` solves this nicely.
`lib` might be a bit weird here as they are most of the time just rlib
files (rust libraries). Those are essential only required during
compilation but they can also be shared objects (like with traditional
C-style packages). Which is why I went with `lib` for the new output.
One of the caveats we are running into here is that we do not (always)
know ahead of time of a crate produces just a library or just a binary.
Cargo allows for some ambiguity regarding whether or not a crate
provides one, two, … binaries and libraries as it's outputs. Ideally we
would be able to rely on the `crateType` entirely but so far that isn't
the case. More work on that area might show how difficult that actually
is.
2019-11-26 15:05:01 +01:00
Jason Felice
7a77629490
java classpath hook: allow unbound $CLASSPATH
2019-11-24 23:30:05 -05:00
John Ericson
814f9104d7
Merge pull request #72657 from cleverca22/vc4
...
Initial implementation of vc4 cross-compile
2019-11-24 16:04:15 -05:00
John Ericson
747d5a3dbf
Merge branch 'wrapper-pname-support-19.09' into wrapper-pname-support
2019-11-24 18:00:29 +00:00
John Ericson
4a0a297861
bintools-wrapper: Fix version
2019-11-24 17:57:06 +00:00
John Ericson
d0d5136cce
Merge remote-tracking branch 'upstream/master' into wrapper-pname-support
2019-11-24 17:25:07 +00:00
Craig Hall
99537e994f
{cc,bintools}-wrapper: use cc pname/version if set
2019-11-24 16:33:21 +00:00
Jan Tojnar
937ec235b7
appimage: do not use alias
2019-11-23 21:28:01 +01:00
Herwig Hochleitner
42eeca722c
emacs package setup hook: Fix Fix
...
A trailing separator in emacs load paths has semantics
cc @Ericson2314 @adisbladis https://github.com/NixOS/nixpkgs/pull/73287
This partially reverts commit ca782498a9
2019-11-23 19:49:56 +01:00
Michael Bishop
4aa1ffae04
initial implementation of vc4 cross-compile
2019-11-19 22:19:15 -04:00
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