Commit graph

4210 commits

Author SHA1 Message Date
Jörg Thalheim
96903c501e
Merge pull request #47703 from r-ryantm/auto-update/wireguard-tools
wireguard-tools: 0.0.20180918 -> 0.0.20180925
2018-10-03 11:33:54 +01:00
R. RyanTM
db013c4618 strongswan: 5.6.3 -> 5.7.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/strongswan/versions
2018-10-03 01:49:57 -07:00
R. RyanTM
1491848406 wireguard-tools: 0.0.20180918 -> 0.0.20180925
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions
2018-10-02 21:59:49 -07:00
R. RyanTM
2d759f2b0a unbound: 1.7.3 -> 1.8.0 (#46938)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unbound/versions
2018-10-03 00:44:42 +02:00
Wael M. Nasreddine
9b08685e96
twa: set meta.platforms to platforms.unix 2018-10-02 11:30:55 -07:00
Wael M. Nasreddine
82b5887cab
twa: 1.3.1 -> 1.5.1 2018-10-02 11:10:58 -07:00
Daiderd Jordan
1383c08f2c
Merge branch 'master' into staging-next 2018-10-01 19:42:07 +02:00
Daiderd Jordan
9d59281c61
mosh: fix clang build
The darwin build started to fail because of protobuf c++11 related
errors https://hydra.nixos.org/build/82082958.
2018-09-29 23:26:07 +02:00
Aneesh Agrawal
ce36f634c1 wireguard-tools: Fix build 2018-09-29 05:01:51 -07:00
xeji
abd222f016
Merge pull request #47508 from dtzWill/fix/isync-zlib
isync: add zlib dep for compression support
2018-09-29 08:17:20 +02:00
Matthew Bauer
a87c16bab0
Merge pull request #46528 from markuskowa/pdsh-fix
pdsh: set default module to ssh, remove obsolete fixes
2018-09-29 00:50:37 -05:00
Will Dietz
0a15643401 isync: add zlib dep for compression support
(cherry picked from commit f26f2c8b6f755708a8bfa7aa4f56c52a2c751df6)
2018-09-28 22:58:34 -05:00
R. RyanTM
e799f39632 nss_pam_ldapd: 0.9.7 -> 0.9.10 (#46226)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
nss-pam-ldapd
2018-09-28 21:09:53 +02:00
R. RyanTM
a84000501a fping: 4.0 -> 4.1 (#47054)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fping/versions
2018-09-28 20:41:16 +02:00
Vincent Demeester
83cf856538 kail: 0.6.0 -> 0.7.0 (#47472)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-09-28 20:07:11 +02:00
John Ericson
c701d6cb21 Merge remote-tracking branch 'upstream/master' into staging 2018-09-25 14:20:27 -04:00
Vladimír Čunát
3a09a4b579
Merge branch 'master' into staging
Hydra: ?compare=1480463
2018-09-24 21:18:23 +02:00
Aldwin Vlasblom
6539722622
twa: init at 1.3.1 2018-09-24 13:31:54 +02:00
Symphorien Gibol
5bfe8bfcea openvpn plugins: use absolute paths to configuration gui 2018-09-23 20:15:33 +02:00
Frederik Rietdijk
14673d61ed Merge master into staging 2018-09-23 09:33:09 +02:00
R. RyanTM
41457058da chrony: 3.3 -> 3.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/chrony/versions
2018-09-21 10:40:47 +00:00
R. RyanTM
03d8620098 wireguard-tools: 0.0.20180904 -> 0.0.20180918
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions
2018-09-19 22:41:10 -07:00
John Ericson
7319013ea1 Merge remote-tracking branch 'upstream/master' into staging 2018-09-18 16:55:42 -04:00
Domen Kožar
943871a866
datadog-integrtaions-core: 2018-05-27 -> 2018-09-18 2018-09-18 20:22:14 +01:00
R. RyanTM
e070dae0a4 pcapfix: 1.1.1 -> 1.1.2 (#46223)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
pcapfix
2018-09-18 18:08:04 +02:00
Jörg Thalheim
baa8dc35d5
Merge pull request #46736 from clefru/mpack
mpack: Invoke /run/wrappers/bin/sendmail via execvp
2018-09-18 10:01:00 +01:00
Clemens Fruhwirth
6d97096d8b mpack: Invoke /run/wrappers/bin/sendmail via execvp
Calling /run/current-sw/bin/sendmail fails under postfix because
setgid bits are not set. Switching the hardcoded path to an invocation
via execvp should cover both cases, when the sendmail binary is
setgid-wrapped and when it is not.
2018-09-18 10:48:55 +02:00
Vladyslav Mykhailichenko
9501915218 gnirehtet: 2.2.1 -> 2.3 2018-09-16 20:02:19 +03:00
Bob van der Linden
2039327879
miniupnpd: wrap iptables scripts to use correct PATH 2018-09-15 15:07:27 +02:00
qolii
3c57887f64 nbd: add which to buildInputs (#46635)
* NBD: add which to buildInputs.
* NBD: move pkgconfig and which to nativeBuildInputs.
2018-09-14 19:05:40 +02:00
Domen Kožar
595ae18797
nixos: datadog-agent: fix systemd support 2018-09-13 09:11:55 +01:00
Domen Kožar
bef541c569 datadog: add live process monitoring 2018-09-13 09:11:06 +01:00
Uli Baum
d225a91b7c mitmproxy: 3.0.4 -> 4.0.4, fix tests
- add missing checkInputs
- apply upstream patch to fix some tests that failed due to
  expired test ssl certs
- re-enable a previously disabled test case
2018-09-13 00:06:53 +00:00
R. RyanTM
69504d47c9 miniupnpc_2: 2.0.20180203 -> 2.1 (#46250)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
miniupnpc
2018-09-12 22:56:47 +02:00
R. RyanTM
a2d959c35f tinyproxy: 1.8.4 -> 1.10.0 (#46171)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tinyproxy
2018-09-12 22:42:44 +02:00
Daiderd Jordan
2164e39eaa aria2: fix darwin build (#46548)
Not released yet, see https://github.com/aria2/aria2/issues/1198

/cc ZHF #45961
2018-09-12 00:11:12 +02:00
John Ericson
cb8fb7e71b
Merge pull request #46542 from obsidiansystems/dhcpcd-cleanup
dhcpcd: No need to hack around broken patchShebangs anymore
2018-09-11 16:40:38 -04:00
John Ericson
c64d76d0e6 dhcpcd: No need to hack around broken patchShebangs anymore 2018-09-11 16:15:10 -04:00
Timo Kaufmann
eae589058c
Merge pull request #46367 from yesbox/lldpd_nixos_18.09_fix
Fixes the lldpd service not starting on NixOS 18.09
2018-09-11 20:44:01 +02:00
Jesper Geertsen Jonsson
8a03ec0a32 Fixes the lldpd service failing to start
Backports a patch that will be included in later upstream versions.
The patch removes a call to /bin/mkdir.
2018-09-11 18:19:51 +02:00
Markus Kowalewski
525f425073
pdsh: set default module to ssh, remove obsolete fixes 2018-09-11 17:32:53 +02:00
Domen Kožar
2c18d48c0e datadog-agent: 6.1.4 -> 6.4.2 2018-09-11 14:15:06 +02:00
Markus Kowalewski
4e8871e7b4
webalizer: update meta data 2018-09-10 22:16:22 +02:00
Markus Kowalewski
fc080c22f8
vlan: add license 2018-09-10 22:16:22 +02:00
Markus Kowalewski
6e94773854
vde2: add license 2018-09-10 22:16:22 +02:00
Markus Kowalewski
9e94e8ae4a
rp-pppoe: add license 2018-09-10 22:16:22 +02:00
Markus Kowalewski
ff633d166f
quicktun: add license 2018-09-10 22:16:21 +02:00
Markus Kowalewski
50a7adf43a
pptpd: add license 2018-09-10 22:16:21 +02:00
Markus Kowalewski
44d84db940
polysh: add license 2018-09-10 22:16:21 +02:00
Markus Kowalewski
d2b062760d
polygraph: add license 2018-09-10 22:16:21 +02:00
Markus Kowalewski
3f1849e29c
philter: add license + homepage 2018-09-10 22:16:20 +02:00
Markus Kowalewski
4d24db6e0c
ncftp: add license 2018-09-10 22:16:20 +02:00
Markus Kowalewski
cdf332f254
miniupnpd: add license 2018-09-10 22:16:20 +02:00
Markus Kowalewski
a8bc08c633
miniupnpc: add license 2018-09-10 22:16:20 +02:00
Markus Kowalewski
bb27094df1
libreswan: add license 2018-09-10 22:16:19 +02:00
Markus Kowalewski
460c0145e7
gvpe: add license + homepage 2018-09-10 22:16:19 +02:00
Markus Kowalewski
28bac35599
fdm: add license 2018-09-10 22:16:19 +02:00
Markus Kowalewski
6d859b3b1e
driftnet: add license 2018-09-10 22:16:19 +02:00
Markus Kowalewski
0f6134f8ad
dhcpdump: add license, update homepage 2018-09-10 22:16:19 +02:00
Markus Kowalewski
4dcdb693af
dhcpd: add license 2018-09-10 22:16:18 +02:00
Markus Kowalewski
5d42f2b37f
cksfv: add license 2018-09-10 22:16:18 +02:00
Markus Kowalewski
19148bd2f1
carddav-util: add license 2018-09-10 22:16:18 +02:00
Markus Kowalewski
aad2acfab7
bsd-finger: add license 2018-09-10 22:16:14 +02:00
R. RyanTM
f7888652b8 stunnel: 5.46 -> 5.49
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
stunnel
2018-09-09 23:32:01 -05:00
Jörg Thalheim
6b1e587e3c
Merge pull request #46397 from zimbatm/strongswan-fix-nm-ca-dir
strongswan: set the right dir for TLS CA cert
2018-09-09 14:13:57 +01:00
Jan Malakhovski
b7bd0561be Merge branch 'master' into staging 2018-09-08 22:08:32 +00:00
Tim Steinbach
16650af8c3
curl: 7.61.0 -> 7.61.1 2018-09-08 10:44:02 -04:00
Markus Kowalewski
f60fea5742
netselect: update homepage + license 2018-09-08 01:18:57 +02:00
Markus Kowalewski
fb89213cf6
x11-ssh-askpass: update src + homepage, add license 2018-09-07 23:51:50 +02:00
zimbatm
71e6dfdaea strongswan: set the right dir for TLS CA cert
This fixes an issue where the strongswan NM client is not able to
connect to a VPN. By default it tries to load the trust CA from
/usr/share/ca-certificates which doesn't exist in NixOS and most modern
distros.

See debian-related issue:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835095
2018-09-07 12:44:22 +01:00
Profpatsch
4616ef1f41 skaware: switch from git repos to tarballs
It should be more performant this way.
2018-09-06 11:53:22 +02:00
Profpatsch
0071ae1d4f skawarePackages: factor out the common parts
Introduce a `skawarePackages.buildPackage` function that contains the
common setup, removing a lot of duplication.
In particular, we require that the build directory has to be empty
after the `fixupPhase`, to make sure every relevant file is moved to
the outputs.

A next step would be to deduplicate the `configureFlags` attributes
and only require a `skawareInputs` field.
2018-09-06 11:53:22 +02:00
Profpatsch
ec7d4a8089 skaware: update tools & libraries to summer 2018 release
https://www.mail-archive.com/skaware@list.skarnet.org/msg01217.html

No support for yet.
2018-09-06 11:53:22 +02:00
Vladyslav Mykhailichenko
4cd94bb5b8 wireguard: 0.0.20180809 -> 0.0.20180904 2018-09-05 14:33:51 +03:00
Kenny Shen
7e0dd4c261 prettyping: init 1.0.1 (#46008) 2018-09-05 07:52:55 +02:00
Jan Tojnar
9efc9b5d91
networkmanagerapplet: add python3 for install script
Meson no longer propagates it so we need to re-add it.
2018-09-04 03:23:39 +02:00
xeji
28def75a10
Merge pull request #45967 from worldofpeace/various-build-fixes/18.09
Various build fixes
2018-09-03 22:28:06 +02:00
tv
3dd579f7b1 urlwatch: 2.13 -> 2.14 (#45989) 2018-09-03 22:14:39 +02:00
Michele Guerini Rocco
114fe007db pirate-get: 0.3.1 -> 0.3.2 (#45975) 2018-09-03 22:10:02 +02:00
worldofpeace
9069908680 amule: fix build 2018-09-03 12:59:18 -04:00
Vladimír Čunát
9b48a67731
treewide: fix various links (homepage, src) 2018-09-03 16:53:02 +02:00
Samuel Dionne-Riel
a92cfb5725
Merge pull request #45912 from xeji/p/dhcpcd
dhcpcd: 6.11.5 -> 7.0.8
2018-09-02 15:28:15 -04:00
Uli Baum
8938eede28 dhcpcd: 6.11.5 -> 7.0.8 2018-09-01 20:07:11 +02:00
Robert Schütz
93550cbddf Merge branch 'master' into staging-next 2018-08-31 17:32:48 +02:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Frederik Rietdijk
6038628ea5 Merge master into staging-next 2018-08-29 20:54:55 +02:00
Edward Tjörnhammar
1f8ee1b0d7
i2pd: 2.19.0 -> 2.20.0 2018-08-28 21:42:21 +02:00
Jan Tojnar
bbe620f77b
Merge pull request #45707 from jtojnar/drop-nm-gtk
Drop libnm-gtk
2018-08-28 17:50:42 +02:00
Jan Tojnar
2235437330
networkmanager_strongswan: remove nm-gtk dependency 2018-08-28 15:07:39 +02:00
Jan Tojnar
2683fe16a5
networkmanager-openvpn: remove nm-gtk dependency 2018-08-28 15:06:06 +02:00
Jan Tojnar
cb31e93abf
networkmanager-vpnc: remove nm-gtk dependency 2018-08-28 15:04:24 +02:00
Jan Tojnar
c858c831b6
networkmanager-l2tp: remove nm-gtk dependency 2018-08-28 15:02:15 +02:00
Jan Tojnar
2eb3fab10b
networkmanager-fortisslvpn: remove nm-gtk dependency 2018-08-28 15:00:27 +02:00
Jan Tojnar
a6130c36cd
networkmanager-iodine: remove nm-gtk dependency 2018-08-28 14:59:16 +02:00
Jan Tojnar
8e46884331
networkmanagerapplet: add missing docbook DTDs 2018-08-28 14:56:48 +02:00
Jan Tojnar
908c2cf56c
networkmanagerapplet: do not build libnm-gtk 2018-08-28 14:56:48 +02:00
Jan Tojnar
e8a6d22174
Merge pull request #45627 from jtojnar/gnome-cleanup
Gnome cleanup
2018-08-25 22:14:51 +02:00
Jan Tojnar
b47e4e7644
modemmanager: remove unneeded dependency 2018-08-25 21:41:14 +02:00
R. RyanTM
e7d82391fe inadyn: 2.3.1 -> 2.4 (#45573)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/inadyn/versions.
2018-08-24 18:32:30 +02:00
Uli Baum
00aee56f3d Revert "miniupnpd: 2.1 -> 2.1.20180706 (#43186)"
This reverts commit 5d56adb4fd.
2018-08-24 15:45:44 +02:00
R. RyanTM
7a98ab9e9b s4cmd: 2.0.1 -> 2.1.0 (#45536)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/s4cmd/versions.
2018-08-24 10:28:20 +02:00
R. RyanTM
7bf88248e8 nbd: 3.17 -> 3.18
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nbd/versions.
2018-08-24 00:27:12 -07:00
R. RyanTM
5a07d74387 infiniband-diags: 2.0.0 -> 2.1.0 (#45210)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/infiniband-diags/versions.
2018-08-21 20:15:44 +02:00
Michael Raskin
d7f0ef1702 altermime: fix homepage/src URL 2018-08-21 20:38:38 +03:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
R. RyanTM
2524ad67da ntp: 4.2.8p11 -> 4.2.8p12 (#45180)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ntp/versions.
2018-08-21 14:49:38 +02:00
Ben Ford
c28898dc70 zerotierone: fix route handling on Linux (#45391)
Add some substitutions for the ip calls in ManagedRoutes. Fixes #45022
2018-08-21 13:25:32 +01:00
Vladimír Čunát
153a19df05
Merge branch 'master' into staging-next
Hydra: ?compare=1474536
2018-08-20 09:15:33 +02:00
Markus Kowalewski
05290a6c01
fping: add license 2018-08-20 00:27:04 +02:00
Jörg Thalheim
96b9d77dd8
Merge pull request #45282 from markuskowa/lics-2
Add licenses
2018-08-19 09:03:31 +01:00
Silvan Mosberger
3fff68582c
Merge pull request #45138 from r-ryantm/auto-update/spoofer
spoofer: 1.3.2 -> 1.3.3
2018-08-18 00:40:13 +02:00
Markus Kowalewski
63a80e7bff
pptp: add license 2018-08-18 00:22:12 +02:00
Markus Kowalewski
406dee31c4
ppp: add licenses 2018-08-18 00:18:17 +02:00
Markus Kowalewski
6aba5e26b3
ntp: add license 2018-08-17 23:52:16 +02:00
Vladimír Čunát
14aa936ec5
Merge branch 'staging-next' into staging 2018-08-17 20:53:27 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +02:00
Jörg Thalheim
f2bf4157f7
Merge pull request #45126 from r-ryantm/auto-update/wireguard-tools
wireguard: 0.0.20180802 -> 0.0.20180809
2018-08-17 07:28:52 +02:00
Jörg Thalheim
d70d575151
Merge pull request #45156 from markuskowa/lics-tools
Add license meta tags
2018-08-17 00:31:26 +02:00
Samuel Dionne-Riel
1ac2becd97
Merge pull request #44712 from r-ryantm/auto-update/polygraph
polygraph: 4.11.0 -> 4.12.0
2018-08-16 18:28:09 -04:00
Markus Kowalewski
17702d0416
curl: add license 2018-08-16 21:38:59 +02:00
R. RyanTM
c1486ca1c2 spoofer: 1.3.2 -> 1.3.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spoofer/versions.
2018-08-16 12:11:54 -07:00
R. RyanTM
7fff759f6d wireguard: 0.0.20180802 -> 0.0.20180809
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions.
2018-08-16 10:49:50 -07:00
Timo Kaufmann
d202dafd4a
Merge pull request #45055 from alyssais/slack-cli
slack-cli: init at 0.18.0
2018-08-16 01:30:33 +02:00
Samuel Leathers
67b1cbb39d
Merge pull request #40399 from rvl/datadog-agent
DataDog Agent v6
2018-08-15 15:53:03 -04:00
Alyssa Ross
0e374a1b9c
slack-cli: fix dirname hack 2018-08-15 16:59:05 +01:00
Alyssa Ross
026f49e28c
slack-cli: remove wrapper package 2018-08-15 15:48:23 +01:00
Alyssa Ross
0a57de6f5b
slack-cli: add metadata 2018-08-15 15:47:24 +01:00
Alyssa Ross
e276965a16
slack-cli: warn when not using SLACK_CLI_TOKEN 2018-08-15 15:47:19 +01:00
Alyssa Ross
dac2235c1a
slack-cli: quote shell variables 2018-08-15 12:32:19 +01:00
Alyssa Ross
d2eacdcd65
slack-cli: use nativeBuildInputs for makeWrapper 2018-08-15 12:32:00 +01:00
Alyssa Ross
838473d3c5
slack-cli: add version to name 2018-08-15 12:28:43 +01:00
Alyssa Ross
ccc8dd222e
slack-cli: use fetchFromGitHub instead of fetchurl 2018-08-15 11:36:28 +01:00
Alyssa Ross
8d2ab1d914
slack-cli: init at 0.18.0
slack-cli must be configured using the SLACK_CLI_TOKEN environment
variable. Using `slack init` will not work because it tries to write to
the Nix store.
2018-08-15 09:56:04 +01:00
Markus Kowalewski
038cd7533e
altermime: add license 2018-08-14 13:33:05 +02:00
Vladimír Čunát
ded9a4b1aa
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
2018-08-13 20:57:50 +02:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Wout Mertens
a69f61df21
siege: build on all Unix
Confirmed to work on Darwin
2018-08-13 16:05:53 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
Tor Hedin Brønner
580cab57e4
wget, fwknop: fixup after configureFlags refactoring 2018-08-12 10:08:46 +02:00
Franz Pletz
7d4efc17a0
wget: fix build 2018-08-11 22:09:22 +02:00
Timo Kaufmann
921e5ceef3
Merge pull request #44894 from markuskowa/sqlite-lic
Fix licenses (#43716)
2018-08-11 15:31:29 +02:00
Markus Kowalewski
c2cfaec0c9
ssmtp: add license 2018-08-11 14:34:24 +02:00
Markus Kowalewski
e91ef7c74c
sshpass: add license 2018-08-11 14:33:52 +02:00
Jan Malakhovski
e745d7976e mailutils: use checkInputs, make tests run, but disable, also cleanup 2018-08-11 09:35:34 +00:00
Jan Malakhovski
131e6d664b socat: make tests run, but disable 2018-08-11 09:35:33 +00:00
Jan Malakhovski
fea886b31f aria2: make tests run, but disable 2018-08-11 09:35:33 +00:00
Jan Malakhovski
3b16f3d467 tcpdump: use checkInputs, fix tests 2018-08-11 09:35:28 +00:00
Jan Malakhovski
75993b0f93 swec: use checkInputs 2018-08-11 09:35:26 +00:00
Jan Malakhovski
2cd4bcec4a chrony: fix tests 2018-08-11 09:35:21 +00:00
Pascal Wittmann
a34579e01e
Merge branch 'master' into add-missing-licenses
Conflicts:
	pkgs/tools/networking/network-manager/fortisslvpn.nix
2018-08-11 09:36:34 +02:00