summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* 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
| |\ \ \
| | * | | syncthing,qsyncthingtray: remove syncthing-inotifyTimo Kaufmann2018-02-24
| * | | | tree-wide: autorename gnome packages to use dashesJan Tojnar2018-02-25
| * | | | nixos/mysql: Unbreak initial database creationSarah Brofeldt2018-02-24
| * | | | Merge pull request #35461 from lheckemann/grub-by-idJörg Thalheim2018-02-24
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | grub module: suggest by-id paths for devicesLinus Heckemann2018-02-24
* | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-24
|\| | | |
| * | | | nixos/alsa: Do not make sound.enable conditional on stateVersion.Aristid Breitkreuz2018-02-23
| * | | | nixos/programs.chromium: write policies for google-chrome toovolth2018-02-23
| * | | | tinc: enable invitationsTom Bereknyei2018-02-23
| * | | | Merge pull request #35065 from jtojnar/fwupd-1.0.5Jan Tojnar2018-02-23
| |\ \ \ \
| | * | | | Revert "nixos tests: disable fwupd for now"Jan Tojnar2018-02-22
| | * | | | nixos/fwupd: use manual list of etc filesJan Tojnar2018-02-22
* | | | | | cups service: fix client socketsNikolay Amiantov2018-02-23
|/ / / / /
* | | | | Revert "cups service: fix client sockets"Nikolay Amiantov2018-02-23
* | | | | cups service: fix client socketsNikolay Amiantov2018-02-23
* | | | | Merge pull request #35343 from gnidorah/softetherJörg Thalheim2018-02-23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | softether module: fix dataDir optiongnidorah2018-02-22
| | |/ / | |/| |
* | | | Merge pull request #35026 from alesguzik/acpid_log_eventsFranz Pletz2018-02-23
|\ \ \ \
| * | | | nixos/acpid: add option to log eventsAles Huzik2018-02-21
* | | | | Merge pull request #31619 from NeQuissimus/exclude_rtl8723bsFranz Pletz2018-02-23
|\ \ \ \ \
| * | | | | rtl8723bs: Only include in enableAllFirmware if validTim Steinbach2018-02-22
| | |/ / / | |/| | |
* | | | | nixos/tox-bootstrapd: new command line formatvolth2018-02-23
* | | | | nixos/manual: fix buildFranz Pletz2018-02-23
* | | | | browserpass module: add firefox supportFranz Pletz2018-02-23
* | | | | nixpkgs module: update config exampleFranz Pletz2018-02-23
* | | | | Merge pull request #34470 from WilliButz/fix-xautolockFranz Pletz2018-02-22
|\ \ \ \ \
| * | | | | nixos/xautolock: fix default defaults/examples, add assertionsWilliButz2018-01-31
* | | | | | nixos: disable sound by default, if stateVersion >= 18.03 (#35355)Aristid Breitkreuz2018-02-22
* | | | | | nixos/label: no prepend '-' if there are no tagsvolth2018-02-22
* | | | | | nixos/programs.chromium: remove unicode char '↪'volth2018-02-22
* | | | | | Merge pull request #35243 from FRidh/postgisFrederik Rietdijk2018-02-22
|\ \ \ \ \ \
| * | | | | | postgis: get rid of composableDerivationFrederik Rietdijk2018-02-20
* | | | | | | rabbitmq: 3.6.10 -> 3.6.15 (and various improvements)Profpatsch2018-02-22
| |_|/ / / / |/| | | | |