Shea Levy
2fe3a3c203
Merge branch 'grub' of git://github.com/ts468/nixpkgs
...
Fix grubTarget on nodev installs
2015-02-20 07:47:06 -05:00
tv
86cb16965a
exim: add version 4.85 incl. nixos module
2015-02-20 10:49:15 +01:00
Shea Levy
3e44f99055
Fix grub 1 install
2015-02-19 19:33:17 -05:00
Sander van der Burg
8d29cb2b00
In a test VM it's impossible to connect to itself, so fix this
2015-02-19 21:13:49 +00:00
Eelco Dolstra
5762f8f95c
Add options to support signed binary caches
...
Typical use:
nix.requireSignedBinaryCaches = true;
nix.binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ];
(The public key of cache.nixos.org is included by default.)
Note that this requires Nix 1.9 and that most of cache.nixos.org
hasn't been signed yet.
2015-02-19 14:22:43 +01:00
Jaka Hudoklin
ebfadc2fc9
Merge pull request #6452 from rushmorem/update-chronos-port
...
Update chronos default port
2015-02-19 14:13:00 +01:00
rushmorem
74b40e9a43
Add marathon mesos framework
2015-02-19 13:30:00 +02:00
rushmorem
a661802d29
Update chronos default port
...
Update chronos default port to match the one documented on
their website (http://airbnb.github.io/chronos ). The one in
their repo (the current one) clashes with the marathon documented
one.
2015-02-19 12:31:12 +02:00
Eelco Dolstra
4ac280ec49
Blacklist the nouveau driver on EC2
2015-02-18 13:04:10 +01:00
Sou Bunnbu
f8dbd6f9ae
Merge pull request #6427 from grwlf/vsftpd-port
...
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 19:18:34 +08:00
Sergey Mironov
ac65a757f0
vsftpd.nix: add 'portPromiscuous' option
2015-02-18 11:51:43 +03:00
Mathijs Kwik
2fe44b95d0
nixos/wpa_supplicant: fix conflicting documentation
...
fixes #6298
2015-02-17 22:16:20 +01:00
James Cook
6daf9aa922
Merge pull request #5995 from ts468/qemu-vm
...
Update QEMU Nixos Virtual Machine
2015-02-16 13:13:26 -08:00
Thomas Strobel
c61ff9b51e
Fix grubTarget on nodev installs
2015-02-16 20:19:44 +01:00
Thomas Strobel
80afabd5b5
Update QEMU Nixos Virtual Machine
...
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
2015-02-16 20:07:42 +01:00
Evgeny Egorochkin
4621f16b34
azure: add a job to download ssh host and root keys if they are made available via "custom data"; see #3986
2015-02-16 16:54:30 +02:00
Eelco Dolstra
5d7000df68
Automatically set nix.nrBuildUsers to at least nix.maxJobs
2015-02-16 12:02:49 +01:00
Wout Mertens
65438da88a
Merge pull request #6357 from NixOS/jobs-vs-users
...
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-16 11:42:24 +01:00
Rob Vermaas
824fccd3e9
Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.
...
(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
2015-02-16 09:57:19 +00:00
Eelco Dolstra
5092d625d6
/etc/ssl/certs/ca-bundle.crt -> ca-certificates.crt
...
Even though there is no "official" standard location, it's better to
stick to what most distros are using.
2015-02-15 19:06:31 +01:00
Eelco Dolstra
75e1b5e317
Provide symlinks to ca-bundle.crt for compat with other distros
...
There is no "standard" location for the certificate bundle, so many
programs/libraries have various hard-coded default locations that
don't exist on NixOS. To make these more likely to work, provide
some symlinks.
2015-02-15 19:06:31 +01:00
AndersonTorres
f19ed980a2
Sawfish (git): New Package
...
Sawfish is a versatile, Lisp-based window manager
In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
Wout Mertens
d41367735d
nix-daemon: Sanity check maxJobs vs nrBuildUsers
2015-02-15 15:37:30 +01:00
James Cook
33550b6efe
Merge pull request #5665 from joachifm/dnscrypt-proxy-apparmor-updates
...
dnscrypt-proxy service: update AppArmor profile
2015-02-14 22:02:31 -08:00
William A. Kennington III
23e1b46f17
nixos/tests/installer: Add all bootloaders to the store
2015-02-13 14:41:11 -08:00
William A. Kennington III
1fddcd1e83
grub: Don't remove zfs support if contained in the default binary
2015-02-13 14:40:41 -08:00
William A. Kennington III
69a277e2cc
iwlegacy: Remove since it is already in linux-firmware-nonfree
2015-02-13 14:27:47 -08:00
Harald van Dijk
0fe9d58e4e
stage-1-init: fix PID 1 shell
...
The PID 1 shell is executed as the last command in a sh invocation. Some
shells implicitly use exec for that, but the current busybox ash does not,
so the shell gets a wrong PID. Spell out the exec.
2015-02-13 10:20:29 +00:00
lethalman
51a7277fac
Merge pull request #6312 from k0ral/sslh
...
sslh: added libwrap support + improved nixos module.
2015-02-13 10:03:48 +01:00
Domen Kožar
5a4614dc1f
Add hid_lenovo to initrd kernel modules
2015-02-13 01:42:13 +01:00
Jaka Hudoklin
2f2d638d38
Merge pull request #6317 from offlinehacker/nixos/consul/alerts
...
nixos/consul: add consul-alerts service
2015-02-12 21:39:09 +00:00
William A. Kennington III
e2915fc5d1
nixos/tests: Fix installer test by providing a missing dependency
2015-02-12 11:36:02 -08:00
Jaka Hudoklin
a17f5c8c9b
nixos/consul: add consul-alerts service
2015-02-12 19:16:50 +01:00
Jaka Hudoklin
36e7a61dde
Merge pull request #6222 from offlinehacker/limesurvey
...
add limesurvey package and nixos module
2015-02-12 18:07:42 +00:00
Eelco Dolstra
1907ca8a2a
Drop tests.installer.grub1 as release critical
...
This test sometimes fails with
Kernel panic - not syncing: assertion "i && sym_get_cam_status(cp->cmd) == DID_SOFT_ERROR" failed: file "/tmp/nix-build-linux-3.14.32.drv-0/linux-3.14.32/drivers/scsi/sym53c8xx_2/sym_hipd.c", line 3399
after "sd 2:0:0:0: ABORT operation timed-out."
Since we don't care all that much about GRUB 1 anymore, don't make the
release depend on it.
http://hydra.nixos.org/build/19563197
2015-02-12 16:20:00 +01:00
koral
cb153cfca3
sslh: added libwrap support + improved nixos module.
2015-02-12 13:21:36 +01:00
William A. Kennington III
35e9d3c112
nixos/zfs: Use the git version for kernels unsupported by 0.6.3
2015-02-11 15:11:56 -08:00
Luca Bruno
e088fd0314
Revert "Merge pull request #5626 from matthiasbeyer/add-fish_shell_module"
...
This reverts commit 157d199b33
, reversing
changes made to 4c7adddcb7
.
2015-02-11 18:31:11 +01:00
Luca Bruno
c427b48ba6
Revert "Add fish to nixos module list"
...
This reverts commit d7f5d00f0a
.
2015-02-11 18:30:58 +01:00
Luca Bruno
d7f5d00f0a
Add fish to nixos module list
2015-02-11 14:05:30 +00:00
lethalman
157d199b33
Merge pull request #5626 from matthiasbeyer/add-fish_shell_module
...
Add basic nixos module for fish shell
2015-02-11 15:05:03 +01:00
Luca Bruno
f7b26bf98f
gnome3: Set XCURSOR_PATH. Closes #6191
2015-02-11 11:48:51 +00:00
Bjørn Forsman
7a6af47cca
nixos/tests/jenkins: increase timeout to 6 minutes
...
Fixes the test failure, at least on my system.
2015-02-10 16:50:50 +01:00
lethalman
c1d22c947e
Merge pull request #6278 from bendlas/cdemu
...
Add cdemu packages and module
2015-02-10 15:33:06 +01:00
Herwig Hochleitner
983fddcea8
Move cdemu module into programs
2015-02-10 13:14:09 +01:00
lethalman
12834a8500
Merge pull request #6072 from AndersonTorres/window-managers
...
Update NixOS module files to include WindowMaker
2015-02-10 13:06:06 +01:00
Herwig Hochleitner
b909def3e1
Whitespace cleanup
2015-02-10 11:49:32 +01:00
lethalman
93ebaafabe
Merge pull request #6170 from k0ral/sslh
...
New sslh module
2015-02-10 11:17:56 +01:00
lethalman
7614b2f984
Merge pull request #6229 from devhell/canto
...
canto-{curses,daemon}: Add packages
2015-02-10 10:34:11 +01:00
Luca Bruno
d06122c58d
Add PermissionsStartOnly to mpd service. Closes #6277
2015-02-10 10:18:54 +01:00