summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-06-10
|\
| * oauth2_proxy module: fix manual buildJoachim Fasting2016-06-10
| * Merge pull request #15283 from jml/oauth2proxy-moduleuJoachim Fasting2016-06-09
| |\
| | * Add module for oauth2_proxyJonathan Lange2016-06-09
| * | Merge branch 'kde-propagate'Thomas Tuegel2016-06-09
| |\ \
| | * | nixos/kde5: include setup hook and icons with sddm themeThomas Tuegel2016-06-09
| * | | dnscrypt-proxy service: update resolver listJoachim Fasting2016-06-09
| |/ /
| * | Merge branch 'plasma-5'Thomas Tuegel2016-06-07
| |\ \
| | * | Revert "nixos/kde5: install oxygen-fonts and noto-fonts"Thomas Tuegel2016-06-07
| | * | nixos/kde5: install plasma-integrationThomas Tuegel2016-06-07
| | * | nixos/kde5: install oxygen-fonts and noto-fontsThomas Tuegel2016-06-07
| * | | Merge pull request #14366 from NixOS/gnome-3.20Luca Bruno2016-06-07
| |\ \ \
| | * | | gnome3_20: Add GNOME 3.20 package setDamien Cassou2016-06-06
| | |/ /
| * | | Merge pull request #15991 from womfoo/openldapArseniy Seroka2016-06-06
| |\ \ \
| | * | | openldap: fix example for multiple-outputs and formattingKranium Gikos Mendoza2016-06-05
| * | | | nixos/openvpn: add support for resolvconfBenno Fünfstück2016-06-06
| | |/ / | |/| |
| * | | Merge #15639: xorg-server 1.17.4 -> 1.18.3Vladimír Čunát2016-06-05
| |\ \ \
| | * | | release notes: mention xorg-server updateVladimír Čunát2016-05-23
| | * | | nixos xserver: fix evdev driver with xserver 1.18Vladimír Čunát2016-05-23
| | * | | xf86-input-evdev: split dev outputVladimír Čunát2016-05-23
| | * | | nixos ati_unfree: auto-switch xorg to fglrxComatVladimír Čunát2016-05-23
| * | | | nixos/pcscd: Improve and clean up moduleaszlig2016-06-04
| * | | | nixos manual: fix syntaxNikolay Amiantov2016-06-03
| * | | | nixos manual: document Gtk and Qt themesNikolay Amiantov2016-06-03
| * | | | Merge pull request #15895 from cerana/stage2-sysfsShea Levy2016-06-03
| |\ \ \ \
| | * | | | stage2: if no /proc, also mount /sysNahum Shalman2016-06-01
| * | | | | fix https://github.com/NixOS/nixops/issues/331Domen Kožar2016-06-03
| * | | | | nixos/modules/misc/version.nix: check that .git is a directoryobadz2016-06-03
| * | | | | Explicitly specify the subsystem for /dev/vboxguestEelco Dolstra2016-06-03
| | |_|/ / | |/| | |
| * | | | fix manualDomen Kožar2016-06-01
| * | | | Add hydra package and its NixOS module.Domen Kožar2016-06-01
| * | | | nixos kde5: improve testJoel Moberg2016-06-01
| | |_|/ | |/| |
| * | | Manual: Explicitly mark commands that require to be run as root (#15589)Wilhelm Schuster2016-06-01
| * | | Rename gummiboot moduleEelco Dolstra2016-06-01
| * | | Rename boot.loader.gummiboot.enable -> boot.loader.systemd-boot.enableEelco Dolstra2016-06-01
| * | | acme: added option `security.acme.preliminarySelfsigned` (#15562)Bob van der Linden2016-06-01
| * | | Merge pull request #15793 from abbradar/unity3d-pkgNikolay Amiantov2016-06-01
| |\ \ \
| | * | | unity3d service: initNikolay Amiantov2016-05-29
| * | | | iso-image.nix: Fix path to EFI blob after systemd-boot switchTuomas Tynkkynen2016-06-01
| * | | | Use systemd-boot instead of gummibootEelco Dolstra2016-05-31
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-05-30
|\| | |
| * | | toxvpn: restartIfChanged = false & minor cleanupsobadz2016-05-30
| * | | syncthing service: respect cfg.package (#15810)anderspapitto2016-05-30
| * | | toxvpn: init at 20151111obadz2016-05-30
| * | | nixos/containers: Create an empty machine-id fileaszlig2016-05-29
| * | | slurm service: robust reference to slurm bin outputJoachim Fasting2016-05-28
| * | | slurm service: fix typo in option descriptionJoachim Fasting2016-05-28
| * | | networking config: specify resolv.conf options as list of stringsJoachim Fasting2016-05-28
| * | | networking config: support setting resolv.conf optionsChristian Zagrodnick2016-05-28
| |/ /
| * | Merge pull request #15596 from rnhmjoj/masterJoachim Fasting2016-05-28
| |\ \