ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 23:57:42 +03:00
Code Issues Projects Releases Wiki Activity
59,952 Commits 96 Branches 102 Tags 4.3 GiB
6b64cd207c
Commit Graph

2556 Commits

Author SHA1 Message Date
aszlig
030895f075
nixos/dhcpcd: Only run resume commands if enabled. 
The networkd implementation sets systemd.services.dhcpcd.enable to
false in nixos/modules/tasks/network-interfaces-systemd.nix. So we need
to respect that in the dhcpcd module.

If we don't, the resumeCommand is set nevertheless, which causes the
post-resume.service to fail after resuming:

Failed to reload dhcpcd.service: Unit dhcpcd.service is masked.
post-resume.service: main process exited, code=exited, status=1/FAILURE
Failed to start Post-Resume Actions.
Dependency failed for Post-Resume Actions.
Unit post-resume.service entered failed state.
post-resume.service failed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 08:09:04 +01:00
aszlig
9de4caddc1
nixos/tests/chromium: Check new userns sandbox. 
Since Chromium version 42, we have a new user namespaces sandbox in the
upstream project. It's more integrated so the chrome://sandbox page
reports it as "Namespace Sandbox" instead of SUID sandbox, which we were
re-using (or abusing?) in our patch.

So if either "SUID Sandbox" or "Namespace Sandbox" reports with "Yes",
it's fine on our side.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-02-22 07:52:53 +01:00
Thomas Tuegel
d15d0bebc3 kde5: remove file collisions 2015-02-21 20:58:43 -06:00
Thomas Tuegel
68f2db74ff kde5: always use plasma-nm 2015-02-21 13:59:28 -06:00
Thomas Tuegel
7eb8a9b41f kde5: install media-player-info udev rules for solid 2015-02-21 11:39:21 -06:00
Thomas Tuegel
532650e4bb kde5: change notice about default Phonon backend 2015-02-21 11:39:21 -06:00
Thomas Tuegel
e5de75bf2a kde5: install kde-frameworks version used by plasma 2015-02-21 11:39:21 -06:00
Thomas Tuegel
b050babd3e kde5: fix Phonon GStreamer backend 2015-02-21 11:39:20 -06:00
Thomas Tuegel
a79936561b environment: use Qt 5 Qml import paths 2015-02-21 11:39:20 -06:00
Vladimír Čunát
a3a467ce77 nixos/nvidia: use correct 32-bit legacy libs; refactor 
Fixes #6127.
Now we avoid multiple switches among the version possibilities.
 2015-02-21 16:34:24 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Thomas Strobel
c62e42e9c5 Enhance stage-1/2 scripts for better dealing with squashfs 2015-02-20 17:42:22 +01:00
Peter Simons
263a49be20 Merge pull request #5704 from eduarrrd/nixos-version 
Add option to display git revision to nixos-version
 2015-02-20 16:35:56 +01:00
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
koral
d9078d03a3 Updated fcgiwrap's systemd unit to match upstream version. 2015-02-18 21:19:12 +00: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 213fe8427c)
 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
Brian McKenna
28a9ed618f Add more options to multitouch (mtrack) module 2015-02-14 14:56:12 -07: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
Michael Alan Dorman
f21cab27a4 Fix initial-install issues with couchdb.nix. 
When starting from a clean slate, the couchdb service fails.

