summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into stagingTuomas Tynkkynen2018-03-03
|\
| * cantarell-fonts: rename from cantarell_fontsJan Tojnar2018-03-03
| * nixos/jenkins: ensure postStart follows redirectsBjørn Forsman2018-03-02
| * Merge branch 'dropbear-2018-76-fix'Shea Levy2018-03-01
| |\
| | * initrd-ssh: Fix for new dropbear version.Shea Levy2018-03-01
| * | grafana: 4.6.3 -> 5.0.0WilliButz2018-03-01
* | | nixos: Add nixpkgs.crossSystem option for cross-compilationShea Levy2018-03-01
* | | Merge remote-tracking branch 'origin/staging' into cross-nixosShea Levy2018-03-01
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-03-01
| |\| |
| | * | nixos/ceph: init module (#35299)lejonet2018-03-01
| | * | Merge pull request #29768 from Mic92/networkdJörg Thalheim2018-03-01
| | |\ \ | | | |/ | | |/|
| | | * networkd: also load builtin modulesJoerg Thalheim2017-09-25
| * | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-01
| |\| |
* | | | nixos: Move uses of stdenv.shell to runtimeShell.Shea Levy2018-03-01
* | | | stage-2-init: Use the host bash as SHELLShea Levy2018-03-01
* | | | nixos: Fix initrd dependency detection when cross-compiling.Shea Levy2018-03-01
* | | | nixos: manual: Fix cross-compilation.Shea Levy2018-03-01
* | | | gobjectIntrospection: Enable building without X11 support.Shea Levy2018-03-01
* | | | Merge remote-tracking branch 'origin/master' into cross-nixosShea Levy2018-02-28
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'nix-ssh-ng'Shea Levy2018-02-28
| |\ \ \
| | * | | nixos: nix.sshServe: Support ssh-ng.Shea Levy2018-02-28
| * | | | Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletionJörg Thalheim2018-02-28
| |\ \ \ \
| | * | | | programs/bash: install nix-bash-completions if completion is enabledTor Hedin Brønner2018-02-28
| | |/ / /
| * | | | Merge pull request #35892 from Nadrieril/update-usbguardFrederik Rietdijk2018-02-28
| |\ \ \ \
| | * | | | nixos/usbguard: Do not check permissions on rules file (using undocumented -P...Nadrieril2018-02-27
| * | | | | disnix module: make dbus service configurableSander van der Burg2018-02-28
| | |/ / / | |/| | |
* | | | | nixos: sudo: Use build-time visudo for syntax check.Shea Levy2018-02-28
* | | | | nixos: keymap: Fix cross-compilation.Shea Levy2018-02-28
* | | | | nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.Shea Levy2018-02-28
* | | | | nixos: stage-1: Don't try to test binaries when cross-compiling.Shea Levy2018-02-28
* | | | | nixos: Take glibcLocales from buildPackages.Shea Levy2018-02-28
* | | | | nixos: udev: Generate hwdb with build-native udevadm.Shea Levy2018-02-28
* | | | | nixos: kexec: Disable on non-keexecable systems.Shea Levy2018-02-28
| |_|/ / |/| | |
* | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-28
|\| | |
| * | | digitalbitbox: init at 2.2.2 (#33787)David Asabina2018-02-27
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-27
|\| |
| * | nodejs: Add release note about dropped 4_x packagesadisbladis2018-02-27
* | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-27
|\| |
| * | Merge pull request #35061 from lopsided98/buildbot-updateFrederik Rietdijk2018-02-27
| |\ \
| | * | nixos/buildbot: also run test on hydraJörg Thalheim2018-02-17
| * | | Merge pull request #35682 from volth/patch-110Will Dietz2018-02-26
| |\ \ \
| | * | | nixos/tests: add forgotten xrdp.nixvolth2018-02-26
* | | | | Merge master into stagingVladimír Čunát2018-02-26
|\| | | |
| * | | | attempt to fix #30940 more robustlyAristid Breitkreuz2018-02-26
| |/ / /
* | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-26
|\| | |
| * | | Merge pull request #34028 from florianjacob/matomoFranz Pletz2018-02-26
| |\ \ \
| | * | | nixos/matomo: improve serverName defaultFlorian Jacob2018-02-22
| | * | | nixos/piwik: rename to matomoFlorian Jacob2018-02-22
| * | | | nixos udevil: set up wrapper for udevilPeter Hoeg2018-02-26
| * | | | Merge pull request #35432 from timokau/syncthing-deprecate-inotifyPeter Hoeg2018-02-26
| |\ \ \ \