Shea Levy 0c12dd3ded Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs ...

systemd: python support & journal http gateway

Conflicts:
	nixos/modules/misc/ids.nix

2014-03-14 19:16:59 -04:00

..

config

Merge pull request #1767 from the-kenny/fix-consoleKeyMap-type

2014-03-08 18:04:55 +01:00

hardware

Upgrade bumblebee and add nixos module

2014-02-09 15:09:41 +01:00

installer

typo: occured -> occurred

2014-03-07 19:39:55 +01:00

misc

Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs

2014-03-14 19:16:59 -04:00

profiles

remove references to isSystemUser and fix eval of tested job

2014-02-08 21:10:00 +01:00

programs

add gstreamer 1.0 setup-hook and use it where appropriate

2014-02-28 02:03:07 +01:00

security

Remove /etc/ca-bundle.crt

2014-02-11 17:13:36 +01:00

services

firewall: Allow setting rate limits for pings

2014-03-14 14:55:30 -04:00

system

Merge branch 'pkgs/systemd/journald_http_gateway' of git://github.com/offlinehacker/nixpkgs

2014-03-14 19:16:59 -04:00

tasks

Merge branch 'nixos/network-interfaces/ipv6' of git://github.com/offlinehacker/nixpkgs

2014-03-14 18:54:59 -04:00

testing

Rename linuxManualConfig to buildLinux

2014-01-21 20:05:55 -05:00

virtualisation

Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.

2014-02-24 18:05:26 +01:00

module-list.nix

remove users.jenkins config start on slave config.

2014-03-13 13:01:50 -07:00

rename.nix

move windowManager.xbmc to desktopManager.xbmc

2014-03-12 09:20:59 +01:00