summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2018-06-06Merge pull request #38263 from lopsided98/grub-initrd-secretsJoachim F3-28/+31
2018-06-06nixos/release-combined: remove keymap tests from tested jobUli Baum1-6/+8
2018-06-06Merge pull request #40729 from nlewo/pr-hydra-testDaiderd Jordan4-32/+135
2018-06-06nixos/tests/hydra: add it in nixos/release.nixAntoine Eiche1-0/+1
2018-06-06nixos/tests/hydra: build a trivial derivationAntoine Eiche3-32/+134
2018-06-05Merge pull request #41342 from samueldr/fix/doc/formatting-oopsiesxeji20-272/+687
2018-06-05Merge pull request #41486 from grahamc/support-null-fontGraham Christensen2-14/+17
2018-06-05install-grub: only try to loadfont if font is not nullGraham Christensen1-12/+14
2018-06-05grub-config.xml: handle a null fontGraham Christensen1-2/+3
2018-06-05Merge pull request #41446 from aszlig/make-serviceconfig-overridableEelco Dolstra1-4/+10
2018-06-04nixos/systemd: Allow to override serviceConfigaszlig1-4/+10
2018-06-04Merge pull request #41311 from AmineChikhaoui/fix-gce-fetch-sshRob Vermaas1-1/+1
2018-06-04avoid redundant rm callsAmineChikhaoui1-2/+1
2018-06-04nixos/gitea: Respect gitea-dump enable option. (#41437)Thomas Kerber1-2/+2
2018-06-04kubernetes: corrected spelling mistake in docs (#41439)Geoffrey Huntley1-1/+1
2018-06-03nixos/exim: Add unit restart trigger (#41418)Janne Heß1-0/+1
2018-06-03Merge branch 'staging'Vladimír Čunát2-0/+65
2018-06-03mpd: fix spelling in descriptionRobert Helgesson1-1/+1
2018-06-02Merge pull request #41377 from markuskowa/slurm-ext-prJoachim F2-14/+74
2018-06-02nixos/slurm: remove propagatedBuidInputs from slurmWrappedMarkus Kowalewski1-2/+0
2018-06-02Merge pull request #34886 from leenaars/mortyproxyJoachim F4-0/+132
2018-06-01Merge pull request #40028 from WilliButz/add-dnsmasq-exporterMatthew Justin Bauer2-0/+40
2018-06-01Merge pull request #40037 from alunduil/fix-fcrontab-setuidMatthew Justin Bauer1-0/+1
2018-06-01Merge pull request #40171 from teto/ntpMatthew Justin Bauer1-4/+6
2018-06-01Merge pull request #40242 from gnidorah/gvtMatthew Justin Bauer2-0/+65
2018-06-01Merge pull request #40692 from Izorkin/sshdMatthew Justin Bauer1-3/+33
2018-06-02nixos/slurm: update test, add test for enableStoolsMarkus Kowalewski1-5/+18
2018-06-02slurm: add freeipmi, readline, libssh2, fix hwlocMarkus Kowalewski1-0/+2
2018-06-02nixos/slurm: Add man pages to wrapedSlurmMarkus Kowalewski1-0/+3
2018-06-02nixos/slurm: Extend configuration optionsMarkus Kowalewski1-8/+52
2018-06-01nixos/tests/iftop: fix non-deterministic failure (#41309)xeji1-5/+9
2018-06-01Merge pull request #41367 from andir/nixos-mpd-dbFile-nullAndreas Rammhold1-3/+6
2018-06-01nixos/mpd: allow services.mpd.dbFile to be nullAndreas Rammhold1-3/+6
2018-06-01Merge branch 'plat-fix-for-merge-2' into masterTuomas Tynkkynen1-6/+19
2018-06-01nixos/sd-image-raspberrypi: Support Raspberry Pi ZeroTuomas Tynkkynen1-6/+19
2018-06-01tests/containers-imperative: Include stdenvNoCCaszlig1-1/+4
2018-05-31nixos/doc+man: Fixes squishedtogether definitions.Samuel Dionne-Riel4-18/+18
2018-05-31nixos/doc: ran `make format`Samuel Dionne-Riel16-268/+553
2018-05-31doc: Adds xml fixing script. (see previous and next commits)Samuel Dionne-Riel3-1/+130
2018-05-31doc: Adds rule to xmlformat to help keep spacing right.Samuel Dionne-Riel1-3/+4
2018-06-01Revert "nixos: disable gdk-pixbuf test"Jan Tojnar1-1/+1
2018-05-31dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039)coretemp1-0/+3
2018-05-31Revert "nixpkgs module: Fix defaulting of `localSystem` and `system`"Matthew Bauer1-8/+5
2018-05-31nixos: disable gdk-pixbuf testMatthew Bauer1-1/+1
2018-05-31zsh: only do promptInit when TERM!=dumbMatthew Bauer1-1/+3
2018-05-31qemu-flags: default to qemu-kvmMatthew Bauer1-2/+2
2018-05-31Merge pull request #40708 from obsidiansystems/nixos-nixpkgs-defaultsMatthew Justin Bauer1-5/+8
2018-05-31Merge pull request #41218 from Gerschtli/fix/gitea-pre-startJoachim F1-1/+6
2018-05-31revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly removeAmineChikhaoui1-1/+2
2018-05-31nix: 2.0.3 -> 2.0.4Eelco Dolstra1-4/+4