William A. Kennington III
5ca1c32a9d
Merge branch 'master.upstream' into staging.upstream
2015-08-28 17:55:20 -07:00
Eelco Dolstra
f15270833a
Don't barf JSON at users in error messages
2015-08-27 15:32:45 +02:00
Jude Taylor
c1f2fd4619
update pure-darwin bootstrap tools with new hash
2015-08-25 11:12:09 -07:00
William A. Kennington III
4f22eadf2c
Merge branch 'master.upstream' into staging.upstream
2015-08-19 20:52:17 -07:00
Peter Simons
81ce9be104
Revert "Move licenseAllowed check into the builder attribute ( fixes #7541 )"
...
This reverts commit 4d6452ba
. The change affects Hydra in a way we didn't
expect: https://github.com/NixOS/nixpkgs/pull/9305#issuecomment-132791730 .
2015-08-19 23:37:45 +02:00
William A. Kennington III
901482ad99
Merge branch 'master.upstream' into staging.upstream
2015-08-19 13:54:48 -07:00
Mathnerd314
4d6452bab9
Move licenseAllowed check into the builder attribute ( fixes #7541 )
2015-08-17 10:54:38 -06:00
William A. Kennington III
952def0e3c
Merge branch 'master.upstream' into staging.upstream
2015-08-13 11:55:02 -07:00
Jude Taylor
ef95107ddc
make isClang work the way a user might expect
2015-08-12 11:27:54 -07:00
Vladimír Čunát
5ad448df3a
enableDebugging: use more suitable gcc flags
...
-ggdb is supposed to provide better symbol information when used with gdb
-Og is the recommended optimization level for debugging purposes
2015-08-10 09:11:30 +02:00
Eelco Dolstra
32caa604e3
Force Nixpkgs rebuild
...
Gratuitous change to force Hydra to rebuild Nixpkgs after some
derivations had their references corrupted by a Hydra bug
(ff3f5eb4d8
).
2015-08-03 20:03:11 +02:00
Jude Taylor
fa6c8445c7
make libcxxStdenv work on both darwin and linux
2015-07-27 14:25:40 -07:00
Jude Taylor
a2b3fe28a8
make bootstrap files buildable in sandbox
2015-07-10 14:00:47 -07:00
Jude Taylor
cb3e282cda
unique host deps, otherwise we get 600000 char derivations
2015-07-08 14:15:03 -07:00
Jude Taylor
14d83e9565
add gnused to impure darwin stdenv
2015-06-19 22:08:01 -07:00
Jude Taylor
3790cb7d43
fix nonexistent cc path in bootstrap stdenv
2015-06-18 13:44:40 -07:00
Vladimír Čunát
61596bf405
Merge #8363 : pure-darwin stdenv
2015-06-18 22:38:08 +02:00
Jude Taylor
fe75f16032
move pure stdenv into a new directory, bring back the old one
...
remove __impure from non-darwin OSes
2015-06-18 13:19:34 -07:00
Jude Taylor
87bca3698a
remove sort and unique from stdenv
2015-06-18 12:37:42 -07:00
Jude Taylor
fa9c81f694
pure darwin stdenv
2015-06-18 12:37:41 -07:00
Eelco Dolstra
d72538be8d
Don't include /no-such-path in buildInputs
2015-06-15 19:26:52 +02:00
Eelco Dolstra
42d94b6f15
Barf on non-existant build inputs
...
Previously saying
buildInputs = [ "bla" ];
was quietly ignored. Now it's a fatal error.
2015-06-15 11:24:55 +02:00
Eelco Dolstra
41e1900ea1
Define closeNest before exitHandler
...
This prevents "closeNest: command not found" messages if setup fails
early.
2015-06-15 11:24:11 +02:00
Tuomas Tynkkynen
99a7bc241d
stdenv/linux: Link statically against isl & cloog
...
Otherwise this fails on ARM:
/nix/store/jipqp9739n7wrjz40igbk85pqk13s0ad-binutils-2.23.1/bin/ld: /nix/store/92pdpqrqkdf8wjciq1cisvsp8kdz8p2i-gmp-5.1.3/lib/libgmp.a(mp_get_fns.o): relocation R_ARM_MOVW_ABS_NC against `__gmp_allocate_func' can not be used when making a shared object; recompile with -fPIC
/nix/store/92pdpqrqkdf8wjciq1cisvsp8kdz8p2i-gmp-5.1.3/lib/libgmp.a: could not read symbols: Bad value
collect2: error: ld returned 1 exit status
make[2]: *** [libisl.la] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory `/tmp/nix-build-isl-0.11.1.drv-3/isl-0.11.1'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-isl-0.11.1.drv-3/isl-0.11.1'
make: *** [all] Error 2
builder for ‘/nix/store/a8ghniifd8d8agqx0cqsh41daa08v11c-isl-0.11.1.drv’ failed with exit code 2
2015-06-12 01:38:47 +02:00
Eelco Dolstra
4970574409
Merge remote-tracking branch 'origin/gcc-4.9' into staging
...
Conflicts:
pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Eelco Dolstra
cde5053d9a
Revert "curl: Modernize build"
...
This reverts commit 5e3fe3916a
.
2015-06-04 14:54:52 +02:00
Eelco Dolstra
3096d03435
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
...
This reverts commit 25a148fa19
.
2015-06-04 14:54:48 +02:00
Eelco Dolstra
553abf71ba
Merge remote-tracking branch 'origin/staging' into gcc-4.9
...
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/libraries/wayland/default.nix
pkgs/development/tools/build-managers/cmake/default.nix
pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Florian Friesdorf
88e58a4fa2
cygwin: stdenv
2015-05-28 10:53:34 +02:00
William A. Kennington III
25a148fa19
Refactor mkFlag / shouldUsePkg into the nixpkgs libraries
2015-05-22 13:26:55 -07:00
Eelco Dolstra
24aa3551b0
Fix stdenv build
2015-05-13 18:17:25 +02:00
Eelco Dolstra
9ae86dc3fc
Ensure that errexit is honoured in hooks
...
Partial fix for #7524 .
2015-05-13 18:17:25 +02:00
Eric Seidel
395829686d
add is{GNU,Clang} attrs to cc-wrapper.
...
These will be more pleasant to use than the existing
(cc.cc.isClang or false)
nonsense we currently do.
2015-05-11 14:39:36 -07:00
viric
1b982918f5
Merge pull request #7740 from dezgeg/arm
...
ARM changes for the Jetson TK1 (and other multiplatform boards)
2015-05-07 20:53:07 +02:00
William A. Kennington III
074c4a7f78
Merge remote-tracking branch 'upstream/master' into staging
2015-05-07 01:44:49 -07:00
Tuomas Tynkkynen
a7c4aba896
ARM: Assume armv7l-hf-multiplatform instead of beaglebone
...
Several places in the tree associate the ARMv7 system
with the beaglebone platform. Change them to point to
armv7l-hf-multiplatform as it supports several boards (including the
beaglebone as well)
2015-05-07 06:04:10 +03:00
William A. Kennington III
874fa4d8a3
busybox: 1.22.1 -> 1.23.2
...
Also use musl as libc since it is just as small as uclibc, usually more
performant, and regularly makes releases.
2015-05-06 00:15:16 -07:00
Eelco Dolstra
a58356c953
useGoldLinker: Fix appending to $NIX_CFLAGS_LINK
2015-05-04 14:00:45 +02:00
William A. Kennington III
5e3fe3916a
curl: Modernize build
2015-05-01 15:57:14 -07:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
William A. Kennington III
232b71c6e8
Fix some platforms
2015-04-25 21:27:53 -07:00
William A. Kennington III
7ccccc15ba
Merge branch 'master' into staging
2015-03-27 16:03:03 -07:00
Eelco Dolstra
5c0eb64d43
Set more precise meta.position for Haskell packages
2015-03-27 16:17:48 +01:00
Eelco Dolstra
8b2f209838
mkDerivation: Use function arguments
2015-03-27 16:17:48 +01:00
William A. Kennington III
afa998eb32
stdenv: Substitute correctly chmods instead of .tmp which never exists
2015-03-26 15:44:54 -07:00
William A. Kennington III
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00
Eric Seidel
7f5367c69d
darwin: add apple cli-tools to initialPath so we can handle overrideCC
...
fixes #6934
2015-03-24 17:33:27 -07:00
Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Eelco Dolstra
bda440a7b3
substitute: Fix "No such file or directory" message on Darwin
...
On Darwin, "chmod -f" does not suppress an error message if the file
doesn't exist. So just check if the file exists.
2015-03-24 14:12:24 +01:00
Eelco Dolstra
d3756e162c
stdenv-darwin: Auto-detect the "right" SDK version
2015-03-23 16:46:41 +01:00