| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into fix-cross-jobs | John Ericson | 2018-03-19 |
| |\ | |||
| | * | Merge pull request #36927 from dotlambda/borg-module | Robert Schütz | 2018-03-19 |
| | |\ | | | | | | | nixos/borgbackup: init | ||
| | | * | nixos/borgbackup: init | Robert Schütz | 2018-03-19 |
| | | | | |||
| | * | | grafana: 5.0.2 -> 5.0.3, fix headless phantomjs | WilliButz | 2018-03-19 |
| | | | | |||
| | * | | Merge pull request #33685 from corngood/amdgpu-pro-upgrade | Matthew Justin Bauer | 2018-03-19 |
| | |\ \ | | | | | | | | | amdgpu-pro: 17.10 -> 17.40 | ||
| | | * | | amdgpu-pro: 17.10 -> 17.40 | David McFarland | 2018-01-12 |
| | | | | | |||
| | * | | | Merge pull request #35687 from volth/libvirt-4.1.0 | Jörg Thalheim | 2018-03-19 |
| | |\ \ \ | | | | | | | | | | | libvirt: 3.10.0 -> 4.1.0 | ||
| | | * | | | libvirt: 3.10.0 -> 4.1.0 | volth | 2018-03-08 |
| | | | | | | |||
| | * | | | | vault: Fix test | Tim Steinbach | 2018-03-18 |
| | | | | | | |||
| | * | | | | Merge pull request #37272 from erictapen/manual-networking | Sarah Brofeldt | 2018-03-18 |
| | |\ \ \ \ | | | | | | | | | | | | | nixos/manual: fixed example config for networking.interfaces | ||
| | | * | | | | nixos/manual: fixed example config for networking.interfaces | Justin Humm | 2018-03-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The former example gave a "value is a list while a set was expected" error. | ||
| | * | | | | | Merge pull request #37198 from giraffito/patch-2 | Jörg Thalheim | 2018-03-18 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | nixos/sudo: fix description of sudo.wheelNeedsPassword | ||
| | | * | | | | | nixos/security: fix description of sudo.wheelNeedsPassword | giraffito | 2018-03-16 |
| | | |/ / / / | | | | | | | | | | | | | the previous description mistakenly described the opposite semantics | ||
| | * | | | | | nixos home-assistant: a couple of fixes (#36338) | Peter Hoeg | 2018-03-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) set path to /run/wrappers so ping works b) run via a target so we can easily inject other components (config copier, appdaemon) | ||
| | * | | | | | Merge pull request #37084 from herrwiese/evilwm | Jörg Thalheim | 2018-03-18 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | nixos/window-managers: actually add evilwm to default.nix | ||
| | | * | | | | | nixos/window-managers: actually add evilwm to default.nix | Andreas Wiese | 2018-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1f2b938 introduced a module for evilwm as a window-manager, but did not actually add this module to window-manager's default.nix which renders it useless. | ||
| | * | | | | | | Merge pull request #37216 from teto/qemu_comma_fix | Jörg Thalheim | 2018-03-18 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | qemu-vm: passing QEMU_NET_OPTS would fail | ||
| | | * | | | | | | qemu-vm: passing QEMU_NET_OPTS would fail | Matthieu Coudron | 2018-03-17 |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | because of a change in #36850. spotted by @jtojnar https://github.com/NixOS/nixpkgs/commit/b7a2333ebe7a0916c9791f3b7a839e8095c39f7f#commitcomment-28134992 | ||
| | * | | | | | | gitea: fix usage over ssh | Elis Hirwing | 2018-03-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using gitea over ssh had two isses: 1. No shell was set for the user 2. Gitea tried to write logs to /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when serving the ssh usage. | ||
| | * | | | | | | Merge pull request #37297 from coreyoconnor/jenkins-fonts | Jörg Thalheim | 2018-03-18 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add Deja-Vu fonts to jenkins environment and run as AWT headless | ||
| | | * | | | | | | jenkins: Add "java.awt.headless=true" to JDK options. | Corey O'Connor | 2018-03-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is consistent with the recommended jenkins startup script. See: * https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript | ||
| | | * | | | | | | jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning. | Corey O'Connor | 2018-03-17 |
| | | |/ / / / / | |||
| | * / / / / / | nixos manual: fix (n)of typo | Richard Marko | 2018-03-18 |
| | |/ / / / / | |||
| | * | | | | | 18.09: Jackrabbit -> Jellyfish | Vladimír Čunát | 2018-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See eb0fa09232 and github discussion on that. My misgiving about the t-shirts was refuted. I don't think this flip may negatively affect anyone. | ||
| | * | | | | | Merge commit '3ab2949' from staging into master | Tuomas Tynkkynen | 2018-03-15 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix | ||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-03-13 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix | ||
| | | * \ \ \ \ \ | Merge branch 'master' into staging | Jan Malakhovski | 2018-03-10 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix | ||
| | | * \ \ \ \ \ \ | Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging | Tuomas Tynkkynen | 2018-03-03 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | nixos: Add nixpkgs.crossSystem option for cross-compilation | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge remote-tracking branch 'origin/staging' into cross-nixos | Shea Levy | 2018-03-01 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into HEAD | Frederik Rietdijk | 2018-03-01 |
| | | | |\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-03-01 |
| | | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | nixos: Move uses of stdenv.shell to runtimeShell. | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | stage-2-init: Use the host bash as SHELL | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: Fix initrd dependency detection when cross-compiling. | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: manual: Fix cross-compilation. | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | gobjectIntrospection: Enable building without X11 support. | Shea Levy | 2018-03-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also disable it when noXlibs in NixOS. | ||
| | | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into cross-nixos | Shea Levy | 2018-02-28 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: sudo: Use build-time visudo for syntax check. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: keymap: Fix cross-compilation. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: stage-1: Don't try to test binaries when cross-compiling. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: Take glibcLocales from buildPackages. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to cross-compile pure data... | ||
| | | * | | | | | | | | | | | nixos: udev: Generate hwdb with build-native udevadm. | Shea Levy | 2018-02-28 |
| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | nixos: kexec: Disable on non-keexecable systems. | Shea Levy | 2018-02-28 |
| | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-02-28 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix | ||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into HEAD | Frederik Rietdijk | 2018-02-27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into HEAD | Frederik Rietdijk | 2018-02-27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge master into staging | Vladimír Čunát | 2018-02-26 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to cleanup the (re-)revert of merge to master. | ||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into HEAD | Frederik Rietdijk | 2018-02-26 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||