about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
...
* | | dnscrypt-proxy module: minor config example tweaksJoachim Fasting2016-10-29
| | | | | | | | | | | | | | | - Indentation - unbound automatically handles local forward addresses
* | | dnscrypt-proxy service: remove use of mkEnableOptionJoachim Fasting2016-10-29
| | |
* | | nixos/stage1: Fix local keyword outside functionaszlig2016-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @NeQuissimus in a5c1985fef381b1fb5d75d3b4028ed5b5d4454b3 for updating busybox, which since version 1.25 doesn't allow local variables outside of functions anymore (which is the desired behaviour). See the following upstream commit of busybox which is the change that let's this problem surface: https://git.busybox.net/busybox/commit/?id=ef2386b80abfb22ccb697ddbdd4047aacc395c50 So this has been an error I've made on my end in 67223ee205364afb203361b134f16b890c4d726c, because I originally had a function for killing the processes but desired to inline it because it's only used in one place. This fixes the boot-stage1 NixOS test. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | Revert "xserverArgs fuckup"Joachim Fasting2016-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c2922a9157a8d8db62cee763e254113c3766461e. See https://github.com/NixOS/nixpkgs/issues/19930 While the above commit is designed to allow GDM to work, it appears to break other use cases. In particular, it breaks tests involving X usage (e.g., i3wm[1] and firefox[2]), which makes it difficult to assess the impact of other changes and so hampers development of unrelated features. https://hydra.nixos.org/build/42852015 https://hydra.nixos.org/build/42851666
* | | Merge pull request #19875 from joachifm/cjdns-for-upstreamJoachim F2016-10-28
|\ \ \ | |_|/ |/| | Cjdns module enhancments
| * | cjdns service: refactor cjdns hosts builderJoachim Fasting2016-10-27
| | | | | | | | | | | | | | | | | | | | | The old version would export two lists to a bash builder and do pairwise processing on the bash side. In the new version we instead generate a logic free builder on the Nix side. This is not only conceptually simpler but reduces the amount of code and intermediate values.
| * | cjdns service: ensure that generated passwd has requested lengthJoachim Fasting2016-10-27
| | | | | | | | | | | | | | | | | | | | | `head -cNUM ... | tr -dc SET` might generate output containing fewer than NUM characters. Given the limited alphabet, this could result in a fairly weak passphrase. The construction `tr </dev/urandom | head -cNUM`, however, is sure to give us the full `NUM`.
| * | cjdns service: protect /home and /tmpJoachim Fasting2016-10-27
| | |
| * | cjdns service: better typesJoachim Fasting2016-10-27
| | | | | | | | | | | | | | | - types.string -> str, string is deprecated - change type of confFile option to nullOr path, makes more sense
| * | cjdns service: use cfg.enable shortcutJoachim Fasting2016-10-27
| | |
| * | cjdns service: whitespace cleanupJoachim Fasting2016-10-27
| | |
* | | Merge pull request #19874 from joachifm/opensmtpd-refactoringsJoachim F2016-10-27
|\ \ \ | | | | | | | | Opensmtpd module refactorings
| * | | opensmtpd service: remove redundant wants network.targetJoachim Fasting2016-10-26
| | | | | | | | | | | | | | | | Already part of normal bootup.
| * | | opensmtpd service: require serverConfigurationJoachim Fasting2016-10-26
| | | | | | | | | | | | | | | | | | | | | | | | If the daemon won't function without a valid config, it makes no sense to default to an empty config. Instead, turn that case into a build failure.
| * | | opensmtpd service: path -> package for option procPackagesJoachim Fasting2016-10-26
| | | |
| * | | opensmtpd service: use explicit pkgs for consistencyJoachim Fasting2016-10-26
| | | |
| * | | opensmtpd service: serviceConfiguration option as types.linesJoachim Fasting2016-10-26
| | | |
* | | | Merge pull request #19876 from joachifm/fix-virtualbox-testJoachim F2016-10-27
|\ \ \ \ | | | | | | | | | | virtualbox-{systemd-detect-virt,net-hostonlyif} test: fix dbus socket dir
| * | | | virtualbox-{systemd-detect-virt,net-hostonlyif} test: fix dbus socket dirJoachim Fasting2016-10-26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test complains[1][2] that Failed to start message bus: Failed to bind socket "/run/dbus/system_bus_socket": No such file or directory In 639e5401ff51d4c0075b5ceffcbdbfec64c67db3, the dbus socket dir is set to `/run/dbus`; in the test vm `/var/run/dbus` is used, but the standard `/run -> /var/run` link is typically not created until stage 2 init, not in the minimal init used here. Thus, dbus fails to run within the test environment . Fix by changing `/var/run/dbus` to simply `/run/dbus`. [1]: https://hydra.nixos.org/build/42534725 [2]: https://hydra.nixos.org/build/42523834
* | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2016-10-26
|\ \ \ \ | | |/ / | |/| |
| * | | nixos/tftpd: change default dir from /home/tftp to /srv/tftpBjørn Forsman2016-10-25
| | | | | | | | | | | | | | | | | | | | /home is for real users. /srv is recommended by FHS (although there is no consensus for what to name subdirs under /srv).
| * | | nixos/tftpd: mention that it runs as an xinetd serviceBjørn Forsman2016-10-25
| |/ /
| * | Merge pull request #19453 from ryantrinkle/openfire-fixDomen Kožar2016-10-24
| |\ \ | | | | | | | | openfire: fix service expression
| | * | openfire: fix service expressionRyan Trinkle2016-10-19
| | | | | | | | | | | | | | | | openfire is not in scope
| * | | Merge pull request #19805 from joachifm/startAt-fixupsJoachim F2016-10-23
| |\ \ \ | | | | | | | | | | Fixup remaining uses of startAt
| | * | | nix gc service: fix use of startAtJoachim Fasting2016-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `startAt = ""` as in `startAt = optionalString false ...` results in an invalid timer unit (due to "" being promoted to a singleton list and not filtered out). Ref: c9941c4b5ef7acc1cb8d734acb383410d99c01ba
| | * | | nixos autoUpgrade: fix use of startAtJoachim Fasting2016-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `startAt = ""` as in `startAt = optionalString false ...` results in an invalid timer unit (due to "" being promoted to a singleton list and not filtered out). Ref: c9941c4b5ef7acc1cb8d734acb383410d99c01ba
| * | | | nixos/octoprint: fixup extraConfigEmery Hemingway2016-10-23
| | | | |
| * | | | nixos: use types.lines for extraConfigEmery Hemingway2016-10-23
| |/ / /
| * | | openldap: apply correct type for configDirJörg Thalheim2016-10-23
| | | | | | | | | | | | | | | | null is not a path
| * | | Merge pull request #19795 from womfoo/fix/openldap-configDirLuca Bruno2016-10-23
| |\ \ \ | | | | | | | | | | openldap: set configDir as null
| | * | | openldap: set configDir as nullKranium Gikos Mendoza2016-10-23
| | | | | | | | | | | | | | | | | | | | fixes an error #19794 with this new option f3404b7 when using plain configuration files
| * | | | oblogout: init at 2009-11-18José Romildo Malaquias2016-10-23
| |/ / /
| * | | brltty: 5.2 -> 5.4Bram Duvigneau2016-10-22
| | | |
| * | | Merge pull request #17394 from schneefux/znc-moduleJörg Thalheim2016-10-22
| |\ \ \ | | | | | | | | | | ZNC: 1.6.2 -> 1.6.3, push 2015-12-07 -> 2016-07-28, module refactor
| | * | | znc module: refactorschneefux2016-10-22
| | | | |
| * | | | Merge pull request #19601 from Hinidu/fix/neo4j-update-3Jörg Thalheim2016-10-22
| |\ \ \ \ | | | | | | | | | | | | neo4j: 2.1.3 -> 3.0.6
| | * | | | neo4j: 2.1.3 -> 3.0.6Pavel Platto2016-10-16
| | | | | |
| * | | | | Merge pull request #19624 from bjornfor/improve-atftpd-serviceJörg Thalheim2016-10-22
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/atftpd: various improvements
| | * | | | | nixos/atftpd: various improvementsBjørn Forsman2016-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add extraOptions option, to pass arbitrary command line options to atftp. Especially useful to specify which address to bind to (--bind-addres ...). * Improve descriptions (fix a typo, document default bind address, don't repeat service name in systemd description + capitalize) * Change default server directory from /var/empty to /srv/tftp, and change types.str to types.path.
* | | | | | | gnome3: default to 3.22 (#19743)Alexander Ried2016-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnome3: default to 3.22 * zuki-themes: add src for gnome 3.22, remove 3.18 * gnome3_22.vte_290: copy from gnome3.20 * termite: use vte-select-text from gnome3_20
* | | | | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2016-10-22
|\| | | | | |
| * | | | | | lightdm module: require accounts daemon moduleobadz2016-10-22
| | | | | | |
| * | | | | | Merge pull request #19347 from cedeel/bspwm-gitJörg Thalheim2016-10-22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | bspwm-unstable: init at 2016-09-30
| | * | | | | | bspwm-unstable: init at 2016-09-30Chris Darnell2016-10-16
| | | | | | | |
| * | | | | | | Merge pull request #19289 from DerTim1/openldap-add-configDir-optionJörg Thalheim2016-10-22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | openldap: add configDir option
| | * | | | | | | Add configDir optionTim Digel2016-10-10
| | | | | | | | |
| * | | | | | | | Merge pull request #19635 from nhooyr/sshgenJörg Thalheim2016-10-21
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | sshd: separate key generation into another service
| | * | | | | | | | sshd: separate key generation into another serviceAnmol Sethi2016-10-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19589
| * | | | | | | | | quassel-webserver: init at 2.1.1uwap2016-10-21
| | | | | | | | | |