mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 09:31:01 +00:00
Code Issues Wiki Activity
110612 commits 262 branches 124 tags 5.3 GiB
Commit graph

7753 commits

Author SHA1 Message Date
Daiderd Jordan 8189811d3f Merge pull request #25648 from yacinehmito/custom 
Make zshrc more predictable
 2017-07-09 10:45:40 +02:00
Joachim F a00a880572 Merge pull request #27055 from jfrankenau/mpd-startWhenNeeded 
mpd service: Start when needed and harden
 2017-07-09 09:34:31 +01:00
Michael Raskin 0d2d5e2147 Merge pull request #27143 from florianjacob/networkmanager-support-resolved 
networkmanager service: use resolved if enabled
 2017-07-08 22:34:09 +02:00
Frederik Rietdijk ea5b2df865 Merge pull request #27094 from nand0p/buildbot-0.9.9 
buildbot: 0.9.7 -> 0.9.9.post2
 2017-07-07 17:48:29 +02:00
Fernando J Pando f6a7b851d4 buildbot: 0.9.7 -> 0.9.9.post2 
- adds grid-view plugin
- module fixup
- tested on nixos
 2017-07-07 10:00:37 -04:00
Tim Steinbach 8ab9f99309 Merge pull request #27133 from NeQuissimus/ammonite_1_0_0 
ammonite: 0.9.9 -> 1.0.0
 2017-07-07 09:01:26 -04:00
Eelco Dolstra 707703185d
nixos-rebuild: Respect empty NIX_REMOTE 
Fixes #11384.

Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid
ambiguity.
 2017-07-07 11:58:10 +02:00
Yacine Hmito 1f70f3801b Make zshrc more predictable 
Originially, `programs.zsh` sets default values for some
initialisation scripts.
Nix resolves the case of multiple values by concatenating them all.
It is however impossible to predict where the default script will be
inserted; but we never want the default value to override the
user-specified ones.
Now, it doesn't set default values; almost everything is hardcoded at
the begining of the file.
 2017-07-06 22:43:05 +02:00
Michael Raskin 05aa2a58db Merge pull request #25600 from johnramsden/nylas-mail 
nylas-mail: 2.0.32
 2017-07-06 02:04:24 +02:00
John Ramsden 407324faa9
Rename nylas-mail to nylas-mail-bin. 
Change pkg in module, and name in pkg.
 2017-07-05 16:28:01 -07:00
nonsequitur 8210d86041 Release notes: Fix syntax in code sample 2017-07-05 16:39:19 +03:00
Vladimír Čunát 5328aac7be
Merge branch 'staging' 
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
 2017-07-05 08:55:26 +02:00
