Vladimír Čunát
030af0a803
fix .xz in stdenv bootstrap
...
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
2014-08-30 15:48:17 +02:00
Vladimír Čunát
2f92199183
multiout: resolve general ToDos
2014-08-30 08:54:27 +02:00
Vladimír Čunát
886da114ae
gawkInteractive: fix eval
2014-08-30 08:35:28 +02:00
Vladimír Čunát
031baae714
Merge branch 'staging' into v/modular
...
Conflicts (as in p/modular-stdenv):
pkgs/stdenv/linux/default.nix
2014-08-30 08:33:10 +02:00
Vladimír Čunát
a70180ba73
mutiout: make it builtin
2014-08-30 08:27:43 +02:00
Mateusz Kowalczyk
60902b97fe
ed: update to 1.10 ( close #3852 )
2014-08-29 13:58:51 +02:00
Gergely Risko
dd3f3bdcc2
GCC >= 4.8 doesn't depend on ppl
2014-08-29 11:45:22 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +02:00
Gergely Risko
1f2b636ff6
Fix zlib handling in stdenvLinux
...
Previously stdenv depended on two different zlibs and there was a third
one in the top-level package set for other purposes. This commit merges
all this zlibs to one.
2014-08-26 17:17:13 +02:00
Vladimír Čunát
4dccb224c5
WIP2
2014-08-26 01:10:56 +02:00
Vladimír Čunát
3ec413cece
WIP
2014-08-25 15:30:46 +02:00
Vladimír Čunát
77da5efc78
merge the rest of multiple-outputs
...
Conflicts:
pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
pkgs/development/tools/misc/patchelf/default.nix (easy)
pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát
c96f4d7949
gcc, glibc: merge changes from original multiple-output
...
Can't be done automatically because of file copies/moves.
2014-08-25 10:29:54 +02:00
Eelco Dolstra
f5d648e27d
Fix evaluation
2014-08-25 09:35:06 +02:00
Vladimír Čunát
def75f0282
stdenv: add first iteration of the multiout hook
...
Now it should contain *all* information from stdenv/setup.sh of
the original mutiple-output branch.
However, the configurability of the output paths is much greater.
2014-08-24 19:07:47 +02:00
Vladimír Čunát
4e72b61de9
stdenv/setup.sh: add $propagateIntoInput
...
This is needed for multiple-output derivations,
where it is desirable to propagate deps and setup-hooks into $dev instead of $out.
Also drop an unused simple function which will not even make sense.
2014-08-24 18:37:23 +02:00
Eelco Dolstra
27d3984935
Indentation
2014-08-24 18:08:23 +02:00
Eelco Dolstra
0f7cb13f38
Merge branch 'nilcons-contrib-stdenv_stages_refactor' into staging
2014-08-24 18:03:00 +02:00
Gergely Risko
ea65229f70
Refactor stages to only ever refer to the previous stage
...
This commit doesn't change the outhash (or drvhash) of the stdenv.
2014-08-24 17:10:55 +02:00
Gergely Risko
49e5837780
Move wrapGCC helper up
...
This commit doesn't change the outhash (or drvhash) of the stdenv.
2014-08-24 17:10:53 +02:00
Gergely Risko
350022247a
Refactor stage handling in stdenvLinux
...
Make stages explicit and generalize the pattern of having an stdenv and
a pkgs collection for all stages to a common stage generating function
called stageFun.
Rewrite all stage handling with this new function.
This commit doesn't change the outhash (or drvhash) of the stdenv.
2014-08-24 17:10:50 +02:00
Gergely Risko
142970b9eb
Refactor wrapGCC in stdenvLinux
...
Don't use default parameter values, to make the callsites more readable
and for easier debuggability/changability. Also reordered the
callsites' parameter ordering for consistency.
In the final stdenv don't repeat the name of the shell.
This commit doesn't change the outhash (or drvhash) of the stdenv.
2014-08-24 17:10:37 +02:00
Gergely Risko
8a445f9237
Refactor fetchurl handling in stdenvLinux
...
All the different stages of stdenv had the fetchurl inherited anyways,
so make this generic in stdenvBootFun.
This commit doesn't change the outhash (or drvhash) of the stdenv.
2014-08-24 17:10:05 +02:00
Vladimír Čunát
694fa543af
Merge 'staging'
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Vladimír Čunát
86a372683a
xorg: stop using the new nix syntax
...
Partial revert of 5ea8497933
2014-08-24 10:47:14 +02:00
Vladimír Čunát
a835b282fe
another fixup: stripFlags
2014-08-23 18:42:33 +02:00
Vladimír Čunát
6eb7e42b5b
merge fixup
2014-08-23 17:02:39 +02:00
Vladimír Čunát
8c8197dfb3
xorg: stop using the new nix syntax
...
Partial revert of 5ea8497933
2014-08-23 16:15:28 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Vladimír Čunát
0df6ccb4b6
orc: disable tests on i686
...
The failing test doesn't even work in the commit that introduced it.
2014-08-23 15:17:06 +02:00
Eelco Dolstra
2c62a36b77
Merge remote-tracking branch 'origin/staging' into modular-stdenv
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Vladimír Čunát
084626deec
glew: update, and tweak meta
2014-08-21 21:28:42 +02:00
Vladimír Čunát
59e3e06076
xorg: update probably unused modules
2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844
xorg.xrandr: minor bugfix update
2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd
xorg.xcb (lib+proto): update (seems mainly bug fixes)
2014-08-21 15:13:21 +02:00
Vladimír Čunát
315b8ec8f6
orc: bugfix updates
2014-08-21 15:13:21 +02:00
Vladimír Čunát
ead8f2ba0a
mesa: bugfix update
2014-08-21 15:13:20 +02:00
Vladimír Čunát
30fef8a3cf
readline: remove unused old versions 4 and 5
...
...including an unused patch.
2014-08-21 15:13:20 +02:00
Vladimír Čunát
50b65a7f8e
readline: use 6.3 by default
...
I found no build regressions with the most common dependents.
It's possible that older readline branches may be vulnerable,
although the last one announced seemed not to affect regular packages.
2014-08-21 15:13:19 +02:00
Vladimír Čunát
2b75fe851b
readline-6.3: update, including security fixes
...
Close #3706 CVE-2014-2524 (likely not affecting any our program anyway).
2014-08-21 15:13:19 +02:00
Vladimír Čunát
3775fa9ea2
subversion+serf: security update to fix CVE-2014-3504
...
Thanks to nixpkgs monitor again.
2014-08-21 15:13:19 +02:00
Vladimír Čunát
32f95153a1
ffmpeg (_1 and default _2): minor update, incl. security
...
CVE-2014-{5271,5272}
2014-08-21 15:13:18 +02:00
Vladimír Čunát
91db3f6b45
kde4: security patch for CVE-2014-5033
2014-08-21 15:13:18 +02:00
Vladimír Čunát
d4e9fd2a90
Merge recent master into staging
...
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Vladimír Čunát
2d03fbf752
twinkle eval: fix the typo
2014-08-20 23:38:43 +02:00
Vladimír Čunát
25351012b2
nvidia: fix problems with -glsi and glx
...
..by generalizing the build script.
Obsoletes #3699 , and it should finally fix problems around 816d971a
2014-08-20 23:37:41 +02:00
Luca Bruno
facb810bcc
rhash: new package
...
Console utility for computing and verifying hash sums of files
http://rhash.anz.ru
2014-08-21 00:46:35 +02:00
Peter Simons
460885dfa5
Merge pull request #3696 from matejc/root_default_shell
...
use mkDefault on root's shell
2014-08-20 22:44:01 +02:00
Vladimír Čunát
c198a36898
twinkle: fix build ( fixes #3673 )
...
Pulled patches from Debian and hacked around linking errors.
I'm able to ring my mobile phone now.
However, on exit the process is stuck and needs kill -9.
CC: maintainer @MarcWeber.
2014-08-20 21:32:19 +02:00
Matej Cotman
f4b5cd9f3f
use mkDefault on root's shell
2014-08-20 21:17:48 +02:00
