summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2020-06-25Merge master into staging-nextFrederik Rietdijk6-5/+201
2020-06-25Merge pull request #88940 from stigtsp/package/convos-initKim Lindberger4-0/+104
2020-06-24Merge pull request #77982 from symphorien/sshl_ipv6Timo Kaufmann3-5/+97
2020-06-24Merge master into staging-nextFrederik Rietdijk13-34/+102
2020-06-23nixos/generic-extlinux-compatible: fix docbook syntaxFabian Möller1-1/+1
2020-06-23Merge #91363: small treewide: his -> theirs/itsVladimír Čunát3-3/+3
2020-06-23Merge pull request #91195 from flokli/extlinux-conf-builder-dtbnameFlorian Klink7-30/+55
2020-06-23small treewide: his -> theirs/itsProfpatsch3-3/+3
2020-06-23tests/taskserver: fix gnutls invocationMarkus S. Wamser1-1/+2
2020-06-23Merge pull request #91261 from rnhmjoj/intelMichele Guerini Rocco1-0/+41
2020-06-22Merge pull request #91216 from Mic92/nixos-config-generateJörg Thalheim1-0/+1
2020-06-22nixos-generate-config: refer to nixos-hardwareJörg Thalheim1-0/+1
2020-06-22nixos/doc: add section on Intel DDX driversrnhmjoj1-0/+41
2020-06-22nixos/convos: add testStig Palmquist2-0/+31
2020-06-22nixos/convos: initStig Palmquist2-0/+73
2020-06-22Merge master into staging-nextFrederik Rietdijk19-89/+398
2020-06-21Merge pull request #91214 from flokli/make-ext4-fs-fudge-factorFlorian Klink1-1/+1
2020-06-21Merge pull request #91154 from Mic92/homeassistantJörg Thalheim2-73/+47
2020-06-21hardware.deviceTree: add nameFlorian Klink2-1/+13
2020-06-21extlinux-conf-builder.sh: allow a custom FDT to be specifiedFlorian Klink1-3/+14
2020-06-21nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populateCmdFlorian Klink4-22/+4
2020-06-21nixos/generic-extlinux-compatible: introduce boot.loader.generic-extlinux-com...Florian Klink1-4/+24
2020-06-21nixos/home-assistant: fix testsJörg Thalheim1-73/+46
2020-06-21nixos/gerrit: allow configuring replication declaratively (#91200)edef1-0/+21
2020-06-21nixos/deviceTree: fix descriptionFlorian Klink1-1/+1
2020-06-21nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10Florian Klink1-1/+1
2020-06-20Revert "libinput: ensure that we only apply touchpad options to touchpads"Edmund Wu1-1/+0
2020-06-20Merge pull request #90119 from samueldr/feature/rpi4-fixupsSamuel Dionne-Riel3-3/+21
2020-06-20Merge pull request #89344 from JJJollyjim/openresty-no-perlMichael Raskin2-0/+34
2020-06-20Merge pull request #91128 from bbigras/rslsync-localhostMichele Guerini Rocco2-2/+7
2020-06-20nixos/resilio: listen on [::1] by defaultBruno Bigras2-2/+7
2020-06-20Merge pull request #91149 from nlewo/nextcloud-expose-occMaximilian Bosch2-1/+15
2020-06-20Merge pull request #90884 from mmahut/wasabiMarek Mahut4-0/+198
2020-06-20Revert "Merge nixos-hardware into nixpkgs under `/nixos/hardware`"Graham Christensen111-3918/+0
2020-06-20Merge pull request #91160 from Profpatsch/nixos-hardware-mergeProfpatsch111-0/+3918
2020-06-20Merge pull request #89427 from Ma27/nextcloud19lewo3-3/+34
2020-06-20nixos/hardware: remove .travis.ymlProfpatsch1-3/+0
2020-06-20nixos: add test for sslhSymphorien Gibol2-0/+84
2020-06-20nixos/hardware: remove .gitignoreProfpatsch1-9/+0
2020-06-20nixos/hardware: move CODEOWNERS to toplevelProfpatsch1-7/+0
2020-06-20Merge branch 'nixos-hardware-merge-preparations' into nixos-hardware-mergeProfpatsch113-0/+3937
2020-06-20nixos-hardware: prepare for merge by moving to nixos/hardwareProfpatsch113-0/+3937
2020-06-20nixos/sslh: make it possible (and the default) to listen on ipv6Symphorien Gibol1-5/+13
2020-06-20nixos/home-assistant: make service reloadableJörg Thalheim1-0/+1
2020-06-20nixos/nextcloud: update upgrade-path for nextcloud19Maximilian Bosch3-2/+33
2020-06-20Merge pull request #86253 from erictapen/printers-exampleMichele Guerini Rocco1-1/+1
2020-06-20Merge pull request #87270 from martinetd/mpd-fluidsynthMichele Guerini Rocco1-0/+14
2020-06-20nixos/nextcloud: add occ internal optionAntoine Eiche2-1/+15
2020-06-20Merge pull request #90635 from Twey/libinput-touchpadMichele Guerini Rocco1-0/+1
2020-06-20Merge pull request #91116 from bbigras/rslsync-groupMichele Guerini Rocco1-5/+5
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-02 12:38:18 +0000