summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into staging-nextVladimír Čunát2019-05-11
|\
| * maintainers: add kolaentekolaente2019-05-11
| * Merge pull request #61048 from Ma27/zmap-packageworldofpeace2019-05-10
| |\
| | * nixos/zmap: init moduleMaximilian Bosch2019-05-10
| * | Merge pull request #61237 from basvandijk/journalbeat-fixesBas van Dijk2019-05-10
| |\ \
| | * | nixos/journalbeat: support journalbeat >= 6 & add testBas van Dijk2019-05-10
| * | | virtualbox: 5.2.28 -> 6.0.6Ambroz Bizjak2019-05-09
| * | | Merge pull request #60569 from dtzWill/update/vnstat-2.2Renaud2019-05-09
| |\ \ \ | | |/ / | |/| |
| | * | vnstat: 2.1 -> 2.2Will Dietz2019-05-03
| * | | Merge pull request #44086 from erikarvstedt/paperlessworldofpeace2019-05-08
| |\ \ \
| | * | | paperless service: initErik Arvstedt2019-05-08
| * | | | Merge pull request #60776 from alyssais/xerrorAlyssa Ross2019-05-08
| |\ \ \ \
| | * | | | nixos/xserver: improve DM error message when X offAlyssa Ross2019-05-02
| * | | | | Merge pull request #61072 from dtzWill/feature/rngd-debug-flagWill Dietz2019-05-07
| |\ \ \ \ \
| | * | | | | rngd: add option to run w/debug flagWill Dietz2019-05-06
* | | | | | | Merge staging-next into stagingFrederik Rietdijk2019-05-07
|\| | | | | |
| * | | | | | jellyfin: remove assertion if emby enabled: no emby module existsDavid Izquierdo2019-05-07
| |/ / / / /
| * | | | | Merge pull request #60237 from mayflower/kexec-no-clobberLinus Heckemann2019-05-06
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | nixos/kexec: log what's happeningLinus Heckemann2019-04-29
| | * | | | nixos/kexec: don't clobber existing kexec-loaded kernelLinus Heckemann2019-04-26
| * | | | | Merge pull request #59943 from romildo/fix.deepin.modulesJosé Romildo Malaquias2019-05-05
| |\ \ \ \ \
| | * | | | | nixos/deepin: add deepin-anything serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add dde-dock dbus serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: install polkit local authority files in /etcJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add deepin-screenshot dbus serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add deepin-image-viewer dbus serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add dde-session-ui dbus serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add dde-calendar dbus serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add deepin-turbo systemd serviceJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: move deepin-menu.nix into deepin.nixJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: fix the deepin-daemon user and groupJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: add dde-api services and user/groupJosé Romildo Malaquias2019-05-05
| | * | | | | nixos/deepin: rename dde-daemon moduleJosé Romildo Malaquias2019-05-05
| * | | | | | nix.systemFeatures: minor fixvolth2019-05-05
| |/ / / / /
| * | | | | Merge pull request #59148 from volth/gcc.arch.v3Michael Raskin2019-05-05
| |\ \ \ \ \
| | * | | | | nix.systemFeatures: minor refactorvolth2019-04-30
| | * | | | | compilation for particular x86_64 architecturevolth2019-04-30
| * | | | | | nixos/misc/nixpkgs: fixed syntax error in overlays exampleAndreas Rammhold2019-05-04
* | | | | | | Merge pull request #60217 from dotlambda/home-assistant-0.92Robert Schütz2019-05-05
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | nixos/home-assistant: account for introduction of manifest.jsonRobert Schütz2019-05-04
* | | | | | | Merge pull request #59367 from Ma27/fix-hostapd-interface-namingRenaud2019-05-03
|\ \ \ \ \ \ \
| * | | | | | | nixos/hostapd: escape interface names for hostapdMaximilian Bosch2019-04-12
* | | | | | | | Merge pull request #59856 from c00w/external_gpuworldofpeace2019-05-03
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | nixos/nvidia: Add NVIDIA optimus option to allow external GPUsColin L Rice2019-05-02
* | | | | | | | Merge pull request #60575 from dtzWill/feature/obfs4proxyJoachim F2019-05-03
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | nixos tor: use obfs4proxy, make transport list customizableWill Dietz2019-05-01
* | | | | | | | Merge pull request #60630 from etu/drop-embyElis Hirwing2019-05-03
|\ \ \ \ \ \ \ \
| * | | | | | | | emby: Drop package and module and refer to jellyfinElis Hirwing2019-05-01
| |/ / / / / / /
* | | | | | | | Merge pull request #60333 from azazel75/fix-grafana_reporterSilvan Mosberger2019-05-03
|\ \ \ \ \ \ \ \
| * | | | | | | | grafana_reporter: Fix library function nameAlberto Berti2019-04-27