First, the pre-start script fails because it tries to chown the uriFile,
which doesn't exist.  It also doesn't ensure that the directory in which
the uriFIle is placed is writeable by couchdb, which could also cause
failure (though I didn't observe this).

Additionally, the log file's default location isn't a directory owned by
couchdb, nor is the file guaranteed to exist, nor is it guaranteed to be
chowned to the appropriate user.  All of which can cause unexpected
failure.

As a bonus I made a small change in the description of the configFile
attribute, in the hopes of making it a little more obvious why it
existed.
 2015-02-11 20:42:52 -05: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
Herwig Hochleitner
2961b83d08 Add cdemu packages and module 2015-02-10 06:49:47 +01:00
William A. Kennington III
650b2258f0 nonfree-firmware: Use the new kernel.org repository for tracking nonfree firmware changes 
remove the obsolete iwlwifi firmware which is included in the repo.
 2015-02-09 16:28:40 -08:00
William A. Kennington III
b556983eb7 nixos/system: Add xhci_pci as it is needed to detect host buses in the initrd for usb keyboards on the xhci bus and storage devices on the iso 2015-02-09 13:09:26 -08:00
Wout Mertens
8f42f33c45 stage-1-init: better warnings 
- Suppress spurious LVM FD3 warning:
  See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432986
- Warn when device doesn't come online
 2015-02-09 21:53:51 +01:00
Shea Levy
24c0844cfb Fix grub on nodev installs 2015-02-08 22:31:14 -05:00
William A. Kennington III
c4bec1a0a4 Merge pull request #6152 from abbradar/samba-clean 
nixos/samba: cleanup and update defaults
 2015-02-08 14:20:49 -08:00
William A. Kennington III
2a0754ccbc Merge pull request #5994 from ts468/grub 
Add 'target' parameter for GRUB installation chain
 2015-02-08 14:18:13 -08:00
devhell
a9ac564f50 canto-daemon: Fix typo and remove TimeoutStopSec 2015-02-08 14:16:17 +00:00
devhell
d6e9df1e1a canto-daemon: Add a systemd service 
This adds a systemd service for the canto-daemon.
 2015-02-08 14:16:17 +00:00
Domen Kožar
b83433cdd1 Remove gui (see #6207), use nixui instead 2015-02-08 10:47:58 +01:00
William A. Kennington III
42a6ac5209 nixos/iso: Increase efi image size to 15M 2015-02-07 20:38:24 -08:00
William A. Kennington III
0fa4c9d6d3 nixos/zfs: Fix references to zfs packages now that they are split 2015-02-07 15:07:39 -08:00
Jaka Hudoklin
41ae4d1af9 add limesurvey package and nixos module 2015-02-07 23:18:51 +01:00
Jaka Hudoklin
f85abb041a Merge pull request #5622 from offlinehacker/panamax 
panamax: new package and service
 2015-02-07 14:56:25 +00:00
Jaka Hudoklin
769fb8a141 Merge pull request #5486 from matejc/fixgatewayd 
systemd-journal-gatewayd: add systemd-journal group
 2015-02-07 14:52:31 +00:00
Jaka Hudoklin
ae34f923f7 panamax: simplify, refactor, add test 2015-02-07 15:32:20 +01:00
Matej Cotman
8c79a2df63 panamax: new package and service 2015-02-07 15:32:20 +01:00
William A. Kennington III
9792b12e53 nixos/openntpd: Don't start until we have networking 
This attempts to fix an issues where ntp is unable to resolve hostnames
because it came up before local nameservers or networking.
 2015-02-06 14:45:47 -08:00
Wout Mertens
1d9d947c25 Merge pull request #6187 from abbradar/notes-unstable 
Add release-notes for unstable revision
 2015-02-06 14:17:25 +01:00
William A. Kennington III
3e280f2089 nixos/tinc: Fix key generation behavior and use tinc 1.1 by default 2015-02-05 23:37:20 -08:00
Nikolay Amiantov
540e3a63e4 manual/release-notes: add unstable release notes with first entries 2015-02-06 02:57:49 +03:00
Eelco Dolstra
d2bfb5ceb0 Add options for installing additional root certificates 2015-02-05 18:08:35 +01:00
Nikolay Amiantov
f35568e705 Merge pull request #5277 from abbradar/uwsgi 
Add uWSGI application server
 2015-02-05 17:10:37 +03:00
koral
1439e72147 New sslh module. 2015-02-05 13:30:39 +01:00
Edward Tjörnhammar
83925c33f6 i2pd: 0.6.0 -> 0.7.0 
nixos: i2pd.service, fix string escaping
 2015-02-05 12:09:59 +01:00
Vladimír Čunát
18380d2790 nixos/tests: fix printing after 0caae022fd 2015-02-05 10:51:47 +01:00
William A. Kennington III
9ddb6c9cc9 nixos/tinc: Add daemon configuration 2015-02-04 18:19:04 -08:00
William A. Kennington III
bae5faa82d nixos/dhcpd: Also try restarting openntpd as it suffers the same dns resolution problem 2015-02-04 17:33:14 -08:00
William A. Kennington III
43d8b1ef3c openntpd: Fixes 2015-02-04 17:30:22 -08:00
William A. Kennington III
a9f1329d2d nixos/openntpd: Add openntpd to the environment for ntpctl 2015-02-04 17:27:03 -08:00
Nikolay Amiantov
b22a1ff683 Merge pull request #4485 from abbradar/parsoid 
Add "parsoid" service
 2015-02-04 23:08:28 +03:00
Nikolay Amiantov
b903bf0a57 nixos/samba: cleanup and update defaults 2015-02-04 22:31:50 +03:00
AndersonTorres
fff55a968e Update NixOS module files to include WindowMaker 
According to a hint on NixOS mailing list[1], I updated nixos/modules/services/x11/window-managers/default.nix
to include windowmaker.

1 - https://github.com/NixOS/nixpkgs/pull/4066#issuecomment-72017611
 2015-02-03 21:24:12 -02:00
Lukas Lihotzki
c848d05de9 gitlab: Fix typo 2015-02-03 22:08:10 +01:00
lethalman
49b67bb9cb Merge pull request #6078 from boothead/sabnzbd 
sabnzbd Change service to systemd
 2015-02-03 13:32:59 +01:00
Peter Simons
b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper 
nixos/xmonad: make a wrapper
 2015-02-03 11:52:09 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Nikolay Amiantov
b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Nikolay Amiantov
51681449da uwsgi: add nixos module 2015-02-02 22:23:42 +03:00
Nikolay Amiantov
9a04482af7 parsoid: add service 2015-02-02 22:21:45 +03:00
Thomas Tuegel
0fee7a2b21 fontconfig: stringify dpi correctly 2015-02-01 16:18:48 -06:00
Bjørn Forsman
ee52a61e3a nixos/tftpd: add option types and fixup descriptions 
The first description is a (incorrect) copy/paste from the 'vsftpd'
module, and the second option lacks a 'dot' at the end.
 2015-02-01 15:57:28 +01:00
lethalman
9576ff49d8 Merge pull request #5737 from matthiasbeyer/add-gitolite_admin_pubkey_oneline_note 
Add note that admin-pub-key for gitolite has to be written in one line
 2015-01-30 11:24:06 +01:00
lethalman
41cca7d2d6 Merge pull request #6045 from ragnard/apache-kafka 
apache-kafka: New package and service
 2015-01-30 10:50:14 +01:00
Luca Bruno
a239775488 Merge PR #5772, boot.loader.timeout 2015-01-30 10:39:50 +01:00
Bob van der Linden
a3d5f4f3ef nixos: gummiboot: change default to 1000 if boot.loader.timeout is null 
When gummiboot.timeout == null, the menu will still be skipped.
When gummiboot.timeout == 0, the menu will also be skipped.
The only way to show the menu 'indefinitely' is to show it a long time.
 2015-01-30 10:36:21 +01:00
Bob van der Linden
f93ba51469 nixos: loader: added generic config.boot.loader.timeout option 
timeout options of grub and gummiboot will inherit the value of this
option by default.
 2015-01-30 09:53:44 +01:00
Shea Levy
52d4b9d982 Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs 2015-01-30 01:07:59 -05:00
Ragnar Dahlén
17bd96ea25 apache-kafka: New service for Apache Kafka 2015-01-29 11:10:22 +00:00
lethalman
a15edc22e3 Merge pull request #5615 from nckx/freefall 
Add freefall: hard drive protection on HP/Dell laptops
 2015-01-28 18:52:46 +01:00
Eelco Dolstra
378006f0f2 Restrict the length of container names 2015-01-28 16:13:00 +01:00
Jaka Hudoklin
c0eff1de61 Merge pull request #5939 from offlinehacker/nixos/containers/containers_in_containers 
nixos/containers: make containers in containers possible
 2015-01-28 16:07:17 +01:00
Jaka Hudoklin
2af3ff52c2 nixos/containers: make containers in containers possible 2015-01-28 16:06:44 +01:00
Tobias Geerinckx-Rice
ff5eae075a Add freefall NixOS service module 2015-01-28 15:59:21 +01:00
Eelco Dolstra
b61d4ac6a5 ntpd: Fork into the background 
With -n, ntpd will write log messages to both syslog and stderr, which
is ugly.
 2015-01-28 15:34:42 +01:00
Thomas Strobel
3767370866 Add target parameter to grub installation chain 2015-01-27 19:46:37 +01:00
Eelco Dolstra
53710c752a nixos-rebuild: Update fallback code to update Nix 2015-01-27 18:58:20 +01:00
Eelco Dolstra
6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Thomas Tuegel
63ec1a9677 add stable attrs for plasma5, kf5, and kdeApps 2015-01-26 21:01:07 -06:00
Thomas Tuegel
a55543711e kde5: simplify package list 2015-01-26 21:01:06 -06:00
Thomas Tuegel
3a97ea592f kdm: install default backgrounds 2015-01-26 21:01:06 -06:00
Thomas Tuegel
726b80bc87 startkde: don't split script between NixOS module and package 2015-01-26 21:01:06 -06:00
Thomas Tuegel
e7508b831f kde5: warn if enabled with kde4 2015-01-26 21:01:05 -06:00
Thomas Tuegel
16b54d19d3 kde5: rename plasma5 desktop module 2015-01-26 21:01:05 -06:00
Thomas Tuegel
5c52354ee8 add NixOS module for Plasma desktop 2015-01-26 21:00:38 -06:00
Thomas Tuegel
849647a3eb environment: set paths for Qt plugins and QML 2015-01-26 20:59:49 -06:00
Domen Kožar
9df1bdefef Merge pull request #5982 from robberer/pkgs/openldap 
openldap: add dataDir, use cfg.user and cfg.group to run slapd
 2015-01-26 10:33:57 +01:00
Domen Kožar
c1ce67561d openldap: correct directory hint 2015-01-26 10:03:25 +01:00
Longrin Wischnewski
a4af32eec3 openldap: add dataDir, use cfg.user and cfg.group to run slapd 2015-01-26 09:35:56 +01:00
aszlig
eae32fb798
nixos/tests/chromium: Increase VM memory size. 
Chromium is quite memory hungry and we frequently get random crashes in
the tests, so let's set it to 1024 MB because new releases of Chromium
most probably won't consume *less* memory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-26 09:31:03 +01:00
aszlig
d110f5adf7
nixos/gitlab: Fix evaluation. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-26 08:20:14 +01:00
Jaka Hudoklin
6e7d708bcc nixos/rabbitmq: fix module 2015-01-26 02:09:04 +01:00
Charles Strahan
61816b06e7 nixos: disable gitlab test for now 2015-01-25 16:29:37 -05:00
Charles Strahan
6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Domen Kožar
2daba83828 openldap: add example config 2015-01-25 21:15:29 +01:00
aszlig
6308cba3fa
nixos/manual: Re-add development section. 
I think this has been accidentally dropped by a099ca4, at least there is
no reason stated, why it shouldn't be included, so I'm bringing it back.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-25 20:12:06 +01:00
j-keck
611a21a919 nixos-container: add missing 'nixos-container update' in usage 
* in nixos-container.pl the mode 'update' is missing in the usage
 2015-01-24 20:37:55 +01:00
Edward Tjörnhammar
6bbec634a7 Merge pull request #5850 from edwtjo/kodi-plugins 
XBMC to Kodi migrations
 2015-01-24 14:17:14 +01:00
Domen Kožar
cb7cd012df Merge pull request #5593 from abbradar/modprobe-fix 
modprobe: wrap all of kmod
 2015-01-24 07:11:16 +01:00
Domen Kožar
fde45d217e Merge pull request #5531 from abbradar/tlp 
tlp: add package
 2015-01-24 07:10:48 +01:00
Nikolay Amiantov
b7b3a0972d nixos/tlp: add service 2015-01-24 02:56:21 +03:00
Eelco Dolstra
11a0344e13 Merge pull request #5918 from robberer/openntpd 
openntpd: add extraConfig and extraOptions
 2015-01-23 16:43:15 +01:00
Longrin Wischnewski
4fa5d1f626 openntpd: add extraConfig and extraOptions 2015-01-23 16:15:20 +01:00
aszlig
127c928c23
nixos/rename: Fix merging multiple destinations. 
The renaming of options define the original value for the new attribute
path. This works well if there is only *one* target, but if there are
more, we end up recursing into the attribute set of the option
definition itself.

We now check for that within the parent recursion node (we can't check
that from the subnode, because we lack that information about whether
it's defined multiple times) and if the subnode consist entirely of a
list of definitions, we use mkMerge on it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-01-22 14:08:28 +01:00
wmertens
8780caadd4 Merge pull request #5499 from wizeman/u/zfs-dont-fsck 
nixos: When generating /etc/fstab, ZFS and NFS filesystems shouldn't be checked
 2015-01-22 12:09:22 +01:00
Charles Strahan
8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby 
Pleasant ruby
 2015-01-21 23:27:38 -05:00
Matej Cotman
3ed3977166 owncloud: make .htaccess available 2015-01-21 22:49:22 +01:00
Matej Cotman
7494bd389e apache-httpd: add owncloud 2015-01-21 22:49:22 +01:00
Matej Cotman
6630e3e4fe apache-httpd: add restartSec option 2015-01-21 22:49:22 +01:00
Ricardo M. Correia
1b66077205 nixos: Don't do filesystem checks on ZFS or NFS filesystems 2015-01-21 17:39:53 +01:00
Eelco Dolstra
f637e27138 Fix release notes 2015-01-21 16:27:48 +01:00
tv
3fdd925063 nixos: Add tlsdated service 2015-01-21 05:09:47 +01:00
Charles Strahan
dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
 2015-01-20 20:21:03 -05:00
Ricardo M. Correia
a11dc2f0a3 grsecurity: Add denyUSB option to grsec NixOS module 
The option had been added to the grsec build-support code,
but it hadn't been added to the grsec module.

After this commit, grsec module users will be able to change
the default value. It also serves to document that this option
exists and that NixOS will disable it by default.
 2015-01-20 19:18:06 +01:00
Joachim Fasting
7023e03d77 firewall service: fix pingLimit example value 
The example uses single dashes, whereas iptables requires double dashes.
 2015-01-20 08:47:11 +01:00
Edward Tjörnhammar
5b1c9417a8 Add Kodi desktop-manager 2015-01-19 22:14:36 +01:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
lethalman
d957d9e6bc Merge pull request #5517 from paraseba/bumblebee 
Bumblebee config to enable multiple monitors
 2015-01-19 15:00:11 +01:00
wmertens
d3383e4879 Merge pull request #4394 from wmertens/patch-6 
setup-etc.pl: Fail when symlink/rename fails
 2015-01-19 12:39:41 +01:00
lethalman
9cd9264ef3 Merge pull request #5849 from robberer/systemd/restartassert 
systemd: extend checkUnitConfig with on-abnormal
 2015-01-19 11:48:48 +01:00
Longrin Wischnewski
4b0100774a systemd: extend checkUnitConfig with on-abnormal 2015-01-19 11:41:18 +01:00
Andrey Arapov
04be7262a6 nixos/dovecot: added configFile option and default Restart on-failure, PR #5845 
Absolute path is required when one has such postfix configuration
where he/she needs to specify the actual (real) path to active dovecot
config.

Without this commit applied, the dovecot is running in such way:
/nix/store/hashAAA-dovecot-ver/sbin/dovecot -F -c /nix/store/hashBBB-dovecot2.conf

and postfix can't be aware of the value of "hashBBB" via services.postfix.extraConfig = '' ... '';
(it can only be aware of "hashAAA" with ${pkgs.dovecot} parameter)

Also enable Restart on-failure.

Edit: set RestartSec to 1s
 2015-01-19 11:05:56 +01:00
Andrey Arapov
b1b9efdbe1 nginx service improvements 
Adding Restart, RestartSec, StartLimitInterval to ensure that the service
is started in case if it can't assign (bind) the address as often it takes longer
for the network (e.g. dhcpcd) to get the IP assigned.
 2015-01-19 10:46:45 +01:00
William A. Kennington III
130f66b683 nixos/sync-server: Respect the enable option 2015-01-18 14:21:40 -08:00
Domen Kožar
3b174a4024 Merge pull request #5301 from nbp/syncserver 
Add Firefox Sync service
 2015-01-18 17:47:51 +01:00
Nicolas B. Pierron
8196727fad Improve the documentation of the syncserver module. 2015-01-18 12:21:23 +01:00
Nicolas B. Pierron
0d13ea0131 Change default syncserver listen.port to a safer one. 2015-01-18 12:20:44 +01:00
Domen Kožar
b92a62165d Merge pull request #5726 from spwhitt/zsh-command-not-found 
command-not-found: Add ZSH Support
 2015-01-17 18:15:35 +01:00
Damien Cassou
a7024cb4b4 Create a nixos module for cups-browsed 2015-01-16 14:10:57 +01:00
Eelco Dolstra
efa8fc2b0a Paranoia 2015-01-15 18:37:55 +01:00
Eelco Dolstra
b9c4569b6b nixos-install: Create /root with 700 permission 2015-01-15 18:37:55 +01:00
Eelco Dolstra
3ca275d7ba NixOS containers: Create /root with 700 permission 
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.
 2015-01-15 17:51:43 +01:00
Eelco Dolstra
24ce7ff3ea test-instrumentation.nix: Prevent calling a pager 2015-01-15 14:39:29 +01:00
Eric Seidel
88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Edward Tjörnhammar
837cfbb9ea nixos: adding nylon service with uid,gid 2015-01-14 22:08:47 +01:00
William A. Kennington III
8e5ef7da54 nixos/network-interfaces: Fix rstp support 2015-01-14 10:34:28 -08:00
Luca Bruno
804a958663 pam: add pam_wheel 2015-01-14 18:32:08 +01:00
Luca Bruno
2beb43174f nixos-rebuild: use reload-or-restart for dbus. Closes #5767 
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
 2015-01-14 16:08:47 +01:00
Rob Vermaas
df7923fa82 Merge pull request #5515 from oconnorr/master 
GCE updates to ntp server and to fetch all ssh keys
 2015-01-14 13:19:38 +01:00
Matej Cotman
4e6efec4b4 enlightenment: fix media preview 2015-01-13 14:56:35 +01:00
Ryan Mulligan
2e3fa5b849 different wording for adminPubkey description 
Maybe this wording is a slight improvement?
 2015-01-12 21:49:33 -08:00
Matthias Beyer
f64d795950 Add note that administrative public key for gitolite has to be written in one line 2015-01-12 23:10:27 +01:00
mokasin
dd6dfde575 Add auto-start option to containers. 2015-01-12 18:26:22 +01:00
Spencer Whitt
6cba6dc61b command-not-found: Add ZSH Support 2015-01-12 03:45:48 -05:00
Vladimír Čunát
72d2d59cd4 /etc/ssh/ssh_known_hosts: refactor and fix #5612 
Generating the file was refactored to be completely in nix.
Functionally it should create the same content as before,
only adding the newlines.

CC recent updaters: @aszlig, @rickynils.
 2015-01-11 22:14:25 +01:00
Peter Simons
43bae26b33 Merge pull request #5627 from oxij/update-postfix 
postfix: make 2.11 the default, nixos: update postfix config for 2.11
 2015-01-11 11:28:31 +01:00
Arseniy Seroka
4f596fb93f Revert "zsh: profile-relative functions path" 
This reverts commit 766207ca1d.

We need to solve the problem with `environment.profileRelativeEnvVars`.
The best workaround is to make profileRelativeEnvVars prepend paths.
 2015-01-10 22:11:13 +03:00
Joachim Fasting
97bac259d0 dnscrypt-proxy service: update AppArmor profile 
This patch fixes the AppArmor profile path clause and adds
(currently ignored) network rules.

The AppArmor profile used to be defined for the path sbin/dnscrypt-proxy,
but the real path is bin/dnscrypt-proxy (due to sbin now being a symlink
to bin), which permitted the service to run unconfined.

Adding the network rules has no effect other than improving correctness,
as the version of AppArmor in the NixOS kernel fails to enforce network
rules.
 2015-01-09 15:08:07 +01:00
Shea Levy
cca8bae86e Merge branch 'rngd-fix' of git://github.com/abbradar/nixpkgs 2015-01-08 09:36:29 -05:00
Matthias Beyer
5e6068d913 Put shell aliases in interactiveShellInit 2015-01-08 15:18:26 +01:00
Matthias Beyer
c5e855e060 Add basic nixos module for fish shell 2015-01-08 15:18:26 +01:00
lethalman
908c47b281 Merge pull request #5550 from abbradar/fprintd 
add fprintd support
 2015-01-08 14:58:22 +01:00
William A. Kennington III
dd7efcbf36 java: More default cleanups 2015-01-07 14:55:41 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00