Vladimír Čunát
a99e543c36
bzip2: split into multiple outputs, refactor
2015-04-18 19:32:52 +02:00
Vladimír Čunát
d484c392aa
stdenv multiple-outputs: change propagation rules
...
Now development stuff is propagated from the first output,
and userEnvPkgs from the one with binaries.
Also don't move *.la files (yet). It causes problems, and they're small.
2015-04-18 19:30:28 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02: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
Eelco Dolstra
ead7762573
stdenv-darwin: Use --sdk macosx10.9
...
Otherwise builds fail on Mac OS X 10.9 with Xcode 6.1. This is because
"xcrun --show-sdk-version" returns 10.10, which doesn't work.
2015-03-23 16:04:37 +01:00
Eelco Dolstra
a89c14dc3c
No camelCase in filenames
2015-03-23 12:03:01 +01:00
Eelco Dolstra
8470b03db2
Remove unused file
2015-03-23 12:02:13 +01:00
Eelco Dolstra
692ed0882a
Fix eval-release.nix evaluation
2015-03-06 15:09:51 +01:00
Eric Seidel
3ea2aa4136
stdenv/darwin: choose sdkroot based xcrun default
2015-03-04 21:36:09 -08:00
codyopel
e29b0da9c7
remove stdenv.isBSD
2015-02-24 22:15:51 -05:00
Dan Peebles
025f87f79a
Bootstrap tools for the upcoming new darwin stdenv (not working yet in this stdenv, but will soon)
2015-02-18 00:24:34 -05:00
Dan Peebles
ecf662efc6
Flip cctools and cctools cross
2015-02-18 00:24:33 -05:00
Lluís Batlle i Rossell
6790caf713
I add back the arm unpack script
...
The unified made by ambro doesn't work for me in the sheevaplug.
2015-02-09 22:36:10 +01:00
Lluís Batlle i Rossell
2b7aace1ae
Renaming make-bootstrap-tools-crosspi to cross.
...
It can build more than the raspberrypi bootstrap tools.
2015-02-05 23:32:09 +01:00
Lluís Batlle i Rossell
a761b33d8c
Using fixed bootstraptools.
...
Built natively with latest fixes.
2015-02-05 23:00:08 +01:00
Lluís Batlle i Rossell
389d0f668e
Bootstrap tools armv5tel
...
Conflicts:
pkgs/stdenv/linux/default.nix
pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
2015-02-05 22:42:58 +01:00
Lluís Batlle i Rossell
6944b15d88
Fix busybox stdenv?
...
(cherry picked from commit db8668c0bb0dc8feb4929867adf1b60f7025a925)
2015-02-05 22:41:07 +01:00
Ambroz Bizjak
ef9c21a0e2
Adding the sheevaplug to make-bootstrap-tools-cross
2015-02-05 21:37:29 +01:00
Ambroz Bizjak
93e018cbe9
Make the bootstrap-tools test use the real unpacking derivation.
2015-02-05 21:29:02 +01:00
Ambroz Bizjak
810b416d89
Consolidate the unpack scripts for the bootstrap tools.
2015-02-05 21:27:12 +01:00
Ambroz Bizjak
8fb7d8bede
Fix building and unpacking of the ARM boostrap tools.
...
NOTE: This is incomplete - the tools need to be built, uploaded and the references fixed.
2015-02-05 21:26:55 +01:00
Ambroz Bizjak
0a8ca604b4
Fix cross compiling regression due to gcc->cc renaming.
2015-02-05 21:25:25 +01:00
Eric Seidel
4a467ec02b
move libcxx[abi] into llvm tree
2015-02-03 14:58:10 -08:00
Eric Seidel
92188d9d17
new darwin stdenv
2015-02-03 14:05:22 -08:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Wout Mertens
ef2e0ffdea
stdenv: fix eval - the return
2015-01-29 10:54:07 +01:00
Wout Mertens
006769be70
stdenv: fix eval
...
silly 💩
2015-01-29 10:46:35 +01:00
Wout Mertens
0feb19b6b4
stdenv: take license parameter checks out of mkDerivation path
2015-01-29 10:38:33 +01:00
Matthias Beyer
aca361fa49
Add (optional) license white/blacklisting
2015-01-24 17:28:50 +01:00
Wout Mertens
4b82bd683e
Merge pull request #5714 from vcunat/p/stdenv-subst
...
stdenv substitute: avoid using a temporary file
2015-01-23 23:15:16 +01:00
Vladimír Čunát
a0bf07827b
mpc: also rename the attribute to libmpc
...
Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
2015-01-17 09:55:32 +01:00
Vladimír Čunát
88089559b9
Merge #5676 : gcc-wrapper -> cc-wrapper and related
2015-01-17 08:43:04 +01:00
Eric Seidel
88eae46455
rename occurrences of gcc.gcc to gcc.cc
2015-01-14 20:47:49 -08:00
Shea Levy
16fe4be790
Add isGNU attribute to gccs
2015-01-14 20:26:57 -08:00
Eric Seidel
48f63c2f2e
rename gcc-wrapper to cc-wrapper.
...
also makes cc-wrapper compatible with clang in the darwin fork.
2015-01-14 20:26:56 -08:00
Vladimír Čunát
1575bc652e
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/os-specific/linux/util-linux/default.nix
It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Vladimír Čunát
2533a11241
stdenv substitute: avoid using a temporary file
...
- IMO using a temporary is not needed here (anymore),
- temporary at that location can cause a problem (in a specific case):
for example, when using the substituteAll function from nixpkgs
on a single file directly under /nix/store/ (or ./foo-file),
the stdenv's substitute tries to create a temporary directly under
/nix/store, which causes problems on chrooted darwin
(according to @copumpkin earlier today on IRC)
2015-01-13 10:53:57 +01:00
Eelco Dolstra
71c3c19638
stdenv: Remove redundant "building ..." message
...
Nix already shows what paths are being built.
2015-01-12 13:04:26 +01:00
Vladimír Čunát
e98a443e71
stdenv: improve message on evaluation check (no hash changes)
2015-01-11 21:38:19 +01:00
Vladimír Čunát
123a8bf9a5
stdenv: refactor code for evaluation errors (no hash changes)
2015-01-11 21:37:50 +01:00
Shea Levy
77a448e96f
restore pkgs.gcc = stdenv.cc
2015-01-03 09:54:02 -05:00
Daniel Peebles
8df8943b92
I think this should fix the evaluation errors in hydra
2014-12-27 12:02:58 -05:00