Jörg Thalheim
7bfa20198a
fetchcargo: add type checking to cargo-vendor-normalise.py
2018-09-11 23:44:14 +02:00
Symphorien Gibol
f20b229aa1
fectchcargo: don't break old sha256
2018-09-11 23:44:14 +02:00
Symphorien Gibol
ccf72b8537
fetchcargo: normalise cargo config to ensure determinism
2018-09-11 23:44:14 +02:00
Justin Humm
b66ef28841
buildRustPackage, fetchcargo: optionally use vendor config from cargo-vendor
...
By setting useRealVendorConfig explicitly to true, the actual (slightly
modified) config generated by cargo-vendor is used.
This solves a problem, where the static vendor config in
pkgs/build-support/rust/default.nix would not sufficiently replace all
crates Cargo is looking for.
As useRealVendorConfig (and writeVendorConfig in fetchcargo) default to
false, there should be no breakage in existing cargoSha256 hashes.
Nethertheless, imho using this new feature should become standard. A
possible deprecation path could be:
- introduce this patch
- set useRealVendorConfig explicitly to false whereever cargoSha256 is
set but migration is not wanted yet.
- after some time, let writeVendorConfig default to true
- when useRealVendorConfig is true everywhere cargoSha256 is set and
enough time is passed, `assert cargoVendorDir == null ->
useRealVendorConfig;`, remove old behaviour
- after some time, remove all appearences of useRealVendorConfig and the
parameter itself
2018-09-11 23:44:14 +02:00
Matthew Bauer
e258c8d8dd
Merge pull request #45698 from kamilchm/filename-in-usnupported-shebang-error
...
Show the filename on unsupported shebang error
2018-09-10 14:52:38 -05:00
Jan Malakhovski
b7bd0561be
Merge branch 'master' into staging
2018-09-08 22:08:32 +00:00
Shea Levy
18337f3ece
Merge branch 'no-toPath'
2018-09-06 08:09:53 -04:00
Profpatsch
4616ef1f41
skaware: switch from git repos to tarballs
...
It should be more performant this way.
2018-09-06 11:53:22 +02:00
Profpatsch
0071ae1d4f
skawarePackages: factor out the common parts
...
Introduce a `skawarePackages.buildPackage` function that contains the
common setup, removing a lot of duplication.
In particular, we require that the build directory has to be empty
after the `fixupPhase`, to make sure every relevant file is moved to
the outputs.
A next step would be to deduplicate the `configureFlags` attributes
and only require a `skawareInputs` field.
2018-09-06 11:53:22 +02:00
Matthew Bauer
a6877783f6
Merge pull request #43833 from matthewbauer/cross-patch-shebangs
...
patch-shebangs: respect cross compilation
2018-09-05 14:52:43 -05:00
Jan Malakhovski
4092708261
treewide: cleanup some references to bash
2018-09-04 22:05:02 +00:00
Alyssa Ross
4af7278bc9
lib: ensure directories of linkFarm links exist ( #45628 )
...
There's no reason `linkFarm` can't be used for symlinks in
subdirectories, except that currently it doesn't ensure the directory
of the link exists. This backwards-compatible change expands the utility
of the function.
2018-09-01 14:53:23 +02:00
John Ericson
0828e2d8c3
treewide: Remove usage of remaining redundant platform compatability stuff
...
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
John Ericson
2c2f1e37d4
reewide: Purge all uses stdenv.system
and top-level system
...
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Kamil Chmielewski
383de74f88
patch-shebangs: filename on unsupported shebang
...
Show the filename on unsupported shebang error.
Simplifies debugging packages with large set of scripts.
2018-08-29 21:47:27 +02:00
Samuel Dionne-Riel
ba9db083ac
Merge pull request #26416 from lverns/make-genericName-optional
...
make-desktopitem: make genericName optional
2018-08-27 19:29:13 -04:00
Alyssa Ross
f4745bef6c
makeWrapper: document --set-default
2018-08-24 19:46:16 +02:00
Vladimír Čunát
e78fd23564
Merge branch 'master' into staging
...
Hydra: ?compare=1474932
2018-08-22 20:57:14 +02:00
Matthew Bauer
13c8acc3db
Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path"
...
This reverts commit 89efc27f57
, reversing
changes made to d0f11020ca
.
2018-08-22 01:14:53 +02:00
volth
caf2cae44b
fetchpatch: patchutils -> buildPackages.patchutils
2018-08-21 17:21:25 -04:00
Matthew Bauer
379fc894de
Merge remote-tracking branch 'origin/master' into staging
2018-08-21 15:41:53 -05:00
Will Dietz
9c35796ee3
Merge pull request #45396 from dtzWill/fix/audit-tmpdir-quote
...
audit-tmpdir: fix processing of files with spaces, quote variables
2018-08-21 15:21:36 -05:00
CrystalGamma
72d161f548
[RFC] ppc64le enablement ( #45340 )
...
* ppc64le enablement
* gcc, glibc: properly handle __float128
* lib/systems, stdenv: syntax cleanup
* gcc7: remove ugly hack
* gcc: add/update __float128 flags
* stdenv: add another pair of quotes for consistency
* gcc: move __float128 flag for ppc64le-glibc into common/platform-flags.nix
2018-08-21 15:31:34 -04:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next'
...
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
John Ericson
7d85ade0cc
treewide: Purge stdenv.platform
and top-level platform
...
Progress towards #27069
2018-08-20 15:22:46 -04:00
Will Dietz
79a86ca11c
audit-tmpdir: fix processing of files with spaces, quote variables
2018-08-20 13:08:32 -05:00
John Ericson
89efc27f57
Merge pull request #44767 from obsidiansystems/wrapper-env-var-path
...
{cc,bintools}-wrapper, ghc, libgcc: Define wrapper env vars as full paths
2018-08-17 16:12:26 -04:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging
2018-08-17 20:53:27 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
...
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Stewart Mackenzie
efac36aa88
carnix overrides: add gmp to rink-rs buildInputs & correct crateBin
2018-08-15 13:20:04 +08:00
Jörg Thalheim
78777fbd6b
Merge pull request #44981 from Ekleog/rust-patch-bis
...
buildRustPackage: allow patches to fix Cargo.lock
2018-08-14 14:23:51 +02:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
...
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Léo Gaspard
48e5fbe8ee
buildRustPackage: allow patches to fix Cargo.lock
2018-08-13 22:07:58 +09:00
Jörg Thalheim
cfff3eb6c4
Revert "buildRustPackage: allow patches to fix Cargo.lock"
...
This reverts commit b6e881ab72
.
We need to fix checksums for this pull request first.
Also see https://github.com/NixOS/nixpkgs/pull/44967
2018-08-13 12:26:33 +02:00
Jörg Thalheim
3dc78e6ae9
Merge pull request #44967 from Ekleog/rust-patch
...
buildRustPackage: allow patches to fix Cargo.lock
2018-08-13 12:22:59 +02:00
Léo Gaspard
b6e881ab72
buildRustPackage: allow patches to fix Cargo.lock
2018-08-13 14:44:30 +09:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
...
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
xeji
12eb1e96ce
Merge pull request #44870 from symphorien/tests-eval
...
Fix evaluation of two tests
2018-08-10 19:06:20 +02:00
Symphorien Gibol
0d13dc3654
nixos/tests/hocker-fetchdocker: fix evaluation
...
it still does not build
2018-08-10 15:22:47 +02:00
Jan Malakhovski
b135329dc5
treewide: random cleanups
2018-08-10 12:56:31 +00:00
Eelco Dolstra
fde7296a47
bintools-wrapper: propagated-build-inputs -> propagated-user-env-packages
2018-08-09 13:07:14 +02:00
Eelco Dolstra
fa41297209
Revert "cc-wrapper: propagate man and info to propagated-build-inputs"
...
This reverts commit 28ad0703f3
.
2018-08-09 12:58:16 +02:00
Eelco Dolstra
c981787db9
Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"
...
This reverts commit 02c09e0171
.
2018-08-09 12:57:38 +02:00
John Ericson
044a73bbe6
bintools-wrapper: Define env vars with full path
2018-08-08 17:16:15 -04:00
John Ericson
1dc0404d6e
cc-wrapper: Define env vars with full path
2018-08-06 20:38:13 -04:00
Jan Malakhovski
02c09e0171
cc-wrapper, bintools-wrapper: simply symlink man and info outputs
...
See discussion in #44516 .
2018-08-06 20:50:16 +00:00
Jan Malakhovski
28ad0703f3
cc-wrapper: propagate man and info to propagated-build-inputs
2018-08-05 19:20:02 +00:00
Matthew Bauer
f06942327a
patch-shebangs: respect cross compilation
...
This hopefully makes patchShebangs respect cross compilation. It
introduces the concept of the HOST_PATH. Nothing is ever executed on
it but instead used as a way to get the proper path using ‘command
-v’. Needs more testing.
/cc @ericson2314 @dtzwill
Fixes #33956
Fixes #21138
2018-07-31 15:38:35 -04:00
Vladimír Čunát
73959b68c2
Re-Revert "Merge #44221 : default for NIX_CXXSTDLIB_COMPILE"
...
This reverts commit fd81a2ecb6
.
Moved from master to staging.
2018-07-31 09:48:16 +02:00
Vladimír Čunát
fd81a2ecb6
Revert "Merge #44221 : default for NIX_CXXSTDLIB_COMPILE"
...
This reverts commit 034c9816d5
, reversing
changes made to 5afe87ed7a
.
Huge rebuild, moving to staging.
2018-07-31 09:43:52 +02:00