Commit graph

34977 commits

Author SHA1 Message Date
Eelco Dolstra e0db0aaa4d Rename /etc/nix.machines to /etc/nix/machines
Since we have a /etc/nix directory, we should use it and not pollute
/etc.
2013-10-16 10:57:25 +02:00
Eelco Dolstra 16cd8b039b Remove nix.manualNixMachines
Suggested by Marc Weber.  Fixes #1059.

Generate /etc/nix.machines only if buildMachines is not empty.  Thus,
if you want to manage /etc/nix.machines in some other way, you can set
nix.distributedBuilds to true but not set nix.buildMachines.
2013-10-16 10:53:23 +02:00
Eelco Dolstra 7c7bfa817a fail2ban: Update to 0.8.10
Also fix random start failures due to a race between the fail2ban
server and the postStart script.
2013-10-16 10:03:43 +02:00
Domen Kožar c8f261c72d Merge pull request #1070 from lovek323/sdlmame
sdlmame: add expression
2013-10-15 15:02:17 -07:00
Domen Kožar c9acee7ee0 Merge pull request #1073 from offlinehacker/nixos/graphite/fix_carbon
nixos/graphite: carbon, use syslog for logging
2013-10-15 14:59:51 -07:00
Bjørn Forsman b5c1d1873a skype: add workaround for pulseaudio glitches
See http://arunraghavan.net/2013/08/pulseaudio-4-0-and-skype/

Relevant bug reports:
  https://github.com/NixOS/nixpkgs/issues/788
  https://bugs.archlinux.org/task/35690
  https://bugs.freedesktop.org/show_bug.cgi?id=50510

