Commit Graph

101282 Commits

Author SHA1 Message Date
aszlig
c7bbb93878
taskserver: Pass configuration via command line
Putting an include directive in the configuration file referencing a
store path with the real configuration file has the disavantage that
once we change the real configuration file the store path is also a
different one.

So we would have to replace that include directive with the new
configuration file, which is very much error-prone, because whenever
taskd modifies the configuration file on its own it generates a new one
with *only* the key/value options and without any include directives.

Another problem is that we only added the include directive on the first
initalization, so whenever there is *any* configuration change, it won't
affect anything.

We're now passing all the configuration options via command line,
because taskd treats everything in the form of --<name>=<value> to be a
configuration directive.

This also has the effect that we now no longer have extraConfig, because
configuration isn't a file anymore.

Instead we now have an attribute set that is mapped down to
configuration options.

Unfortunately this isn't so easy with the way taskd is configured,
because there is an option called "server" and also other options like
"server.cert", "server.key" and so on, which do not map very well to
attribute sets.

So we have an exception for the "server" option, which is now called
"server.listen", because it specifies the listening address.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #22705
2017-02-17 19:45:58 +01:00
aszlig
78fe00da7c
taskserver: Allow helper tool in manual config
The helper tool so far was only intended for use in automatic PKI
handling, but it also is very useful if you have an existing CA.

One of the main advantages is that you don't need to specify the data
directory anymore and the right permissions are also handled as well.

Another advantage is that we now have an uniform management tool for
both automatic and manual config, so the documentation in the NixOS
manual now applies to the manual PKI config as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-02-17 19:45:55 +01:00
aszlig
32c2e8f4ae
taskserver/helpertool: Fix error message on export
The error message displays that a specific user doesn't exist in an
organisation, but uses the User object's name attribute to show which
user it was.

