Commit graph

101653 commits

Author SHA1 Message Date
Eric Sagnes
979d20794d buildRebar3: fix buildPhase & cleanup (#22744) 2017-02-18 14:25:24 +01:00
Frederik Rietdijk
8a6fa4a320 Merge pull request #22244 from AndersonTorres/intercal
Intercal: a little fix
2017-02-18 14:10:44 +01:00
Frederik Rietdijk
8c3480f3b9 Merge pull request #22828 from matthiasbeyer/update-my-pkgs
Updates for some of my packages
2017-02-18 14:09:51 +01:00
Rene Treffer
5236e23502 prometheus-bind-exporter: init at 20161221
prometheus-bind-exporter: init at 20161221
2017-02-18 13:43:59 +01:00
Franz Pletz
c4c23f36ca Merge pull request #22727 from mayflower/fix/netdev-master-bindsto
network-interfaces service: fix bindsTo deps for masters
2017-02-18 13:37:50 +01:00
Franz Pletz
741770c99a
network-interface service: tuntap ifs have netdev services 2017-02-18 13:36:37 +01:00
Brice Waegeneire
47c214cc2a fix comments about nixos-hardware-scan
It has been renamed to nixos-generate-config in 3ed4173
2017-02-18 13:29:47 +01:00
Franz Pletz
41933918b7 Merge pull request #22918 from NeQuissimus/atom_1_14_3
atom: 1.14.1 -> 1.14.3
2017-02-18 13:25:11 +01:00
Pradeep Chhetri
0db10d76d2 kafka: 0.8.2.1 -> 0.8.2.2 2017-02-18 13:24:53 +01:00
AndersonTorres
9d82b3ebeb Intercal: a little fix
Intercal doesn't build with the most recent version of flex -
it complains with an "undefined reference to `yywrap'"
in the link phase.

So, we need to downgrade flex.
2017-02-18 10:05:02 -02:00
Vladimír Čunát
69ea45da63
lxqt.screengrab: fixup build after KDE updates
/cc #22698 and maintainer @romildo.
2017-02-18 12:29:15 +01:00
Matthias Beyer
92f66c2520 khard: 0.11.3 -> 0.11.4 2017-02-18 12:12:22 +01:00
obadz
db95097674 syscall_limiter: 20160105 -> 20170123 2017-02-18 10:42:59 +00:00
obadz
0c488ed8f0 keepass: 2.34 -> 2.35 2017-02-18 10:42:59 +00:00
obadz
1f9d33b9e4 google-drive-ocamlfuse: 0.5.22 -> 0.6.17 2017-02-18 10:42:59 +00:00
obadz
ae91514b26 gapi-ocaml: 0.2.10 -> 0.3.1 2017-02-18 10:42:59 +00:00
Peter Hoeg
3729441340 Merge branch 'u/bundler' into real_master 2017-02-18 17:35:07 +08:00
Peter Hoeg
a3410e2912 Merge pull request #22933 from peterhoeg/u/cal
calibre: 2.76.0 -> 2.79.1
2017-02-18 16:58:14 +08:00
Peter Hoeg
43dbd916ef calibre: 2.76.0 -> 2.79.1 2017-02-18 16:57:13 +08:00
Vladimír Čunát
70cadb6cbd
krita: 3.1.1 -> 3.1.2.1
This fixes build after KDE updates in f228ea521 #22698.
/cc maintainer @abbradar.  I only tested starting it up.
2017-02-18 09:04:03 +01:00
Vladimír Čunát
432dba859e
Merge branch 'staging'
A security update of libxml2 is within.
2017-02-18 08:59:29 +01:00
Frederik Rietdijk
170039ace5 Merge pull request #22926 from AndersonTorres/youtubeDL
youtube-dl: 2017.02.16 -> 2017.02.17
2017-02-18 08:56:41 +01:00
Vladimír Čunát
714eabc5af
guile rev-deps: fix build by adding pkgconfig
Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
2017-02-18 08:23:07 +01:00
Graham Christensen
33bf23bbca
tomcatUnstable: 9.0.0.M15 -> 9.0.0.M17 2017-02-17 22:30:41 -05:00
Graham Christensen
ae3820bad9
tomcat85: 8.5.9 -> 8.5.11 2017-02-17 22:29:24 -05:00
Graham Christensen
f246ea0de2
tomcat8: 8.0.39 -> 8.0.41 2017-02-17 22:28:34 -05:00
Graham Christensen
7b17c5bc6e
tomcat7: 7.0.73 -> 7.0.75 2017-02-17 22:28:01 -05:00
Graham Christensen
c4bbadf2d5
tomcat6: more thoroughly remove tomcat6 2017-02-17 22:25:52 -05:00
Graham Christensen
6fc38401a2
tomcat6: drop, no longer supported. 2017-02-17 22:24:33 -05:00
Graham Christensen
f308722a00
netpbm: 10.70.00 -> 10.77.02 for numerous fixes
more: https://sourceforge.net/p/netpbm/code/2883/tree/advanced/doc/HISTORY
2017-02-17 22:17:34 -05:00
Thomas Tuegel
a8b49802db Merge pull request #22902 from ttuegel/kde5-instructions
KDE 5 packaging instructions
2017-02-17 21:09:31 -06:00
Sarah Brofeldt
d26ac6afa4 haskellPackages.xmonad-extras: jailbreak to allow xmonad 0.13 (#22927)
Fixes https://github.com/NixOS/nixpkgs/issues/22919
2017-02-18 04:07:55 +01:00
Graham Christensen
946612ffdd Merge pull request #22901 from tavyc/quagga-1.2
quagga: 1.0.20161017 -> 1.2.0
2017-02-17 20:58:51 -05:00
AndersonTorres
9cee962c43 youtube-dl: 2017.02.04.1 -> 2017.02.17 2017-02-17 22:59:37 -02:00
Armijn Hemel
19a302f6f6
scummvm: 1.8.0 -> 1.9.0
Use direct download instead of sourceforge mirror which no longer
works.
2017-02-17 23:46:53 +01:00
Armijn Hemel
34c12b1c73
e2fsprogs: 1.43.3 -> 1.43.4 2017-02-17 23:46:09 +01:00
Armijn Hemel
d950e8c084
fping: 3.15 -> 3.16 2017-02-17 23:44:48 +01:00
Tim Steinbach
376b377775
atom: 1.14.1 -> 1.14.3 2017-02-17 16:13:18 -05:00
Tim Steinbach
0a22a8607a Merge pull request #22910 from joachifm/linux_4_9
linux_4_9: version bump and cve patch
2017-02-17 16:05:47 -05:00
Dan Peebles
7a113e9e83 fakechroot: 2.17.2 -> 2.19 (with modification)
There's a PR I need merged so this is currently pointing at a fork
on my GitHub but I'll repoint it to mainline once that gets merged.
2017-02-17 19:21:33 +00:00
Robin Gloster
bd0d8ed807
programs.mtr: init setcap-wrapper 2017-02-17 20:18:19 +01:00
ndowens
e67416f7e2 awesome-4.0: Add hicolor-icon-theme for theme support
Closes #22888.
2017-02-17 21:58:28 +03:00
Tom Hunger
cb96ed615e lib: Add a function to filter sources by regular expressions. 2017-02-17 18:56:39 +00:00
Nikolay Amiantov
213356c927 activation-script service: add utillinux to path 2017-02-17 21:54:58 +03:00
aszlig
08881b8cbe
taskserver: Remove taskserver from systemPackages
This is deliberate because using the taskd binary to configure
Taskserver has a good chance of messing up permissions.

The nixos-taskserver tool now can manage even manual configurations, so
there really is no need anymore to expose the taskd binary.

If people still want to use the taskd binary at their own risk they can
still add taskserver to systemPackages themselves.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-02-17 19:46:05 +01:00
aszlig
5af8b120a6
nixos/tests/taskserver: Add test for manual config
This subtest actually serves two purposes:

  1. Test manual PKI configuration
  2. Test changing of configuration files

In order to only test manual PKI configuration it would have been enough
to just add another server with a manual config.

But as the switch from automatic PKI config to manual config is probably
one of the most fundamental changes in configuration, so it serves
*very* well to also check whether changes in the NixOS configuration
actually have an impact in the real system.

So instead of adding another server, we now create a dummy "newServer"
machine, which is the new configuration for "server" and use
switch-to-configuration to switch "server" to the config of "newServer".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-02-17 19:46:01 +01:00
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