We don't want to disable pulseaudio timer-based scheduling (tsched=0)
because that affects everyone. It seems this is the proper distro fix
for skype + pulseaudio at the moment.
2013-10-15 22:58:12 +02:00
Eelco Dolstra 8485487727 Get rid of <nixpkgs> 2013-10-15 17:52:02 +02:00
Eelco Dolstra ceb8ab7ffa Really fix use of NixOps with the merged Nixpkgs/NixOS tree
Note that there is a subtle difference in Nix that causes
nixos-rebuild to work and NixOps to fail:

  $ nix-instantiate '<nixos>' -A config.system.nixosVersion --eval-only
  "13.10pre34915.50f4822"

  $ nix-instantiate '<nixos/default.nix>' -A config.system.nixosVersion --eval-only
  error: opening file `/nix/var/nix/profiles/per-user/root/channels/nixos/.version': No such file or directory

Fixes NixOS/nixops#145.
2013-10-15 17:50:09 +02:00
Eelco Dolstra bbe265e8c2 slim: Only enable if the X server is enabled
http://hydra.nixos.org/build/6494972

Disabling slim revealed that services.xserver.displayManager.job had
an incorrect type, so fixed that as well.
2013-10-15 17:24:33 +02:00
Eelco Dolstra 0c0bc0857e tzdata: Update to 2013g 2013-10-15 17:24:33 +02:00
Eelco Dolstra 11960d2f47 nss: Update to 3.15.2 2013-10-15 17:24:33 +02:00
Eelco Dolstra df5eadd283 nspr: Update to 4.10.1 2013-10-15 17:24:33 +02:00
Sander van der Burg 521ea15f14 We need to use ... to allow other parameters 2013-10-15 16:48:42 +02:00
Sander van der Burg f24e20f1e3 Support Xcode 5.0 2013-10-15 16:32:38 +02:00
Sander van der Burg ce7f235a09 Make arbitrary arguments to the generic builder possible 2013-10-15 16:32:16 +02:00
Eelco Dolstra ae74b0ae58 sshd: Remove the usePAM option
Sshd *must* use PAM because we depend on it for proper session
management.  The original goal of this option (disabling password
logins) can also be implemented by removing pam_auth authentication
from sshd's PAM service.
2013-10-15 15:05:49 +02:00
Eelco Dolstra a2c820c678 Turn security.pam.services into an attribute set
That is, you can say

  security.pam.services.sshd = { options... };

instead of

  security.pam.services = [ { name = "sshd"; options... } ];

making it easier to override PAM settings from other modules.
2013-10-15 14:47:51 +02:00
Eelco Dolstra 3f2c0bf9bd slim: Fix session handling 2013-10-15 13:41:03 +02:00
Eelco Dolstra 5b702be29f Add support for slimlock, slim's simple screen locker 2013-10-15 13:23:40 +02:00
Eelco Dolstra 873662b8ad slim: Work around broken PAM session handling
Previously logging in via SLiM more than once didn't work because SLiM
doesn't clean up its PAM session properly (that is, in a child rather
than in the parent).  Thus the slim process becomes part of the user
session's cgroup, among other things.  This patch causes SLiM to exit
after the session has finished, after which systemd will restart
display-manager.service.

Fixes NixOS/nixops#137.
2013-10-15 13:23:40 +02:00
Eelco Dolstra 1d634b4388 slim: Update to 1.3.6 2013-10-15 13:23:39 +02:00
Peter Simons 347132478b haskell-HTTP: jailbreak to fix build with GHC 7.7 2013-10-15 11:59:12 +02:00
Peter Simons e7b25c78a5 haskell-snap: jailbreak to fix build with recent versions of lens 2013-10-15 11:59:12 +02:00
Peter Simons 57b5927d6a haskell-cryptohash: re-enable the test suite 2013-10-15 11:59:12 +02:00
Peter Simons 7edfd67fe0 haskell-accelerate: jailbreak to fix build with recent versions of fclables 2013-10-15 11:59:12 +02:00
Peter Simons 4cdefbb926 haskell-errors: jailbreak to fix build with either 4.x 2013-10-15 11:59:12 +02:00
Peter Simons 7eaefcae45 haskell-groupoids: don't try to build documentation; this package is empty 2013-10-15 11:59:12 +02:00
Peter Simons 93727ab861 haskell-comonads-fd: don't try to build documentation; this package is empty 2013-10-15 11:59:11 +02:00
Peter Simons 18c9c07bde haskell-yesod-form: update to version 1.3.3 2013-10-15 11:59:11 +02:00
Peter Simons c4385c4db7 haskell-yesod-core: update to version 1.2.4.5 2013-10-15 11:59:11 +02:00
Peter Simons ad55ea940b haskell-yesod-bin: update to version 1.2.3.4 2013-10-15 11:59:11 +02:00
Peter Simons 1811b175d6 haskell-warp: update to version 1.3.10.1 2013-10-15 11:59:11 +02:00
Peter Simons c933c31141 haskell-wai-app-static: update to version 1.3.3 2013-10-15 11:59:11 +02:00
Peter Simons 97f3968921 haskell-trifecta: update to version 1.2.1.1 2013-10-15 11:59:11 +02:00
Peter Simons 7fc3d75dd4 haskell-tasty: update to version 0.3.1 2013-10-15 11:59:11 +02:00
Peter Simons 1c1f7f7e7f haskell-shakespeare-js: update to version 1.2.0.1 2013-10-15 11:59:11 +02:00
Peter Simons e4857cf3c6 haskell-semigroupoids: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons 271be21f5a haskell-semigroupoid-extras: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons d217bfd571 haskell-reducers: update to version 3.10.1 2013-10-15 11:59:11 +02:00
Peter Simons 054a313221 haskell-profunctors: update to version 4.0.1 2013-10-15 11:59:11 +02:00
Peter Simons 860175c660 haskell-profunctor-extras: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons 345423eb5d haskell-pointed: update to version 4.0 2013-10-15 11:59:11 +02:00
Peter Simons a8c8120626 haskell-parsers: update to version 0.10 2013-10-15 11:59:11 +02:00
Peter Simons 0bfd9cd3a1 haskell-numbers: update to version 3000.2.0.0 2013-10-15 11:59:11 +02:00
Peter Simons 343b43297d haskell-lens: update to version 3.10 2013-10-15 11:59:11 +02:00
Peter Simons 358cbd05ac haskell-keys: update to version 3.10 2013-10-15 11:59:11 +02:00
Peter Simons 5a309bd661 haskell-intervals: update to version 0.2.2.1 2013-10-15 11:59:11 +02:00
Peter Simons 0e35a09bf4 haskell-heist: update to version 0.13.0.2 2013-10-15 11:59:10 +02:00
Peter Simons 3323a090c8 haskell-hamlet: update to version 1.1.7.3 2013-10-15 11:59:10 +02:00
Peter Simons 595e1c47e0 haskell-groupoids: update to version 4.0 2013-10-15 11:59:10 +02:00