Lluís Batlle i Rossell
8067f14699
Fixing the gcc47 build in stdenv
...
gcc 4.7 wants an explicit reference to the system include directory,
and that's guessed through 'stdenv ? glibc'.
2012-12-31 10:13:55 +01:00
Michael Raskin
df65a79bb3
Export shell packages from stdenvLinux
...
Now that we have a way to alter /bin/sh in chroots on non-NixOS Linux
platforms, it may be useful to have access to stdenv.shell package and to
static bash contained in bootstrap tools. So make them accessible via stdenv
attribute set.
2012-12-30 15:29:02 +04:00
Eelco Dolstra
e2d505b24e
More renames
2012-12-28 19:42:10 +01:00
Eelco Dolstra
dcdef5a0fe
More random cleanup
2012-12-28 19:37:42 +01:00
Eelco Dolstra
22ba03c123
Random cleanup: use "or" in adapters.nix
2012-12-28 19:35:35 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
...
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Eelco Dolstra
f4ed8a3b91
Remove trailing whitespace
2012-12-28 16:41:56 +01:00
Eelco Dolstra
cf8daf6312
Add an option ‘stdenv.userHook’ to set a global stdenv setup hook
...
This allows various applications. It allows users to set global
optimisation flags, e.g.
stdenv.userHook = ''NIX_CFLAGS_COMPILE+=" -funroll-loops"'';
But the impetus is as an alternative to issue #229 , allowing impure
stdenv setup for people who want to use distcc:
stdenv.userHook = "source /my/impure/setup-script.sh";
This is probably a bad idea, but at least now it's a bad idea in
people's configuration and not in Nixpkgs. :-)
2012-12-28 16:36:09 +01:00
Eelco Dolstra
6fd4f63530
Revert "Merge pull request #229 from viric/niximpure2-stdenv-updates"
...
This reverts commit e04b17bfba
, reversing
changes made to 1af2ada7d4
.
2012-12-28 15:46:45 +01:00
Lluís Batlle i Rossell
095db9fe3f
stdenv: Stripping out/lib32 too
...
If not, in mips64/n32, lib32/libiberty.a was left without stripping, and
it contained (debug) references to bootstrap-tools.
2012-12-27 23:36:01 +01:00
Lluís Batlle i Rossell
b190e6cd93
Fixing problems in the previous commit. It didn't work.
2012-12-26 22:20:43 +01:00
Lluís Batlle i Rossell
635880a17a
2nd approach at getting a check for /niximpure in stdenv-updates
2012-12-26 21:38:58 +01:00
Shea Levy
6d928ab684
Don't preserve timestamps when copying sources to the temporary build directory.
...
This should fix issues like "ZIP does not support timestamps before 1980"
2012-12-14 13:36:04 -05:00
Eelco Dolstra
5e256ccc88
Merge remote-tracking branch 'origin/master' into stdenv-updates
2012-12-04 17:12:35 +01:00
Eelco Dolstra
72684fb42f
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
2012-11-29 14:10:49 +01:00
Peter Simons
f67d5a9a39
Merge branch 'master' into stdenv-updates.
...
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Eelco Dolstra
ccd44e84c8
Add a stdenv adapter ‘keepDebugInfo’ to make a debug build
...
This adapter causes the resulting binaries to have debug info and no
optimisations. Example use (in all-packages.nix):
foo = callPackage ./foo.nix {
stdenv = keepDebugInfo stdenv;
};
2012-10-31 13:46:51 +01:00
Lluís Batlle i Rossell
9b973e02e1
The loongson2f bootstrap files were already at nixos.org.
...
I make the nix expression point to them.
2012-10-25 23:22:41 +02:00
Lluís Batlle i Rossell
2ac4ad0c9c
Setting the loongson2f bootstrap tools in a public place.
...
It'd be nice having this in nixos.org though.
2012-10-25 23:16:32 +02:00
Eelco Dolstra
0008138201
checkPhase: Pass VERBOSE=y so that failing tests show something useful
2012-10-16 15:00:51 -04:00
Eelco Dolstra
49c8c2bc72
Update stdenv.is64bit
2012-10-16 13:53:43 -04:00
Eelco Dolstra
b3d20690a1
For consistency, don't use the -v flag when copying a directory $src
2012-09-25 21:31:16 -04:00
Eelco Dolstra
bf2b75ca7e
Add hacky way to prevent Hydra from building/distributing unfree packages
...
If the environment variable HYDRA_DISALLOW_UNFREE is set to "1", then
evaluation of a package with license "unfree" will throw an error.
Thus such packages or any packages that depend on them will fail to
evaluate.
2012-08-22 15:43:18 -04:00
Eelco Dolstra
85047983a1
stdenv/generic/default.nix: Simplify the code using the "or" construct
2012-08-22 15:43:18 -04:00
Ludovic Courtès
f959a26e33
stdenv: Fix typo.
2012-08-21 15:30:50 +02:00
Ludovic Courtès
6adc5cedae
stdenv: Add `isGlibc' function.
2012-08-21 15:29:07 +02:00
Eelco Dolstra
5bdea119d4
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
2012-05-02 13:19:07 +00:00
Eelco Dolstra
be901fa8be
* Add an installCheckPhase.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=33967
2012-05-01 21:00:30 +00:00
Ludovic Courtès
29bc53265d
Darwin: Use GCC 4.6 in `stdenvNix'.
...
svn path=/nixpkgs/trunk/; revision=33894
2012-04-23 15:47:37 +00:00
Nicolas Pierron
82b308bf11
Add armv7l support.
...
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Shea Levy
6f711ceb01
Revert r33547
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=33583
2012-04-04 19:45:01 +00:00
Shea Levy
358e51bb6d
tar doesn't need -f - to read from stdin
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=33574
2012-04-04 16:27:04 +00:00
Shea Levy
4a84fd30b5
Don't do verbose unpacking, it's just log noise
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=33573
2012-04-04 16:25:17 +00:00
Peter Simons
f35cf87600
removed executable bits from Nix files
...
svn path=/nixpkgs/trunk/; revision=33552
2012-04-03 06:31:19 +00:00
Ludovic Courtès
3214f4a844
Add `stdenv.isGNU'.
...
svn path=/nixpkgs/trunk/; revision=32836
2012-03-06 21:33:14 +00:00
Shea Levy
483f094acb
Honor propagatedUserEnvPackages in setup.sh
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32369
2012-02-17 21:37:15 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Lluís Batlle i Rossell
4a1c721c01
Changing every reference from mips64-linux to mips64el-linux. That's
...
what the new nix thinks the fuloong is.
Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.
svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Eelco Dolstra
94c7bec49d
* Call all the stdenvs "stdenv" (rather than e.g. "stdenv-linux")
...
so that "nix-env -i stdenv" does the expected.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31742
2012-01-20 16:47:54 +00:00
Eelco Dolstra
14aab94aef
* Oops.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31734
2012-01-20 10:55:45 +00:00
Eelco Dolstra
b27b5dfd75
* Doh.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31726
2012-01-19 22:18:34 +00:00
Eelco Dolstra
3980444b2b
* Reuse packages in the Darwin stdenv to prevent unnecessary rebuilds.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31710
2012-01-19 18:25:35 +00:00
Eelco Dolstra
61d0c5d931
* Don't rely on tar knowing about .xz.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31708
2012-01-19 17:33:33 +00:00
Eelco Dolstra
e1f901c117
* Build ‘xz’ during the stdenvNative bootstrap, since we really can't
...
rely on it being present.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31707
2012-01-19 16:50:09 +00:00
Eelco Dolstra
6b8e8bfedb
* "sed -i" isn't very portable, so don't use it here.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31705
2012-01-19 16:23:14 +00:00
Eelco Dolstra
698c4d296b
* "test" -> "[ ... ]" (style cleanup).
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31704
2012-01-19 16:14:09 +00:00
Eelco Dolstra
ee45e160b1
* Prepend the "prehook" rather than sourcing it.
...
* Don't call xargs with the -r flag in the Darwin bootstrap.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31703
2012-01-19 15:56:17 +00:00
Eelco Dolstra
6208059079
* The postHook substitution is not used anywhere, so get rid of it.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31702
2012-01-19 15:39:12 +00:00
Eelco Dolstra
b31df26cea
* Remove an unnecessary check.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31701
2012-01-19 15:31:56 +00:00