This is basically a very stupid chicken and egg problem and easily fixed
by using the user name provided on the command line.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-02-17 19:45:52 +01:00
aszlig
a5e9668c5c
nixos/test: Fix escaping for copyFileFromHost
A long-time issue and one of the reasons I've never used that function
before. So let's remove that todo-comment and escape the contents
properly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
2017-02-17 19:45:49 +01:00
Michele Guerini Rocco
5231d0ac29 bluetooth module: add option to power up bluetooth controller (#22685) 2017-02-17 19:44:04 +01:00
Matthias Herrmann
89a0365063 sweethome3d: version compatible with master and 16.09
[Bjørn: let the package function take 'libXxf86vm' as input instead of
'xorg' (the whole set).]
2017-02-17 19:28:52 +01:00
Bjørn Forsman
73112a6e78 pcsctools: unbreak 'gscriptor' by adding cairo
Fixes this:

  $ gscriptor
  Can't load '/nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so' for module Pango: /nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so: undefined symbol: cairo_font_type_to_sv at /nix/store/5z1wn7knhckr3a0asb8lzp99sdai09f2-perl-5.22.2/lib/perl5/5.22.2/x86_64-linux-thread-multi/DynaLoader.pm line 193.
   at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  BEGIN failed--compilation aborted at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
  BEGIN failed--compilation aborted at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
2017-02-17 17:01:29 +01:00
Joachim F
fe4552420e Merge pull request #22680 from dtzWill/feature/creduce
creduce: init at 2.6.0
2017-02-17 16:58:37 +01:00
Matthew Daiter
692f3c18cd riak: 2.1.1 -> 2.2.0 2017-02-17 15:09:31 +01:00
Eelco Dolstra
4798196447
s3fs-fuse: 1.78 -> 1.80 2017-02-17 13:46:00 +01:00
Matthew Daiter
336d6cc513 stanchion: remove ssl option 2017-02-17 13:24:51 +01:00
Orivej Desh
47ded42788 lumail: init at 2.9 2017-02-17 12:14:20 +01:00
Orivej Desh
cc4fd4f715 perl-Net-IMAP-Client: init at 0.9505 2017-02-17 12:14:20 +01:00
Vincent Demeester
834de6ebaa glide: output correct version (#22896)
It currently displays `0.12.0-dev` instead of the specified
version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-17 12:08:54 +01:00
Pradeep Chhetri
a9584c9510 kafka: 0.10.1.0 -> 0.10.1.1 2017-02-17 11:13:29 +01:00
Daiderd Jordan
8a5c6153d7 Merge pull request #22814 from veprbl/wxpython
wxPython30: fix on darwin
2017-02-17 08:35:39 +01:00
Robin Gloster
b3c58dc38b Merge pull request #22222 from afldcr/polybar-3.0.3
polybar: init at 3.0.4
2017-02-17 02:49:44 +01:00
Robin Gloster
a6eb4669b1 Merge pull request #22872 from ttuegel/isync
Update isync-git, with several other improvements
2017-02-17 02:47:23 +01:00
romildo
53c2e38e0d qbittorrent: 3.3.7 -> 3.3.10 2017-02-17 02:45:15 +01:00
Brian McKenna
17f566d1e1 keybase-gui: init at 20170209.17b641d
The GUI requires the keybase and kbfs packages to be installed and
running with /keybase as the mount.
2017-02-17 02:44:06 +01:00
Bjarki Ágúst Guðmundsson
8561af2db9 kbfs: 1.0.2 -> 20170209.d1db463 2017-02-17 02:43:52 +01:00
Bjarki Ágúst Guðmundsson
c1fb4ec041 keybase: 1.0.18 -> 20170209.17b641d 2017-02-17 02:43:30 +01:00
Pradeep Chhetri
0ea76ef831 wuzz: 2017-02-09 -> 0.1.0 2017-02-17 02:36:14 +01:00
Pradeep Chhetri
7ab871b394 consul: 0.7.3 -> 0.7.5 2017-02-17 02:20:40 +01:00
Pradeep Chhetri
3e484e7880 consul-template: 0.18.0 -> 0.18.1 2017-02-17 02:20:23 +01:00
Mogria
cfea446920 phpPackages.memcached: add missing zlib build dependency 2017-02-17 02:18:58 +01:00
David Terry
90d225db76 microsoft_gsl: init at 2017-02-13 2017-02-17 02:14:12 +01:00
Pradeep Chhetri
6515854248 awless: init at 0.0.13 2017-02-17 02:12:23 +01:00
Dmitry Kalinkin
0a44f259b5
python27Packages.taskcoach: mark as broken on darwin 2017-02-16 18:48:09 -05:00
Dmitry Kalinkin
c2a5733654
wxPython: fix on darwin 2017-02-16 18:48:08 -05:00
Joachim F
32befcb62b Merge pull request #22754 from mbrgm/update-keepalived
keepalived: 1.2.19 -> 1.3.2
2017-02-16 23:08:22 +01:00
Robin Gloster
6e12406e30
Revert "nginx: Format the config file"
This reverts commit e362a3d5c9.

See #22883
2017-02-16 22:45:00 +01:00
Daniel Peebles
96c152f98e Merge pull request #22881 from pradeepchhetri/vault-update
vault: 0.6.4 -> 0.6.5
2017-02-16 16:44:01 -05:00
Daiderd Jordan
2fe40506ac Merge pull request #22875 from acowley/ghostscript-id
ghostscript: fix installed library name on darwin
2017-02-16 22:27:01 +01:00
Lluís Batlle i Rossell
1e7da9ec78 trigger: update to 0.6.5 2017-02-16 22:25:23 +01:00
Lluís Batlle i Rossell
0c42efd9d7 SDL2: fix creation of libSDL2main.a
It's required by a trigger rally update I will commit next.
And other games use that too.
2017-02-16 22:24:40 +01:00
Lluís Batlle i Rossell
e62fe37575 zstd: update to 1.1.3 2017-02-16 21:46:48 +01:00
Lluís Batlle i Rossell
0cee46dd21 brotli: update to 0.5.2
From 0.3.0
2017-02-16 21:34:44 +01:00
Profpatsch
bb797c1390 networking.networkd: adjust autmatic mapping of bonds
Since the bonds interface changed to a lot more possible values we create a
mapping of kernel bond attribute names and values to networkd attributes.
Those match for the most part, but have to transformed slightly.

There is also an assert that unknown options won’t slip through silently.
2017-02-16 21:24:40 +01:00
Profpatsch
9debdaf512 networking.bonds: add support for arbitrary driverOptions
Until now the four attributes available very selectively provided a small
subset, while copying upstream documentation.

We make driver options an arbitrary key-value set and point to kernel
documentation, which is always up-to-date. This way every option can be set.
The four already existing options are deprecated with a warning.
2017-02-16 21:24:40 +01:00
Pradeep Chhetri
3f971d9863 vault: 0.6.4 -> 0.6.5 2017-02-17 01:17:30 +05:30
Vladimír Čunát
03024b39b7
tex4ht: fixup evaluation errors in the broken package
https://github.com/NixOS/nixpkgs/pull/22873#issuecomment-280390590
2017-02-16 20:24:56 +01:00
Anthony Cowley
c37464a9b1 ghostscript: fix installed library name on darwin 2017-02-16 13:32:39 -05:00
Daniel Peebles
19a9099eb2 Merge pull request #22869 from copumpkin/amazon-init-fix
amazon-init NixOS module: fix (I think) race condition with network
2017-02-16 12:44:49 -05:00
Rob Vermaas
1c366b4e06
nixops: update to 1.5
(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)
2017-02-16 17:03:12 +00:00
James Alexander Feldman-Crough
2ad43792ad
Remove redundant "fetchSubmodules" attr 2017-02-16 08:54:28 -08:00
Frederik Rietdijk
624cd8ae9e Merge pull request #22593 from teh/master
Update scrapy & dependencies
2017-02-16 17:27:57 +01:00
Tom Hunger
69363e9611 Move scrapy to its own module and add patch to fix broken permission code.
Scrapy is usually installed via pip where copying all permissions
makes sense. In Nix the files copied are owned by root and
readonly. As a consequence scrapy can't edit the project templates so

  scrapy startproject

fails.
2017-02-16 16:21:46 +00:00
Thomas Tuegel
7c260ad2cc Merge pull request #22813 from benley/pam-kwallet
nixos: add optional pam_kwallet5 integration
2017-02-16 10:20:47 -06:00
Dan Peebles
b172684c17 amazon-init NixOS module: fix (I think) race condition with network
The initialization code is now a systemd service that explicitly
waits for network-online, so the occasional failure I was seeing
because the `nixos-rebuild` couldn't get anything from the binary
cache should stop. I hope!
2017-02-16 16:03:58 +00:00