summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingLuca Bruno2015-06-15
|\
| * nixos: move environment.{variables => sessionVariables}.MODULE_DIRBjørn Forsman2015-06-14
| * Merge pull request #8322 from unaizalakain/masterDomen Kožar2015-06-14
| |\
| | * The user specified in the conf should run MPDUnai Zalakain2015-06-13
| * | Factor the NixOS channel building code out into its own file, so I can use it...Dan Peebles2015-06-13
| * | Use the right nix when doing things in our amazoninitDan Peebles2015-06-13
| |/
| * Allow setting mediatomb interfaceOliver Matthews2015-06-13
| * Merge branch 'nixos-subdir'Luca Bruno2015-06-13
| |\
| | * stage-1: mkdir -p /mnt-root, it may be created earlier by some hooksLuca Bruno2015-06-13
| | * nixos/grub: allow customization of the nix store pathLuca Bruno2015-06-13
* | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-12
|\| |
| * | apache-kafka: Enable overriding the kafka packageShea Levy2015-06-12
| * | Put dysnomia in system environment if Disnix is enabledSander van der Burg2015-06-12
| * | Merge pull request #8182 from ttuegel/openblasThomas Tuegel2015-06-12
| |\ \
| | * | Update release notes about OpenBLASThomas Tuegel2015-06-12
| * | | Revert "Use nixUnstable by default"Eelco Dolstra2015-06-12
| * | | nixos: set high fs.inotify.max_user_watches when xserver is enabledLuca Bruno2015-06-12
| * | | Fix: xen-bridge systemd serviceThomas Strobel2015-06-12
| * | | Link Xen scripts to /etc/xenThomas Strobel2015-06-12
| * | | Initial attempt at configuring from EC2 userdata (with input from cstrahan). ...Dan Peebles2015-06-11
| * | | Simple EC2 user-data VM testDan Peebles2015-06-11
| * | | nixos/pulseaudio: Fix descriptionWilliam A. Kennington III2015-06-11
| * | | Revert "Drop tests.installer.grub1 as release critical"Eelco Dolstra2015-06-12
| * | | scollector: Change type of collectors to allow proper mergingRickard Nilsson2015-06-11
| * | | nixos/grub: Support labeling efi bootloaders with independent id'sWilliam A. Kennington III2015-06-10
* | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2015-06-11
|\| | |
| * | | nixos/grub: Prevent module errors and make gfxmode configurableWilliam A. Kennington III2015-06-10
| * | | pulseaudio: Add a flag for supporting 32-bitWilliam A. Kennington III2015-06-10
| * | | Merge pull request #8204 from copumpkin/modulesPathDaniel Peebles2015-06-10
| |\ \ \
| | * | | Bring an importable modulesPath back from the dead, in the only way I knowDan Peebles2015-06-08
| * | | | Make the boot test release-criticalEelco Dolstra2015-06-10
| * | | | Installer test: Remove apparently useless setting of nix.readOnlyStoreEelco Dolstra2015-06-10
| * | | | Installer tests: Don't use the ISOEelco Dolstra2015-06-10
| * | | | Move stuff to modules/profiles/installation-device.nixEelco Dolstra2015-06-10
| * | | | Drop obsolete boot=on parameterEelco Dolstra2015-06-10
| * | | | Forcing the load of atkbd in initrd.Lluís Batlle i Rossell2015-06-10
| * | | | Remove unnecessary option. My mistake...Rob Vermaas2015-06-10
| * | | | Merge cwoac:mysql_socketRob Vermaas2015-06-10
| |\ \ \ \
| | * | | | Allow allowing local access to mysql socketOliver Matthews2015-04-15
| * | | | | mediatomb: fix hardcoded pathsAnders Lundstedt2015-06-10
| | |_|_|/ | |/| | |
| * | | | nixos i18n.consoleFont: choose a different defaultVladimír Čunát2015-06-09
| * | | | nixos-artwork: Make into a derivation and use fetchfromgithubWilliam A. Kennington III2015-06-08
| * | | | nixos/quassel: Use qt5 instead of qt4William A. Kennington III2015-06-08
| * | | | Merge pull request #8232 from dezgeg/pr-installer-fixWilliam A. Kennington III2015-06-08
| |\ \ \ \
| | * | | | install-cd: Include nixos-artwork to fix installer testsTuomas Tynkkynen2015-06-08
| | | |/ / | | |/| |
| * | | | Merge pull request #8223 from offlinehacker/pkgs/rippled/updateJaka Hudoklin2015-06-08
| |\ \ \ \
| | * | | | rippled: Update to 0.28.1Jaka Hudoklin2015-06-08
| * | | | | Merge pull request #8227 from offlinehacker/nixos/consul/alerts-fixJaka Hudoklin2015-06-08
| |\ \ \ \ \
| | * | | | | nixos/consul: fix consul alerts enableJaka Hudoklin2015-06-08
| * | | | | | Add ripple rest moduleJaka Hudoklin2015-06-08
| |/ / / / /