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
Tomasz Kontusz
6c9ce23c00
cc-wrapper: Fix a typo in param parsing ( close #14401 )
2016-04-02 20:51:48 +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
Nikolay Amiantov
87607af7a1
cc-wrapper: add C++-specific paths if -x c++
is passed
2016-03-14 06:58:18 +03:00
Nicolas B. Pierron
72c6f8a140
Ensure that we can evaluate the platform attribute of ocaml packages.
2016-03-13 19:08:26 +00:00
Nicolas B. Pierron
6313a5698a
Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.
2016-03-13 18:25:52 +00:00
Vladimír Čunát
ab0bc1ecaf
symlinkJoin: preferLocalBuild && !allowSubstitutes
2016-03-11 15:59:18 +01:00
Eelco Dolstra
2af1cb3aa6
Merge remote-tracking branch 'origin/binutils-2.26' into staging
...
This still breaks a few packages, but nothing really major:
http://hydra.nixos.org/eval/1241850?filter=x86_64-linux&compare=1237919&full=#tabs-now-fail
2016-03-11 11:58:49 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
eb5a897161
Merge remote-tracking branch 'origin/pr/13505'
...
Fixes #13505 .
2016-03-08 01:01:44 +01:00
zimbatm
5e5494a852
make-wrapper.sh: add an --unset argument
...
`--set FOO ""` is not strictly equivalent to `--unset FOO`. In the former case
the environment variable still exists with an empty string as a value.
2016-03-06 22:48:14 +00:00
Profpatsch
82fa1a796b
lib/copyPathToStore: annotate docstring
2016-03-01 15:26:35 +01:00
zimbatm
0d2e437fc9
Merge pull request #13584 from zimbatm/nix-prefetch-git-json
...
nix-prefetch-git: change the default output to JSON
2016-03-01 10:07:00 +00:00
Lluís Batlle i Rossell
202ebf794c
vm/rpm/rpm-closure.pl: make it deterministic
...
Some recent perl version introduced "keys" to return the keys
in random order. As some of the packages are solved by "provides" and
based on the order, this randomness affects what packages get into the
closure.
This problem may be in other nix perl scripts.
2016-03-01 11:02:42 +01:00
zimbatm
90de261f33
nix-prefetch-git: change the default output to JSON
...
As discussed on the mailing list. The nix output was short-lived so it's
probably okay to change it.
2016-02-29 22:47:16 +00:00
Luca Bruno
5f8311775c
chromium: add StartupWMClass to desktop file. Fixes #12433
2016-02-29 20:42:58 +01:00
zimbatm
6d9cc54089
build-maven: use lib.importJSON
2016-02-29 13:49:29 +00:00
tg(x)
38614d3f6a
grsecurity: use kernel version instead of testing / stable
2016-02-28 04:10:59 +01:00
Eelco Dolstra
d5bb6a1f9c
glibc: Enable separate debug symbols
...
The importance of glibc makes it worthwhile to provide debug
symbols. However, this revealed an issue with separateDebugInfo: it
was indiscriminately adding --build-id to all ld invocations, while in
fact it should only do that for final links. Glibc also uses non-final
("relocatable") links, leading to subsequent failure to apply a build
ID ("Cannot create .note.gnu.build-id section, --build-id
ignored"). So now ld-wrapper.sh only passes --build-id for final
links.
2016-02-28 02:57:37 +01:00
Eelco Dolstra
69a337edae
separateDebugInfo: Compress debug sections at compile/link time
2016-02-28 01:54:55 +01:00
Eelco Dolstra
2040a9ac57
stdenv-linux: Ensure binutils comes before bootstrapTools in $PATH
...
Otherwise, when building glibc and other packages, the "strip" from
bootstrapTools is used, which doesn't recognise some tags produced by
the newer "ld" from binutils.
2016-02-28 01:13:15 +01:00
zimbatm
de124cfa79
Merge pull request #11671 from timbertson/fetchgit
...
fetchgit: output improvements
2016-02-27 22:45:07 +00:00
Eelco Dolstra
e6f61b4cf3
fetchurlBoot: Use Nix's builtin fetchurl function
...
This removes the need for curl in bootstrapTools, and enables https
for bootstrap tarballs.
2016-02-27 20:27:24 +01:00
tg(x)
4e3d6d3e90
grsecurity: separate fix patches for testing & stable
2016-02-27 19:54:55 +01:00
tg(x)
7547960546
grsecurity: move version information to one place
2016-02-27 18:36:12 +01:00
tg(x)
d95321b83e
grsecurity: 4.3.4 -> 4.4.2
2016-02-27 18:36:12 +01:00
Tim Cuthbertson
21547a61ba
nix-prefetch-git: print out valid nix expression; make --quiet very quiet
2016-02-27 21:26:35 +11:00
Tim Cuthbertson
456cbb29d9
nix-prefetch-git: add --quiet flag and minor cleanup
2016-02-27 16:56:38 +11:00
zimbatm
35ab3d301f
Merge remote-tracking branch 'upstream/staging'
2016-02-26 22:37:04 +00:00
Tony White
4806cddda3
fetchurl: use kernel.org cdn by default
...
- use http://cdn.kernel.org/pub/ as the default mirror
for kernel source requests.
Discovered by browsing :
https://www.kernel.org/introducing-fastly-cdn.html
2016-02-26 21:32:00 +00:00
zimbatm
d2f3e250cf
Merge pull request #8576 from obadz/nix-prefetch-zip
...
Add --ext option to nix-prefetch-zip
2016-02-26 00:57:30 +00:00