summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #27094 from nand0p/buildbot-0.9.9Frederik Rietdijk2017-07-07
|\ | | | | buildbot: 0.9.7 -> 0.9.9.post2
| * buildbot: 0.9.7 -> 0.9.9.post2Fernando J Pando2017-07-07
| | | | | | | | | | | | - adds grid-view plugin - module fixup - tested on nixos
* | Merge pull request #27133 from NeQuissimus/ammonite_1_0_0Tim Steinbach2017-07-07
|\ \ | | | | | | ammonite: 0.9.9 -> 1.0.0
| * | ammonite: add testTim Steinbach2017-07-04
| | |
* | | nixos-rebuild: Respect empty NIX_REMOTEEelco Dolstra2017-07-07
| | | | | | | | | | | | | | | | | | | | | Fixes #11384. Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid ambiguity.
* | | Merge pull request #25600 from johnramsden/nylas-mailMichael Raskin2017-07-06
|\ \ \ | |_|/ |/| | nylas-mail: 2.0.32
| * | Rename nylas-mail to nylas-mail-bin.John Ramsden2017-07-05
| | | | | | | | | | | | Change pkg in module, and name in pkg.
| * | Add keyring enable option and add Nylas to systemPackagesJohn Ramsden2017-06-28
| | |
| * | Add Nylas mail module. Still needs keyring configurationJohn Ramsden2017-06-28
| | |
* | | Release notes: Fix syntax in code samplenonsequitur2017-07-05
| | |
* | | Merge branch 'staging'Vladimír Čunát2017-07-05
|\ \ \ | |_|/ |/| | | | | | | | Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
| * | Merge branch 'master' into stagingVladimír Čunát2017-07-03
| |\ \
| * \ \ Merge pull request #26897 from layus/nixos-terminfoJörg Thalheim2017-07-01
| |\ \ \ | | | | | | | | | | terminfo: symlink terminfo to /etc for ncurses
| | * | | terminfo: symlink terminfo to /etc for ncursesGuillaume Maudoux2017-06-30
| | | | |
| * | | | Merge branch 'master' into stagingVladimír Čunát2017-06-30
| |\ \ \ \ | | |/ / / | |/| | | | | | | | Mass rebuilds from master (>7k on x86_64-linux).
| * | | | nixos/boot/stage-1: fix failing nixos-rebuild switch because of blkid outputChristian Albrecht2017-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old version of blkid used to output version information including libblkid version when invoked with --help parameter new version does not output libblkid version when invoked with --help parameter fix is to invoke blkid with -V parameter to output version including libblkid in both cases
* | | | | lib: introduce imap0, imap1 (#25543)zimbatm2017-07-04
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib: introduce imap0, imap1 For historical reasons, imap starts counting at 1 and it's not consistent with the rest of the lib. So for now we split imap into imap0 that starts counting at zero and imap1 that starts counting at 1. And imap is marked as deprecated. See https://github.com/NixOS/nixpkgs/commit/c71e2d42359f9900ea2c290d141c0d606471da16#commitcomment-21873221 * replace uses of lib.imap * lib: move imap to deprecated.nix
* | | | nixos/xserver: Allow more than one keyboard layoutaszlig2017-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by 44c64fef16ed566786c8db276085b484c9d233f3. The services.xserver.layout option allows to specify more than one layout separated by comma, which the commit above didn't take into account. This is very similar to @lheckemann's pull request (#26984) but differs in the following ways: * Print out the full list available layouts (as suggested by @0xABAB in [1]). * Loop over $layout using the default IFS (and thus no need for escaping ${cfg.layout}), because the layouts won't contain white spaces. * Re-do the error message, which now uses multiple echos instead of a heredoc, so the line is wrapped according to the viewers terminal width. I've tested this with several good and bad layouts and also against the keymap NixOS VM subtests. [1]: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146700 Signed-off-by: aszlig <aszlig@redmoonstudios.org> Fixes: #26961 Closes: #26984
* | | | nixos/xserver: Document the layouts sed expressionaszlig2017-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was brought up by @0xABAB in #26984 by the following comment: https://github.com/NixOS/nixpkgs/pull/26984#discussion_r125146405 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | Merge pull request #26990 from jfrankenau/mpd-create-playlistDirJoachim F2017-07-02
|\ \ \ \ | | | | | | | | | | mpd service: Create playlist directory
| * | | | mpd service: Create playlist directoryJohannes Frankenau2017-07-01
| | |/ / | |/| |
* | | | Merge pull request #26978 from volth/lighttpd-collectd-submoduleJoachim F2017-07-02
|\ \ \ \ | | | | | | | | | | lighttpd: add collectd submodule
| * | | | lighttpd: add collectd submoduleVolth2017-06-29
| | | | |
* | | | | Merge pull request #26980 from volth/collectd-service-minor-refactoringJoachim F2017-07-02
|\ \ \ \ \ | | | | | | | | | | | | collectd service: minor refactoring
| * | | | | collectd service: removed insecure AmbientCapabilitiesVolth2017-06-30
| | | | | |
| * | | | | collectd service: minor refactoringVolth2017-06-30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * removed pid-file support, it is needless to run collectd as systemd service * removed static user id, as all the files reowned on the service start * added ambient capabilities for ping and smart (hdd health) functions
* | | | | Merge pull request #27019 from fadenb/heartbeat_serviceJoachim F2017-07-02
|\ \ \ \ \ | | | | | | | | | | | | heartbeat service: init
| * | | | | heartbeat service: initTristan Helmich2017-07-02
| | | | | |
* | | | | | Merge pull request #27030 from Infinisil/luks-typoFrederik Rietdijk2017-07-02
|\ \ \ \ \ \ | |/ / / / / |/| | | | | luksroot: fix typo
| * | | | | luksroot: fix typoSilvan Mosberger2017-07-02
| |/ / / /
* | | | | Merge pull request #26964 from romildo/upd.luminaJoachim F2017-07-01
|\ \ \ \ \ | | | | | | | | | | | | lumina: 1.2.0-p1 -> 1.3.0
| * | | | | lumina: 1.2.0-p1 -> 1.3.0romildo2017-06-29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update to version 1.3.0 - Remove dependency on `oxygen-icons5`, as Lumina desktop now distributes it’s own "material-design-[light/dark]" icon themes and uses them as the default icon sets.
* | | | | Merge pull request #26541 from dermetfan/browserpassJoachim F2017-06-30
|\ \ \ \ \ | | | | | | | | | | | | browserpass: 2017-04-11 -> 1.0.5
| * | | | | browserpass: 2017-04-11 -> 1.0.5Robin Stumm2017-06-30
| | |/ / / | |/| | |
* | | | | Merge pull request #26492 from michalpalka/new-xenJoachim F2017-06-30
|\ \ \ \ \ | | | | | | | | | | | | xen_4_8: init at 4.8.1
| * | | | | xen_4_8: init at 4.8.1Michał Pałka2017-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the xen_4_8 package to be used instead of xen (currently at 4.5.5): * Add packages xen_4_8, xen_4_8-slim and xen_4_8-light * Add packages qemu_xen_4_8 and qemu_xen_4_8-light to be used with xen_4_8-slim and xen_4_8-light respectively. * Add systemd to buildInputs of xen (it is required by oxenstored) * Adapt xen service to work with the new version of xen * Use xen-init-dom0 to initlilise dom0 in xen-store * Currently, the virtualisation.xen.stored option is ignored if xen 4.8 is used
* | | | | | nixos release-combined: only build zfsroot tests on x86_64-linuxGraham Christensen2017-06-30
| |/ / / / |/| | | |
* | | | | Merge pull request #26967 from ↵Jörg Thalheim2017-06-30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | florianjacob/fix-systemd-resolved-nsswitch-loading Fix systemd resolved nsswitch loading and clearly state NSS module's dependency on nscd
| * | | | | nsswitch: only add modules to nsswitch.conf if they can be loadedFlorian Jacob2017-06-30
| | | | | |
| * | | | | nsswitch: add assertions for enabled nscdFlorian Jacob2017-06-30
| | | | | |
| * | | | | nsswitch: fix typo specifying nss-resolve moduleFlorian Jacob2017-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this had the effect of not being able to load nss-resolve and falling back to dns module in all cases.
* | | | | | Merge pull request #26940 from grahamc/nixos-manualGraham Christensen2017-06-29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | NixOS Manual: Make it easier to debug
| * | | | | nixos manual: combine XML and validate separatelyGraham Christensen2017-06-29
| | | | | |
| * | | | | nixos manual: Remove trailing newline in version XMLGraham Christensen2017-06-28
| | | | | |
* | | | | | Merge pull request #26917 from grahamc/zfs-installer-testGraham Christensen2017-06-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | nixos: installer.nix test: test ZFS install use case
| * | | | | | nixos: installer.nix test: test ZFS install use caseGraham Christensen2017-06-28
| |/ / / / /
* | | | | | nixos/xserver: Don't use exec in xkb-layouts-existaszlig2017-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, thanks to @pbogdan for getting this problem reproduced: https://github.com/NixOS/nixpkgs/commit/2014db3efcd2a#commitcomment-22815396 Also thanks to @vcunat for bringing this to my attention: https://github.com/NixOS/nixpkgs/commit/44c64fef16ed5#commitcomment-22813503 Although it is not entirely clear why Nix has killed the build prior to finishing, it seems to be related to the process substition I was using. So instead of using "exec touch", let's wrap this inside an if so we don't exit too early. Tested this against all sub-tests in nixos/tests/keymap.nix and also a few configurations with wrong keyboard layout definitions. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos xkb-layouts-exist: try to debug on HydraVladimír Čunát2017-06-28
|/ / / / / | | | | | | | | | | | | | | | I hate having to do this. We're unable to reproduce the problem locally.
* / / / / network-manager: hostname option is deprecatedRickard Nilsson2017-06-28
|/ / / / | | | | | | | | | | | | | | | | From log: <warn> [1498639184.8965] keyfile: 'hostname' option is deprecated and has no effect
* | | | Merge pull request #26073 from florianjacob/piwik-packageJoachim F2017-06-27
|\ \ \ \ | | | | | | | | | | piwik & piwik service: init at 3.0.4