Vladimír Čunát
f57c6449dc
buildEnv: fix #14682 evaluation in some edge cases
...
I supplied meta.outputsToInstall automatically in all
mkDerivation products, but some packages still don't use it.
The reported case: jekyll -> bundlerEnv -> buildEnv -> runCommand.
2016-04-17 08:57:17 +02:00
Brian McKenna
bc2f314f73
dockerTools: make tars deterministic
...
There were two sources of non-determinisim coming into the images. The
first was tar mtimes, the second was pigz/gzip times.
An example image now passes with the --check flag.
2016-04-15 09:29:15 +10:00
Domen Kožar
0f9268e52c
fetchurl: assert required Nix version for sha512
2016-04-14 12:50:21 +01:00
Luca Bruno
44d651485a
dockerTools: fix difference between base files and layer files
2016-04-14 12:23:49 +02:00
Luca Bruno
4d200538c2
dockerTools: fix /nix/store permissions
2016-04-14 12:23:48 +02:00
Luca Bruno
6d8845ed8f
Merge pull request #14588 from puffnfresh/bug/remove-docker-tarballs
...
dockerTools: remove "tarballs" attribute
2016-04-13 21:01:01 +02:00
Eelco Dolstra
3ecbe604ef
fetchurl: Support SHA-512 hashes
2016-04-13 14:11:14 +02:00
Nikolay Amiantov
d0fd551876
buildFHSEnv: post-closure-size fix
2016-04-13 14:28:33 +03:00
Nikolay Amiantov
5c38c36472
Merge pull request #14650 from hrdinka/fhs-chroot/pkg-path
...
build-fhs-chrootenv: set PKG_CONFIG_PATH
2016-04-13 14:24:09 +04:00
Christoph Hrdinka
54fa4c4cec
build-fhs-chrootenv: set PKG_CONFIG_PATH
...
Currently `PKG_CONFIG_PATH` isn't set in FHS chroots rendering `pkg-config`
unusable. This patch sets it to `/usr/lib/pkgconfig`.
2016-04-13 11:06:33 +02:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Joachim Fasting
27035365ec
build-support/grsecurity: simplify the grsecurityOverrider
...
Adding inputs required by gcc plugins to the ambient environment is sufficient.
2016-04-12 01:23:32 +02:00
Brian McKenna
d150fe8915
dockerTools: use pigz for final image tar
...
Saves a few seconds on large images.
2016-04-11 16:32:47 +10:00
Brian McKenna
ebb911cc0b
dockerTools: remove tarballs functionality
...
I think the intention of this functionality was to provide a simple
alternative to the "runAsRoot" and "contents" attributes.
The implementation caused very slow builds of Docker images. Almost all
of the build time was spent in IO for tar, due to tarballs being
created, immediately extracted, then recreated. I had 30 minute builds
on some of my images which are now down to less than 2 minutes. A couple
of other users on #nix IRC have observed similar improvements.
The implementation also mutated the produced Docker layers without
changing their hashes. Using non-empty tarballs would produce images
which got cached incorrectly in Docker.
I have a commit which just fixes the performance problem but I opted to
completely remove the tarball feature after I found out that it didn't
correctly implement the Docker Image Specification due to the broken
hashing.
2016-04-11 16:32:43 +10:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
710573ce6d
Merge #12653 : rework default outputs
2016-04-07 16:00:09 +02:00
Vladimír Čunát
9a824f2f1d
treewide: rename extraOutputs{ToLink,ToInstall}
...
This is to get more consistent with `meta.outputsToInstall`.
2016-04-07 15:59:44 +02:00
Vladimír Čunát
2995439003
buildEnv: respect meta.outputsToInstall
...
As a result `systemPackages` now also respect it.
Only nix-env remains and that has a PR filed:
https://github.com/NixOS/nix/pull/815
2016-04-07 15:59:44 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Tuomas Tynkkynen
6b42f9f4be
Merge commit 'bde820' from staging
...
http://hydra.nixos.org/eval/1252653 - only ~9400 packages to go at the
time of writing this.
2016-04-06 01:18:28 +03:00
Vladimír Čunát
aa670eb503
vmTools: update debian jessie 8.3 -> 8.4
...
Their in-place updates break download hashes...
2016-04-05 14:32:04 +02:00
Nikolay Amiantov
88c97e2860
Merge pull request #14413 from abbradar/steam-run
...
steam-run: add derivation
2016-04-04 18:04:45 +04:00
Samuel Rivas
f1b0d6410e
emacsWithPackages: reduce some duplication
2016-04-03 21:21:50 +02:00
Samuel Rivas
2b199537b7
emacsWithPackages: move bin and site-lisp to private share directory
...
This is to avoid unwanted side effects when installing a wrapped emacs in the environment:
* All executables in the dependencies become available in the user environment
* All site-lisp binaries in the dependencies become accessible to unwrapped emacs
Also, both bin and site-lisp would generate conflicts so installing a wrapped emacs becomes really cumbersome
2016-04-03 21:11:38 +02:00
Nikolay Amiantov
375c410d07
userFHSEnv: add passthru, rename meta
2016-04-03 04:19:58 +03:00
Tomasz Kontusz
6c9ce23c00
cc-wrapper: Fix a typo in param parsing ( close #14401 )
2016-04-02 20:51:48 +02:00
Eelco Dolstra
13a1c7b8c1
useOldCXXAbi: Change into a setup hook
...
Stdenv adapters considered weird.
2016-04-01 13:36:59 +02:00
Lluís Batlle i Rossell
635c99ce87
vm: allow overriding QEMU_OPTS / memSize for images.
...
It's nice to be able to create disk images with -smp 4
in qemu.
2016-04-01 10:32:59 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Lluís Batlle i Rossell
ab93f8c137
Making vm's qemu cache=unsafe. Faster.
...
I don't think it's unsafe, if it's meant for nix expressions.
2016-03-31 09:27:25 +02:00
Lluís Batlle i Rossell
e21dd19168
Making vm's interactive shell handle the terminal well.
2016-03-31 09:27:14 +02:00
Nikolay Amiantov
a5322efd95
Revert "Remove PATH assumption from fhs-userenv."
...
This reverts commit 2f26b82411
.
This breaks terminfo in Bash for some reason (i.e. TAB and other
special keys).
2016-03-29 17:58:07 +03:00
Rodney Lorrimar
457eddd18f
bower2nix: 2.1.0 -> 3.0.1
...
1. Update bower2nix version and add new/updated dependencies into
node-packages-generated.nix. This was done manually, with npm2nix
generating the initial set of derivations. In future, it would be
nice to have an automatic process (see #10358 , #9332 ).
2. Add an override to nodePackages.bower2nix wrapping the commands so
that git is on the PATH.
3. Update fetchbower to support new command-line options of bower2nix,
and to allow github URL tag versions.
2016-03-28 08:23:06 +01:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Joachim Fasting
304c4a514e
grsecurity: fix gcc plugin
...
Also needs mpfr and libmpc
2016-03-26 21:01:21 +01:00
Nicolas B. Pierron
5d6a4a6fa9
Merge pull request #14000 from nbp/fix-extend
...
Use fix and extends functions for all-packages.nix
2016-03-24 20:54:20 +01:00
Nikolay Amiantov
119c287c71
cc-wrapper: use Bash arrays properly
2016-03-24 21:13:11 +03:00
Nikolay Amiantov
0c6db0ca48
cc-wrapper: add option to skip flags for native optimizations
2016-03-24 20:16:17 +03:00
Eelco Dolstra
89693e71b9
Merge pull request #13907 from abbradar/cpp-wrapper
...
cc-wrapper: add C++-specific paths if `-x cpp` is passed
2016-03-24 18:12:04 +01:00
zimbatm
40e9dff04a
nix-prefetch-git: fix url_to_name heuristic
...
The function wasn't checking that *all* of the characters where
[a-z0-9]. Fixes #13921
2016-03-23 11:22:51 +00:00
Ryan Trinkle
be30ba8e0e
nix-prefetch-scripts: make nix-prefetch-git report fetchSubmodules in its JSON output
...
Previously, nix-prefetch-git would report the same JSON whether submodules were being fetched or not; with this change, the --fetch-submodules option will cause the JSON output to include "fetchSubmodules": true, so that fetchgit (builtins.fromJSON (builtins.readFile ./path/to/output.json)) will work.
2016-03-21 23:26:18 -04:00
Nicolas B. Pierron
5cdaa7b907
Remove all-packages.nix helperFunctions dependency.
2016-03-20 16:41:20 +00:00
zimbatm
ae487615a6
nix-prefetch-git: fix url_to_name heuristic
...
The function wasn't checking that *all* of the characters where
[a-z0-9]. Fixes #13921
2016-03-18 21:58:52 +00:00
Sander van der Burg
27e23486bb
fetchbower: quote parameter to prevent ambigious redirects if version specifiers have wildcards
2016-03-18 12:06:01 +00:00
Peter Simons
af81505c00
wrap-gapps-hook.sh: fix double inclusion guard
...
The simple "return" would not override the non-zero error code set by the
preceding test command, therefore aborting scripts running with "set -e".
2016-03-18 07:52:36 +01:00
Nikolay Amiantov
11b69246e0
Merge pull request #13938 from abbradar/fhs-gcc-paths
...
buildFHSEnv: add standard paths for compilers
2016-03-16 15:44:34 +03:00
Nikolay Amiantov
9488fee869
buildFHSEnv: add standard paths for compilers
2016-03-15 19:44:42 +03:00
zimbatm
9504992e1d
Merge pull request #13897 from nbp/fix-ocaml-pkgs-platform
...
Ensure that we can evaluate the platform attribute of ocaml packages.
2016-03-14 19:25:40 +00:00
Vladimír Čunát
d6b46ecb30
Merge branch 'closure-size' into p/default-outputs
2016-03-14 11:27:15 +01:00
Nikolay Amiantov
87607af7a1
cc-wrapper: add C++-specific paths if -x c++
is passed
2016-03-14 06:58:18 +03:00