summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* 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
* | | | | | | Merge pull request #60081 from Streetwalrus/nginx_staplingSilvan Mosberger2019-05-03
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | nginx: use fullchain.pem for ssl_trusted_certificateDan Elkouby2019-04-23
* | | | | | | softether: 4.25 -> 4.29 (#60665)Hsiang-Cheng Yang2019-05-02
* | | | | | | Merge pull request #60543 from Infinisil/fix/znc-genSilvan Mosberger2019-05-02
|\ \ \ \ \ \ \
| * | | | | | | nixos/znc: Fix config generator for certain null valuesSilvan Mosberger2019-05-01
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #55771 from Infinisil/nixos/znapzend/parallelSilvan Mosberger2019-05-02
|\ \ \ \ \ \ \
| * | | | | | | nixos/znapzend: Run znapzendzetup import in parallelSilvan Mosberger2019-02-14
* | | | | | | | Merge pull request #55422 from nand0p/ethminerSilvan Mosberger2019-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | nixos/ethminer: initFernando J Pando2019-05-01
* | | | | | | | | Merge pull request #60097 from Mic92/openldap-rootpw-fileSilvan Mosberger2019-05-01
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nixos/openldap: make rootpw option optionalJörg Thalheim2019-04-23
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #60617 from nyanloutre/jellyfin_10_3_2Elis Hirwing2019-05-01
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | nixos/jellyfin: add test to all-tests.nixnyanloutre2019-05-01
* | | | | | | | | Merge pull request #59630 from worldofpeace/setcap-gnome-keyringworldofpeace2019-04-30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | gnome3.gnome-keyring: CAP_IPC_LOCK gnome-keyring-daemonworldofpeace2019-04-15