Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Nikolay Amiantov
f6eb686222
Merge pull request #15002 from abbradar/symlink-join-wrappers
...
Use symlinkJoin for wrappers
2016-04-26 16:47:43 +04:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Nikolay Amiantov
dfe608c8a2
symlinkJoin: accept set as an argument with additional options
2016-04-26 15:37:42 +03:00
Nikolay Amiantov
62616ec5e2
Merge commit 'refs/pull/14907/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:47 +03:00
Nikolay Amiantov
5e85760ff1
Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:32 +03:00
Nikolay Amiantov
5f19542581
Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:23 +03:00
Nikolay Amiantov
69a072484d
gcc-wrapper-old: fix binutils and coreutils' paths
2016-04-25 14:27:51 +03:00
jraygauthier
ddc401ed0a
icon-conv-tools: init at 0.0.0 ( #13905 )
...
A nix specific set of tools for converting icon files
that are not in a freedesktop ready format.
I plan on using these tools for both `keepass` and
`retroarch` packages. It may benifit many other packages.
2016-04-25 13:16:47 +02:00
Nikolay Amiantov
5ff40ddedf
add get* helper functions and mass-replace manual outputs search with them
2016-04-25 13:24:39 +03:00
Profpatsch
a2d38bc7fc
doc/stdenv.xml document substitution env variables
...
The filtering of environment variables that start with an uppercase
letter is documented in the manual.
2016-04-23 21:41:35 +02:00
Tuomas Tynkkynen
bd18cc3cdc
Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
...
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Guido Zgraggen
6ea0ae58af
nix-prefetch-git: create parent directories
2016-04-22 16:51:49 -07:00
Tuomas Tynkkynen
01854a850a
treewide: Replace module_init_tools -> kmod
...
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Vladimír Čunát
57474b7d4a
Merge branch 'master' into staging
...
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Vladimír Čunát
f6dfbb692c
stdenv multiple-outputs: fix cross-build propagation
...
Fixes #14817 . The outputs weren't propagated correctly when
cross-building.
2016-04-20 16:37:23 +02:00
Vladimír Čunát
9f8751528c
stdenv multiple-outputs: fix #14782 --docdir location
...
- the default --docdir is typically DATAROOTDIR/doc/pkgName
- I saw no other way than to employ some magic to guess this `pkgName`
- user can override it by setting $shareDocName
2016-04-20 16:36:10 +02:00
Eelco Dolstra
21a2f2ba3b
nix: Add a "dev" output
...
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
2016-04-18 21:13:18 +02:00
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