about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
...
| * | | | | | | Merge pull request #40879 from seppeljordan/pr-ipfs-port-scanningSarah Brofeldt2018-05-24
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | nixos/ipfs: Improve behavior of localDiscovery optionSebastian Jordan2018-05-23
| | * | | | | | nixos/ipfs: Add option to disable local port scanning for ipfs daemonSebastian Jordan2018-05-21
| * | | | | | | crowd: 3.0.1 -> 3.1.2Simon Lackerbauer2018-05-24
| * | | | | | | nixos/prometheus-node-exporter: fix file collectorWilliButz2018-05-24
| * | | | | | | gitlab module: update for 10.8Robin Gloster2018-05-24
| * | | | | | | nixos/borgbackup: let borg write to disk and see /tmp, add extraArgsSimon Lackerbauer2018-05-24
| * | | | | | | nixos/oxidized: add moduleWilliButz2018-05-24
| * | | | | | | nixos/programs/shell.nix: Enhance bad ownership error messageTuomas Tynkkynen2018-05-24
| * | | | | | | nixos/programs/shell.nix: Use [ ] instead of testTuomas Tynkkynen2018-05-24
| * | | | | | | nixos/programs/shell.nix: Quote variablesTuomas Tynkkynen2018-05-24
| * | | | | | | Merge pull request #40462 from samueldr/fix/grub-backgroundGraham Christensen2018-05-23
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/grub: Implements use of file format for splashImage.Samuel Dionne-Riel2018-05-13
| | * | | | | | | nixos/grub: Updates `splashImage` description to match reality.Samuel Dionne-Riel2018-05-13
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-23
|\| | | | | | |
| * | | | | | | beegfs/module: Fix a typo in meta.conf generation (#40979)markuskowa2018-05-23
* | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-23
|\| | | | | | |
| * | | | | | | Merge pull request #40778 from phile314/slimserver-fixSarah Brofeldt2018-05-23
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/slimserver: Disable broken image/video support (#40589)Philipp Hausmann2018-05-23
| * | | | | | | | Merge pull request #40806 from Mic92/nixos-idsYegor Timoshenko2018-05-23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/ids: information when to use static uids/gidsJörg Thalheim2018-05-20
| | |/ / / / / / /
| * | | | | | | | Merge pull request #39982 from tadfisher/scsi-link-policyYegor Timoshenko2018-05-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/powerManagement: add "med_power_with_dipm" scsiLinkPolicyTad Fisher2018-05-04
| * | | | | | | | | Merge pull request #40881 from hedning/flatpax-xdg-data-dirsMatthew Justin Bauer2018-05-22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos/flatpak: add flatpak's XDG_DATA_DIRS to the environmentTor Hedin Brønner2018-05-22
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-22
|\| | | | | | | | |
| * | | | | | | | | networking.routes: static routes are proto staticRobin Gloster2018-05-22
| * | | | | | | | | home-assistant module: add openFirewall optionRobin Gloster2018-05-22
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | kubernetes-dashboard: raise memory limit to 250MBKevin Liu2018-05-21
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #40892 from NixOS/no-more-nixpkgs-symlinkYegor Timoshenko2018-05-22
| |\ \ \ \ \ \ \
| | * | | | | | | Stop requiring the nixpkgs symlink in NixOS channel tarballsDaniel Peebles2018-05-21
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-21
|\| | | | | | | |
| * | | | | | | | nixos/tests/mysql-replication: fix test (#40850)xeji2018-05-22
| |/ / / / / / /
| * | | | | | | Merge pull request #40565 from etu/gitea-improvementsSamuel Leathers2018-05-21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | nixos/gitea: Add options to enable a timer with optional intervalElis Hirwing2018-05-20
| | * | | | | | nixos/gitea: Allow customizing derivation to useElis Hirwing2018-05-20
| * | | | | | | nixos/xsslock: wait until `pgrep xlock` succeeds (#40810)Maximilian Bosch2018-05-20
| |/ / / / / /
* | | | | | | Merge branch 'master' into stagingVladimír Čunát2018-05-20
|\| | | | | |
| * | | | | | Merge pull request #40801 from xeji/test/dnscrypt-proxySamuel Leathers2018-05-19
| |\ \ \ \ \ \
| | * | | | | | nixos/dnscrypt-proxy: fix apparmor profile and testUli Baum2018-05-20
| * | | | | | | nixos/cjdns: fix service for i686 (#40740)xeji2018-05-20
| |/ / / / / /
| * | | | | | Merge pull request #40744 from kirelagin/wireguard-darwinJörg Thalheim2018-05-19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | wireguard: Enable tools on other platformsKirill Elagin2018-05-19
* | | | | | | Merge branch 'master' into stagingRobert Schütz2018-05-19
|\| | | | | |
| * | | | | | nixos/tests/nexus: fix for i686 (#40743)xeji2018-05-19
| * | | | | | Revert "zsh: move setEnvironment stuff to zprofile"Gregor Kleen2018-05-19
| * | | | | | nixos/tests/hardened: fix test (#40745)xeji2018-05-19
| |/ / / / /
* | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-18
|\| | | | |
| * | | | | nixos/tests/home-assistant: ignore "Timer got out of sync" error (#40735)Robert Schütz2018-05-18
| * | | | | nixos/xss-lock: add module (#40619)Maximilian Bosch2018-05-18