Test
ca5fda39dc
docker.buildUtils: use baseNameOf to allow for slashes in name
2016-10-31 10:11:48 -05:00
Shea Levy
225602d9f2
Merge branch 'response-files' of git://github.com/corngood/nixpkgs into staging
2016-10-31 10:07:30 -04:00
Franz Pletz
aa2b8d25d6
Merge pull request #19931 from mguentner/ipfs_update
...
ipfs: i20160112 -> 0.4.4, fetchgx
2016-10-31 14:42:05 +01:00
David McFarland
1ad1edbb32
cc-wrapper: expand response files
...
Fixes #11762
2016-10-31 01:12:07 -03:00
sternenseemann
e2372502d3
netcat: make netcat-openbsd the default netcat ( #19411 )
...
The motivation for this change is the following: As gnu-netcat,
e. g. does not support ipv6, it is not suitable as default netcat.
This commit also fixes all obvious build issues caused by this change.
2016-10-30 15:06:04 +01:00
Alexander Ried
cc523714a6
fetchfile: remove unused file
2016-10-29 07:28:52 +02:00
Franz Pletz
ff04adf871
fetchgx: fetch dependencies with gx and gx-go
2016-10-29 05:17:27 +02:00
Alexander Ried
10728c25b0
replaceDependency: fix syntax error
2016-10-28 01:00:04 +02:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Tom Boettcher
30b09b8620
dockerTools: Fix loop typo.
...
This typo was causing only a single layer to be de-duplicated,
rather than all parent layers.
2016-10-24 14:30:00 -05:00
Joachim Fasting
6d1bf921fa
grsecurity: work around #19698
...
This is a temporary work-around to fix using grsecurity on NixOS with
the new kernelPackages/kernelPatches machinery.
For whatever reason, when `security.grsecurity.enable = true`, the grsec
patch ends up being applied twice, causing the kernel build to fail.
Until the root cause of this is identified, we hack around it by simply
pruning duplicate patches in the grsec kernel builder.
Closes #19698
2016-10-23 18:25:29 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Tuomas Tynkkynen
5076c0a5d3
modules-closure: Use stdenvNoCC
2016-10-20 02:39:29 +03:00
David McFarland
2b6659e13e
cc-wrapper: fix detection of unsupported linker flags on cygwin
2016-10-18 17:52:20 -03:00
Vladimír Čunát
027efec879
Merge staging without python splitting for now
...
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Jörg Thalheim
d5316884e4
Merge pull request #19024 from adnelson/docker_refactor
...
dockerTools: add docs to docker build functions
2016-10-13 11:50:21 +02:00
Profpatsch
bef6bef0d2
stdenv/stripHash: print to stdout, not to variable
...
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.
Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
2016-10-11 18:34:36 +02:00
Nikolay Amiantov
7a73ecc18e
buildFHSEnv: link /etc/zoneinfo
...
This is needed because now /etc/localtime symlink points there.
2016-10-11 16:56:11 +03:00
Michael Raskin
f603dc11a6
fetch*: print a trace warning about md5 deprecation
2016-10-09 16:19:04 +02:00
Vincent Laporte
4168706d4f
OCaml modules: make explicit some dependencies to ocamlbuild
2016-10-09 11:55:19 +02:00
Profpatsch
5ae18574fc
stdenv/makeWrapper: make extraFlagsArray local
...
extraFlagsArray should not be exposed outside of `makeWrapper`, it
should only be possible to set it inside a script supplied via the
`--run` argument.
2016-10-08 23:36:49 +02:00
Profpatsch
dd58d24fa6
stdenv: document makeWrapper
...
Add function documentation to `makeWrapper`.
Also add user documentation to the nixpkgs manual.
2016-10-08 23:36:40 +02:00
Damien Cassou
0e69fb2f19
Merge pull request #18985 from dudebout/emacs-with-c-src
...
emacs: add an option to install the C source
2016-10-07 17:23:19 +02:00
Shea Levy
eca0f17ad2
nix-buffer support improvements.
...
Use inherit-local, add per-package elisp hooks.
2016-10-07 10:31:37 -04:00
Vladimír Čunát
30f551d8b2
Merge branch 'master' into staging
2016-10-05 19:02:48 +02:00
Jörg Thalheim
1bd8d7710e
Merge pull request #19125 from markus1189/bin-bash-cleanup
...
Bin bash cleanup
2016-10-05 17:16:00 +02:00
Kirill Boltaev
3e646865f4
treewide: use ocaml.version ( #19192 )
2016-10-05 09:32:30 +02:00
Markus Hauck
aafbd40577
Replace hard coded /bin/bash occurrences
2016-10-04 20:15:37 +02:00
Allen Nelson
940aafcbcc
use rsync, comment out pulls
2016-10-03 15:12:29 -05:00
Jörg Thalheim
888f6a1280
Merge pull request #19199 from wizeman/u/fix-help2man-hash
...
help2man: fix hash
2016-10-03 19:26:44 +02:00
Allen Nelson
b9007c8d83
add examples file
2016-10-03 12:07:33 -05:00
Joachim Fasting
1bb7b44cd7
grsecurity: make GRKERNSEC y and PAX y implicit
...
These options should always be specified. Note, an implication of this
change is that not specifying any grsec/PaX options results in a build
failure.
2016-10-02 19:25:58 +02:00
Allen Nelson
4abe579250
add docs to docker build functions
...
bring back ls_tar
replace goPackages with go
don't hardcode /nix/store in vmTools
more docs
2016-09-29 12:52:57 -05:00
Eelco Dolstra
97bfc2fac9
runCommand: Use stdenvNoCC
...
This ensures that most "trivial" derivations used to build NixOS
configurations no longer depend on GCC. For commands that do invoke
gcc, there is runCommandCC.
2016-09-29 13:06:43 +02:00
Eelco Dolstra
0cb16a6955
Add stdenvNoCC
...
This is a standard environment that doesn't contain a C/C++
compiler. This is mostly to prevent trivial builders like runCommand
and substituteAll from pulling in gcc for simple configuration changes
on NixOS.
2016-09-29 13:06:41 +02:00
Eelco Dolstra
518340624d
Merge remote-tracking branch 'origin/master' into staging
2016-09-29 13:06:14 +02:00
Eelco Dolstra
c5ddb7dd56
Move useSetUID to pam_usb, the only place where it's used
2016-09-29 13:05:28 +02:00
Eelco Dolstra
030e20f759
Add a warning about using requireFile
2016-09-29 13:05:28 +02:00
Vladimír Čunát
77604964b6
Merge branch 'master' into staging
2016-09-28 17:13:59 +02:00
Nicolas Dudebout
9c3852538c
emacsWrapper: remove site-start.elc
2016-09-27 16:13:22 -04:00
Luca Bruno
c049fd4a31
Merge pull request #18896 from tboettch/dockerToolsFix
...
dockerTools: Fix layer redundancy.
2016-09-25 15:35:05 +01:00
Vladimír Čunát
fffc7638cd
Merge branch 'master' into staging
2016-09-24 18:54:31 +02:00
Tom Boettcher
1e8b69c35e
dockerTools: Fix layer redundancy.
...
When building an image with multiple layers, files
already included in an underlying layer are supposed to
be excluded from the current layer. However, some subtleties
in the way filepaths are compared seem to be blocking this.
Specifically:
* tar generates relative filepaths with directories ending in '/'
* find generates absolute filepaths with no trailing slashes on directories
That is, paths extracted from the underlying tarball look like:
nix/store/.../foobar/
whereas the layer being generated uses paths like:
/nix/store/.../foobar
This patch modifies the output of "tar -t" to match the latter format.
2016-09-23 16:40:59 -05:00
Eelco Dolstra
f081a1aaf4
debian: 8.5 -> 8.6
2016-09-22 15:53:29 +02:00
Eelco Dolstra
ac03df96ba
openssl: 1.0.1t -> 1.0.1u, 1.0.2h -> 1.0.2i, 1.1.0 -> 1.1.0a
...
https://www.openssl.org/news/secadv/20160922.txt
2016-09-22 15:05:09 +02:00
Eelco Dolstra
7a4209c356
Merge remote-tracking branch 'origin/master' into staging
2016-09-20 17:46:09 +02:00
Eelco Dolstra
5f8a330d40
outputDocdev -> outputDevdoc
...
For consistency with the devdoc output.
2016-09-20 17:44:48 +02:00
Eelco Dolstra
594c47e5eb
Don't nuke section 3 manpages by default
...
They now go to devman, devdoc, or $outputMan, in that order. This is
to prevent cases such as the man-pages package quietly losing its
section 3 pages.
2016-09-20 17:42:43 +02:00
Profpatsch
61462c94e6
lib/fetchers.nix: factor out impure proxy vars ( #18702 )
...
Apparently everyone just copied those variables, instead of creating a
library constant for them. Some even removed the comment. -.-
2016-09-17 21:50:01 +02:00
Shea Levy
b04cdae902
nixBufferBuilders.withPackages: Make more legible, special-case proof-general.
...
There's some bigger changes coming, but thought I'd push this first...
2016-09-05 17:55:49 -04:00
Shea Levy
05c132486d
Initial version of nixBufferBuilders.withPackages.
...
This builds elisp to setup an emacs buffer with the packages given
available. See shlevy/nix-buffer for more information.
Currently only modifies $PATH.
2016-09-05 12:01:26 -04:00
Nikolay Amiantov
698cadd714
runVM: mount devpts
2016-09-04 17:11:01 +03:00
Nikolay Amiantov
8b38b6aae2
runVM: check exit code before postVM eval
2016-09-04 17:11:01 +03:00
Tuomas Tynkkynen
e2c6740c37
Merge commit 'adaee73' from staging into master
...
This one was already merged into release-16.09, so let's not have the
stable branch is ahead of master and confuse things. In addition to
that, currently we have an odd situation that master has less things
actually finished building than in staging.
Conflicts:
pkgs/data/documentation/man-pages/default.nix
2016-09-03 01:02:51 +03:00
Parnell Springmeyer
98c058a1ee
Adapting everything for the merged permissions wrappers work.
2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen
8c4aeb1780
Merge staging into master
...
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Eelco Dolstra
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Domen Kožar
da421bc75f
Fix #4210 : Remove builderDefs
...
This was one of the ways to build packages, we are trying
hard to minimize different ways so it's easier for newcomers
to learn only one way.
This also:
- removes texLive (old), fixes #14807
- removed upstream-updater, if that code is still used it should be in
separate repo
- changes a few packages like gitit/mit-scheme to use new texlive
2016-08-31 11:34:46 +02:00
Tuomas Tynkkynen
8576332fdf
grsec: Fix build after multiple output shuffling
...
Same problem with overrideDerivation as in
https://github.com/NixOS/nixpkgs/issues/10721 . Would be nice to have
that fixed...
2016-08-30 15:55:49 +03:00
Tuomas Tynkkynen
d3dc3d4130
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
...
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
5d55ae5d50
stdenv/multiple-outputs.sh: Change output propagation logic
...
Because 'dev' will most often not be the default output after my changes.
2016-08-29 14:49:51 +03:00
obadz
b74793bd1c
Merge branch 'master' into staging
...
Conflicts:
pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Joachim Fasting
e5c3a52afc
grsecurity: fix features.grsecurity
...
Previously, features.grsecurity wasn't actually set due to a bug in the
grsec builder. We now rely on the generic kernel builder to set features
from kernelPatches.
2016-08-29 04:09:40 +02:00
Franz Pletz
c0fa26ef3b
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-08-24 11:01:53 +02:00
Franz Pletz
8576aea57c
cc-wrapper: fix detection of unsupported linker flags
2016-08-24 10:59:52 +02:00
Franz Pletz
3c06e5f6f7
cc-wrapper: check ld hardening capabilities in stdenv
2016-08-23 18:13:31 +02:00
Robin Gloster
07604ad631
add-hardening.sh: fix quotation
2016-08-23 15:27:51 +00:00
Robin Gloster
335d0097cf
cc-wrapper: add-{flags,hardening} -> add-{flags,hardening}.sh
2016-08-23 15:27:51 +00:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
obadz
ba50fd7170
Merge branch 'master' into staging
2016-08-22 01:18:11 +01:00
Domen Kožar
76dca3d0e0
Merge pull request #17837 from MostAwesomeDude/fossil
...
build-support: Add fetchfossil function.
2016-08-21 21:47:00 +02:00
Corbin
76b74ab2f1
fetchfossil: Don't support MD5.
...
This effectively means that SHA256 is the only way to go. I'm not really
bothered by this.
2016-08-21 11:53:40 -07:00
Vladimír Čunát
cdb44a4ada
Merge branch 'master' into staging
2016-08-20 18:01:36 +02:00
cmfwyp
eb6f576ffd
fetchurl: update Savannah mirrors
2016-08-20 03:21:05 +03:00
Corbin
2d94071cc4
fetchfossil: Require rev.
...
Otherwise no bumps are done when upstream changes. Not sure how to ping the
repository and check without just doing the clone.
2016-08-19 13:55:10 -07:00
Daniel Peebles
57e6f19cad
Merge pull request #17794 from abbradar/nostdinc
...
cc-wrapper: handle -nostdinc{++,}
2016-08-19 16:35:35 -04:00
Thomas Tuegel
64ba7b53f1
Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"
...
This reverts commit da68127737
, reversing
changes made to 2ba494b728
.
These changes are reverted because they cause an incompatibility which
they should not.
2016-08-19 15:09:41 -05:00
Corbin
7880bc0c21
fetchfossil: Cleanup some copy-and-paste.
2016-08-19 07:34:58 -07:00
Corbin
23a50ca407
fetchfossil: Don't let Fossil write to $out/.fossil.
2016-08-18 23:16:37 -07:00
Corbin
20a0e2e3bf
build-support: Add fetchfossil function.
...
This is a dead-simple fetcher which clones a Fossil repository, opens it
directly into $out, and then nicks out the single Fossil checkout marker.
2016-08-18 22:29:30 -07:00
Matthew Bauer
6ceedaaee4
emacs: add versatile "emacsWrapper"
...
"emacsWrapper" replaces emacsWithPackages. In addition to "packagesFun",
emacsWrapper has an optional variable called "execStart". execStart can
be used to append elisp to the default site-start.el script. This is
useful for providing a way to load a user's .emacs.d/init.el
file. "emacsWithPackages" is implemented with emacsWrapper for
convenience and compatability.
2016-08-17 18:19:58 +00:00
Nikolay Amiantov
24f695ffaa
cc-wrapper: handle -nostdinc{++,}
2016-08-17 13:19:46 +03:00
Robin Gloster
33e1c78ae3
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-16 07:54:01 +00:00
Nikolay Amiantov
6d6f6b4748
makeModulesClosure: don't set pipefail as it's already set in $stdenv/setup
2016-08-14 22:38:33 +03:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
Luca Bruno
27f294f38d
Merge pull request #17589 from cmfwyp/sagemath
...
sagemath: update mirrors, fix TeX Live dependency
2016-08-12 21:58:41 +01:00
Domen Kožar
b9e009b5b5
add Fedora 24
2016-08-12 16:44:23 +02:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Michael Raskin
1eb5f8bfc7
update-walker: allow filtering for SF tarballs
2016-08-11 17:57:35 +02:00
obadz
1cd9c58834
Merge pull request #17461 from rasendubi/powerpc
...
cross-compilation: fixes for powerpc-linux-uclibc
2016-08-11 00:51:51 +01:00
cmfwyp
37c83ca3a2
sage: update mirrors
...
The list of mirrors is at https://www.sagemath.org/mirrors.html .
2016-08-07 21:09:14 -04:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Alexey Shmalko
662721a461
gcc-cross-wrapper: fix for non-chroot build
...
When `libc` is not set, many lines expand to `/lib`, `/include`, which
makes gccCross use host libraries outside Nix (with a different
architecture).
2016-08-03 03:28:14 +03:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
55b23aeff5
icon-conv-tools: Don't depend on the .nix file at build time
...
The `src = ./.;` would cause spurious rebuild of the package since the
output hash now depends on the contents of the .nix file.
2016-08-02 21:30:17 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810
treewide: Some EOF-whitespace fixes
2016-08-02 21:17:44 +03:00
Robin Gloster
1be4907ca2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-02 13:46:36 +00:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
Maarten Hoogendoorn
e809667b17
vmTools.runInLinuxImage: add virtio_rng device
...
This allows the QEMU VM's to use the /dev/random device, by
getting entropy from the host.
2016-07-31 12:39:19 +02:00