Tim Steinbach fbbf926ce9
ammonite: add test 2017-07-04 21:36:30 -04:00
zimbatm 4d545297d8 lib: introduce imap0, imap1 (#25543) 
* 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 c71e2d4235 (commitcomment-21873221)

* replace uses of lib.imap

* lib: move imap to deprecated.nix
 2017-07-04 23:29:23 +01:00
Florian Jacob 12f54a5746 networkmanager service: use resolved if enabled 2017-07-04 23:50:56 +02:00
Johannes Frankenau c4528eb4cc mpd service: Start when needed and harden 2017-07-04 09:50:34 +02:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
aszlig 69da1807f0
nixos/xserver: Allow more than one keyboard layout 
Regression introduced by 44c64fef16.

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
 2017-07-03 08:29:20 +02:00
aszlig d97cdfc591
nixos/xserver: Document the layouts sed expression 
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>
 2017-07-03 08:29:16 +02:00
Joachim F e4ca35a4f6 Merge pull request #26990 from jfrankenau/mpd-create-playlistDir 
mpd service: Create playlist directory
 2017-07-02 14:23:53 +01:00
Joachim F c2576ac2d3 Merge pull request #26978 from volth/lighttpd-collectd-submodule 
lighttpd: add collectd submodule
 2017-07-02 11:49:06 +01:00
Joachim F e20364a937 Merge pull request #26980 from volth/collectd-service-minor-refactoring 
collectd service: minor refactoring
 2017-07-02 11:48:56 +01:00
Joachim F c0086b8996 Merge pull request #27019 from fadenb/heartbeat_service 
heartbeat service: init
 2017-07-02 11:42:54 +01:00
Tristan Helmich 97e8422541 heartbeat service: init 2017-07-02 10:45:59 +02:00
Frederik Rietdijk 6b5150d29d Merge pull request #27030 from Infinisil/luks-typo 
luksroot: fix typo
 2017-07-02 10:37:01 +02:00
Silvan Mosberger cf07fc6b16 luksroot: fix typo 2017-07-02 04:37:51 +02:00
Joachim F 4e548d2717 Merge pull request #26964 from romildo/upd.lumina 
lumina: 1.2.0-p1 -> 1.3.0
 2017-07-01 12:51:14 +01:00
Jörg Thalheim 343ad1697d Merge pull request #26897 from layus/nixos-terminfo 
terminfo: symlink terminfo to /etc for ncurses
 2017-07-01 09:27:24 +01:00
Johannes Frankenau 0dd204ebfe mpd service: Create playlist directory 2017-07-01 09:13:49 +02:00
Joachim F 74b3a8f5ae Merge pull request #26541 from dermetfan/browserpass 
browserpass: 2017-04-11 -> 1.0.5
 2017-06-30 20:58:37 +01:00
Joachim F a8ba50db3e Merge pull request #26492 from michalpalka/new-xen 
xen_4_8: init at 4.8.1
 2017-06-30 20:27:04 +01:00
Graham Christensen 5fd4ae36e2
nixos release-combined: only build zfsroot tests on x86_64-linux 2017-06-30 15:21:30 -04:00
Vladimír Čunát ddf864f8aa
Merge branch 'master' into staging 
Mass rebuilds from master (>7k on x86_64-linux).
 2017-06-30 18:16:58 +02:00
Volth a1212c7784 collectd service: removed insecure AmbientCapabilities 2017-06-30 11:57:46 +00:00
Robin Stumm 4540eaf578 browserpass: 2017-04-11 -> 1.0.5 2017-06-30 13:32:45 +02:00
Guillaume Maudoux bd562949cf terminfo: symlink terminfo to /etc for ncurses 2017-06-30 11:17:11 +02:00
Jörg Thalheim 1266c8f935 Merge pull request #26967 from florianjacob/fix-systemd-resolved-nsswitch-loading 
Fix systemd resolved nsswitch loading and clearly state NSS module's dependency on nscd
 2017-06-30 09:26:18 +01:00
Volth 67340baa9b collectd service: minor refactoring 
* 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
 2017-06-30 00:52:22 +00:00
Florian Jacob e370e97f3d nsswitch: only add modules to nsswitch.conf if they can be loaded 2017-06-30 02:44:23 +02:00
Florian Jacob 7410b0c82c nsswitch: add assertions for enabled nscd 2017-06-30 02:44:22 +02:00
Florian Jacob 63fa3e7c62 nsswitch: fix typo specifying nss-resolve module 
this had the effect of not being able to load nss-resolve
and falling back to dns module in all cases.
 2017-06-30 02:40:49 +02:00
Graham Christensen 8ca805d02f Merge pull request #26940 from grahamc/nixos-manual 
NixOS Manual: Make it easier to debug
 2017-06-29 19:45:16 -04:00
Volth 99b8d5ebe6 lighttpd: add collectd submodule 2017-06-29 22:41:22 +00:00
Graham Christensen 1eb979db0e
nixos manual: combine XML and validate separately 2017-06-29 11:25:03 -04:00
romildo c5ff68b3c2 lumina: 1.2.0-p1 -> 1.3.0 
- 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.
 2017-06-29 08:13:09 -03:00
Graham Christensen 4f3f926906
nixos manual: Remove trailing newline in version XML 2017-06-28 19:58:06 -04:00
Graham Christensen 425e9ce493 Merge pull request #26917 from grahamc/zfs-installer-test 
nixos: installer.nix test: test ZFS install use case
 2017-06-28 19:47:14 -04:00
Graham Christensen b0a4c2c33f
nixos: installer.nix test: test ZFS install use case 2017-06-28 19:45:20 -04:00
John Ramsden 9f4c3b2efd
Add keyring enable option and add Nylas to systemPackages 2017-06-28 16:13:10 -07:00
John Ramsden 3fddb48020
Add Nylas mail module. Still needs keyring configuration 2017-06-28 15:56:41 -07:00