Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Stefan Junker
2e6b257edf
rkt: 1.5.1 -> 1.7.0 ( #15958 )
2016-06-08 16:43:42 +01:00
Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
zimbatm
a6593a16f7
virtualbox: give full url for downloading the ext ( #15869 )
...
The user only has to agree on the terms and conditions before
downloading the file. We might as well give him access to the full URL
by default.
2016-06-01 10:01:04 +01:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
obadz
f0de1c75b5
docker: fix build with systemd 230
2016-05-27 15:42:15 +01:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Rickard Nilsson
13b8606241
qemu: 2.5.1 -> 2.6.0
2016-05-25 10:42:45 +02:00
Nathan Zadoks
99177c7377
docker: remove enableLxc parameter
...
LXC support was removed in Docker 1.4 (November 2015), and isn't coming
back.
2016-05-24 11:08:20 -04:00
Tuomas Tynkkynen
f81af4e6f0
treewide: Make explicit that 'dev' output of glib is used
2016-05-19 10:00:35 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Michael Raskin
fde921578a
virtualboxGuestAdditions: update hash for virtualbox 5.0.20
2016-05-17 08:44:32 +02:00
Michael Raskin
4f5e4ad69c
virtualbox: 5.0.14 -> 5.0.20
2016-05-16 22:42:27 +02:00
zimbatm
3ade1e7d3e
Merge branch 'pr/14911'
2016-05-05 21:28:27 +01:00
Joaquim Pedro França Simão
133dc10e5a
open-vm-tools: fixes host VMware errors
2016-05-05 21:27:54 +01:00
Joaquim Pedro França Simão
0ecef73966
open-vm-tools: updates to 10.0.7 and fixes compilation erros
2016-05-05 21:27:54 +01:00
Stefan Junker
213f0f23a8
rkt: 1.4.0 -> 1.5.1
2016-05-05 12:01:58 +02:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Stefan Junker
07d305af32
rkt: 1.2.0 -> 1.4.0
2016-04-23 20:57:19 +02:00
Sheena Artrip
50d6c3ba38
virtualbox: obey NIX_BUILD_CORES for make invocation
2016-04-22 02:41:23 -04:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Nathan Zadoks
ebdd600732
docker: allow disabling btrfs and devicemapper
2016-04-17 00:41:17 +02:00
obadz
bf5e339d24
virtualbox: dontPatchELF = true
...
Workaround patchelf#93 and help move forward on #14595
2016-04-14 17:05:31 +01: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
Franz Pletz
2463e09173
virtinst: Fix cherry-pick merge
2016-04-10 01:26:45 +02:00
Robin Gloster
fe974894e2
virt-manager: remove sqlalchemy from (transitive) dependencies
...
Is not used according to source code
2016-04-10 01:21:46 +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
Robin Gloster
3437b52e6b
qboot: turn off stackprotector and pic hardening
2016-04-03 11:41:30 +00:00
Robin Gloster
696d85a62d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-03 11:01:57 +00: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
Frederik Rietdijk
97a29ff817
Merge pull request #14110 from lancelotsix/clean_sqlalchemy_legacy
...
Clean sqlalchemy legacy
2016-03-31 10:52:53 +02:00
Franz Pletz
2e08d8234e
Merge remote-tracking branch 'origin/master'
2016-03-31 10:06:30 +02:00
Domen Kožar
8a34a3b37a
qemu: 2.5.0 -> 2.5.1
...
Hopefully this also fixes installer tests on i686
2016-03-30 15:12:41 +01:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
Derek Gonyeo
587fbb5b15
rkt: v1.1.0 -> v1.2.0
2016-03-22 14:59:55 -07:00
Lancelot SIX
8dd955cc10
virtinst: remove sqlalchemy7 dependency
...
sqlalchemy is never used:
```
$ nix-shell default.nix -A virtinst
$ unpackPhase && cd virtinst-*
$ grep -r sqlalchemy .
$
```
2016-03-21 21:09:20 +01:00
Pierre Dal-Pra
d97805ccd0
docker: 1.10.0 -> 1.10.3
2016-03-18 22:12:42 +01:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Domen Kožar
9ad60eae48
xen: remove unneeded depds now that stubdom is disabled
2016-03-09 18:56:25 +00:00
Domen Kožar
086a7d138d
xen: disable stubdom due to #13590
2016-03-09 13:51:45 +00: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
40d90ef8ac
Merge pull request #13561 from matthewbauer/qemu-mac
...
qemu: compile with cocoa for darwin support
2016-03-08 02:15:09 +01:00
Robin Gloster
1b4ec4b495
linuxPackages.virtualbox: disable fortify/pic/stackprotector
2016-03-06 15:48:16 +00:00
Franz Pletz
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Frederik Rietdijk
36506df7fe
Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default
...
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
2016-03-05 11:07:50 -05:00
Matthew Bauer
864ec69c84
qemu: compile with cocoa for darwin support
...
This uses the --enable-cocoa flag in qemu to build in Darwin.
2016-03-04 17:45:34 -06:00
Adam Boseley
5b83791207
spice-vdagentd service : initial at 0.16.0
2016-03-05 07:56:47 +10:00
Stefan Junker
13bd76b525
pkgs/rkt: 1.0.0 -> 1.1.0
2016-03-03 19:57:15 +01:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00