William A. Kennington III
dc3f962f64
curl: 7.41.0 -> 7.42.0
2015-04-22 14:37:53 -07:00
Lluís Batlle i Rossell
5a21c015c7
Updating cjdns to 20150422.
2015-04-22 17:11:10 +02:00
Tobias Geerinckx-Rice
e4f0c4a494
netsniff-ng -> v0.5.9-rc5
2015-04-22 12:32:59 +02:00
Joachim Fasting
8488d133f3
meta.licenses -> license
2015-04-21 23:10:07 +02:00
William A. Kennington III
6b9d2efcb1
unbound: 1.5.1 -> 1.5.3
2015-04-20 21:34:48 -07:00
Tobias Geerinckx-Rice
604ac701f3
netsniff-ng v0.5.9-rc4-62-g47a7037 -> v0.5.9-rc4-63-gf43bbe9
...
Bug fix: mac80211: Check existence of generated monX device
Fix the case when netsniff-ng fails if there is already an existing
monX device while generating one.
2015-04-20 17:17:40 +02:00
Peter Simons
a510ba0334
Drop broken packages sproxy and sproxy-web.
2015-04-19 18:48:29 +02:00
Tuomas Tynkkynen
7532c5379d
ddclient: Force line buffering on stdout
...
Status messages of ddclient go to stdout, which is block buffered by
default, so most of its output won't appear in the journal until it is
exiting:
-- Reboot --
Apr 19 11:31:04 xen systemd[1]: Starting Dynamic DNS Client...
Apr 19 11:31:04 xen systemd[1]: Started Dynamic DNS Client.
Apr 19 11:31:53 xen systemd[1]: Stopping Dynamic DNS Client...
Apr 19 11:31:53 xen ddclient[530]: === opt ====
Apr 19 11:31:53 xen ddclient[530]: opt{cache} : <undefined>
Apr 19 11:31:53 xen ddclient[530]: opt{cmd} : <undefined>
...
Fix this by adding a patch to set line buffering on stdout.
2015-04-19 12:32:04 +03:00
Tobias Geerinckx-Rice
32bd963427
dropbear 2014.66 -> 2015.67
2015-04-17 00:57:25 +02:00
Joachim Fasting
0bca050210
mu: 0.9.11 -> 0.9.12
2015-04-16 11:53:12 +02:00
Tobias Geerinckx-Rice
2bc813dc5c
Add hans: tunnel IPv4 over ICMP
2015-04-16 06:11:16 +02:00
Joel Moberg
e82a94f816
i2p: fix wrapper
2015-04-15 17:09:46 +02:00
Joel Moberg
2c6fbdefad
i2p: fix platform
2015-04-15 12:38:17 +02:00
Tobias Geerinckx-Rice
4213e9f30f
netsniff-ng: v0.5.9-rc4-53-gdd5d906 -> v0.5.9-rc4-62-g47a7037
2015-04-14 15:51:36 +02:00
koral
49e250564a
wget: 1.16 -> 1.16.3
2015-04-13 17:25:28 +00:00
Bjørn Forsman
c1556f70d7
hping: set platforms = all
...
From http://www.hping.org/ :
"Hping works on the following unix-like systems: Linux, FreeBSD,
NetBSD, OpenBSD, Solaris, MacOs X, Windows."
2015-04-11 15:25:11 +02:00
Bjørn Forsman
965129cdac
lftp: update 4.6.0 -> 4.6.1
...
2014-12-29: lftp-4.6.1 released. Some bugs fixed, minor feature added.
2015-04-11 15:06:13 +02:00
Thomas Tuegel
88918e10e9
Merge branch 'master' into staging
2015-04-10 07:45:38 -05:00
William A. Kennington III
58d6ab8d4b
openntpd: Remove output dir hack
2015-04-08 15:11:45 -07:00
William A. Kennington III
458c8381e0
ntp: 4.2.8 -> 4.2.8p2
2015-04-08 14:07:26 -07:00
_1126
a3785360a9
isync: adds cyrus_sasl to (re)enable authentication
2015-04-07 11:49:24 +02:00
Eric Seidel
6ec373d776
Merge branch master into staging
2015-04-06 18:58:08 -07:00
William A. Kennington III
5c2dbf9827
isync: 1.1.2 -> 1.2.0
2015-04-05 16:17:38 -07:00
Александр Цамутали
50855c7e37
Add ability to use pppd to xl2tpd
2015-04-05 23:16:25 +03:00
Stewart Mackenzie
bdc7c6366e
New package: ZeroTierOne
2015-04-05 21:41:15 +08:00
William A. Kennington III
45b37ca1d8
ndisc6: 1.0.2 -> 1.0.3
2015-04-04 20:45:20 -07:00
William A. Kennington III
bb18faf767
tinc_pre: 2015-02-24 -> 2015-03-14
2015-04-04 20:14:35 -07:00
Michael Raskin
9882ca5bc2
Merge pull request #6436 from k0ral/aria
...
aria2: added c-ares dependency + link ssl certificates.
2015-04-04 23:23:54 +03:00
Tobias Geerinckx-Rice
55b218160d
ntopng: use new geolite-legacy package
2015-04-04 16:23:45 +02:00
Austin Seipp
52b71fc13b
Merge pull request #7138 from spwhitt/s3cmd
...
s3cmd: 1.0.1 -> 1.5.2 and remove git version
2015-04-03 04:07:25 -05:00
Austin Seipp
2c55798f1a
nixpkgs: spiped 1.4.1 -> 1.5.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:52 -05:00
Austin Seipp
4a3b755cc8
nixpkgs: stunnel 5.11 -> 5.14
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:52 -05:00
Austin Seipp
c07cce40a4
nixpkgs: dd-agent 5.1.1 -> 5.2.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:51 -05:00
Spencer Whitt
6b47ddf999
s3cmd: 1.0.1 -> 1.5.2 and remove git version
2015-04-02 12:56:06 -04:00
William A. Kennington III
a604b42480
mysql: Use libs in place of the binary mysql
2015-04-01 16:46:53 -07:00
William A. Kennington III
ff21171921
Fix references to current-system/sw/sbin
2015-04-01 13:57:36 -07:00
Edward Tjörnhammar
cce00353d0
Merge pull request #7122 from joelmo/i2p-official
...
i2p: added package
2015-04-01 18:24:22 +02:00
Joel Moberg
243ec61c4f
i2p: initial
2015-04-01 18:15:54 +02:00
Edward Tjörnhammar
b3e1021b41
i2pd: 0.8.0 -> 0.9.0
2015-04-01 16:35:47 +02:00
Vladimír Čunát
edee502f81
ngrep: fix build by using make-3
...
/cc maintainer @bjornfor.
2015-04-01 08:41:45 +02:00
Tobias Geerinckx-Rice
0d9ebe7535
ipv6calc: use new geolite-legacy package
...
GeoIP look-ups now actually work.
2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice
b011d10cee
netsniff-ng: use new geolite-legacy package
2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice
c7362b6b03
netsniff-ng: 0.5.9-rc4-{49-g6f54288 -> 53-gdd5d906}
...
Fixes a bug that prevented mz from working at all.
2015-03-31 00:51:47 +02:00
Nikolay Amiantov
7c03829024
Merge pull request #7060 from abbradar/nm-l2tp
...
Support L2TP in NetworkManager
2015-03-30 23:05:42 +03:00
Nikolay Amiantov
dcaee528c2
networkmanagerapplet: support l2tp
2015-03-29 13:09:02 +03:00
Nikolay Amiantov
0e8b27ea6d
networkmanager-l2tp: add package
2015-03-29 13:09:02 +03:00
Nikolay Amiantov
fe263f4c7e
xl2tpd: add package
2015-03-29 13:09:02 +03:00
Patrick Mahoney
00b57f47c7
Update versions of skarnet.org packages
...
skalibs 2.3.2.0
execline 2.1.1.0
s6 2.1.3.0
st-portable-utils 2.0.4.0
s6-linux-utils 2.0.2.0
s6-networking 2.1.0.0
Also change path to s6 static library in s6-networking build.
2015-03-28 23:13:45 -05:00
Patrick Mahoney
6a2ec766fc
s6-dns: update checksum
...
Upstream unfortunately changed the tag v2.0.0.2 from revision
b533774a704c271a6feeaef76939b0aefbf039d7 to one commit forward:
539bee3f515b13a9a55ce65c0c0593babc7c5048.
2015-03-28 18:52:56 -05:00
William A. Kennington III
7ccccc15ba
Merge branch 'master' into staging
2015-03-27 16:03:03 -07:00
William A. Kennington III
c612a25666
dhcpcd: 6.8.0 -> 6.8.1
2015-03-27 16:01:42 -07:00
William A. Kennington III
c7a0045b80
openntpd: 5.7p3 -> 5.7p4
2015-03-26 16:07:02 -07:00
William A. Kennington III
2c9823713a
Merge branch 'master' into staging
2015-03-26 14:49:34 -07:00
William A. Kennington III
767c179a94
Merge branch 'master' into staging
2015-03-26 14:44:05 -07:00
William A. Kennington III
e78b94199f
Merge pull request #7011 from taktoa/master
...
Add SSL support to HAProxy
2015-03-26 14:31:29 -07:00
William A. Kennington III
ce9f2d5720
tcpdump: 4.6.2 -> 4.7.3
2015-03-26 14:03:52 -07:00
William A. Kennington III
912dd5a356
nbd: 3.8 -> 3.10
2015-03-26 14:03:51 -07:00
Remy Goldschmidt
ab2cb85930
Fixed case in HAProxy nix expr
2015-03-26 16:21:15 -04:00
Remy Goldschmidt
eb54c42ffa
Clean up HAProxy nix expression
2015-03-26 16:19:55 -04:00
Remy Goldschmidt
f6d223c773
Add SSL support to HAProxy
2015-03-26 16:19:54 -04:00
William A. Kennington III
bb4bb9fc43
modemmanager: 1.2.0 -> 1.4.6
2015-03-26 13:12:58 -07:00
William A. Kennington III
4364645181
dhcp: 4.3.1 -> 4.3.2
2015-03-26 12:27:59 -07:00
William A. Kennington III
9ce3b3b746
dhcpcd: 6.6.1 -> 6.8.0
2015-03-26 11:42:32 -07:00
Mariusz `shd` Gliwiński
6ca841a4e9
[ntopng] geolite hash update
2015-03-26 16:27:24 +01:00
William A. Kennington III
9d9a393a4b
Merge pull request #6919 from ehmry/cjdns
...
cjdns: update pkg and fix nixos test
2015-03-25 22:16:23 -07:00
William A. Kennington III
7f2adbf569
Merge pull request #6945 from k0ral/mtr
...
mtr: 0.85 -> 0.86
2015-03-25 22:15:14 -07:00
Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Thomas Tuegel
5d1f6ad57c
qt5: make qt-5.4.1 default
2015-03-24 17:14:56 -05:00
koral
f5176f4b58
mtr: 0.85 -> 0.86
2015-03-23 11:54:34 +00:00
Eelco Dolstra
8d685306c5
jwhois: Add missing meta.platforms
2015-03-23 11:51:59 +01:00
Emery Hemingway
7e66337f6c
cjdns: update to version 16 - 20150308
2015-03-21 10:16:16 -04:00
William A. Kennington III
bea1c88205
openssh: 6.7p1 -> 6.8p1
2015-03-20 21:20:33 -07:00
Edward Tjörnhammar
5126119686
aiccu: added package
2015-03-20 22:01:34 +01:00
Eelco Dolstra
2ed5c2bd6b
Set some meta.platforms
...
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Shea Levy
19cd9f16a0
Merge branch 'staging'
2015-03-20 09:53:34 -04:00
Austin Seipp
0c1daca24a
nixpkgs: stunnel 5.05 -> 5.11
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Tobias Geerinckx-Rice
22625fbf37
netsniff-ng 0.5.9-rc4-40-g5107740 -> 0.5.9-rc4-49-g6f54288
...
Adds support for IGMP packet generation.
2015-03-17 21:57:30 +01:00
Vladimír Čunát
e924f05cc3
Merge branch 'master' into staging
2015-03-17 13:35:05 +01:00
koral
2c1041acc7
curl: 7.40.0 -> 7.41.0 ( close #6844 )
2015-03-17 12:38:05 +01:00
devhell
6fa7dcfe24
ipv6calc: Update SHA
...
Upstream seems to have overwritten the tarball therefore changing the
SHA sum.
2015-03-15 18:04:06 +00:00
lethalman
622533577b
Merge pull request #6685 from pjones/pkg/asynk
...
asynk: 2.0.0-rc2 -> 2.0.0, add CalDAV support
2015-03-11 15:41:20 +01:00
Peter Jones
0a34c59c38
Add dependency for wicd-gtk to use the systray
2015-03-10 15:19:51 -06:00
Pascal Wittmann
a63d87cba8
autossh: update from 1.4d to 1.4e
2015-03-09 19:35:23 +01:00
Tobias Geerinckx-Rice
78ec3797ab
netsniff-ng: remove useless dependencies
...
- Replace external `which` with `command -v` built into bash
- Remove non-functional GeoIP dependency for now
2015-03-09 17:23:10 +01:00
Michael Raskin
ab5dd299ee
update getmail
2015-03-09 01:03:01 +03:00
Peter Jones
ff42e0ae7f
2.0.0-rc2 -> 2.0.0, add CardDAV support
2015-03-05 13:23:02 -07:00
Eelco Dolstra
17bc5f9b38
dhcpcd: Update to 6.6.7
2015-03-05 17:25:56 +01:00
lethalman
186765e0e3
Merge pull request #6590 from iand675/noip2
...
Add noip package
2015-03-01 12:30:37 +01:00
tv
68e85fcc05
urlwatch: update to version 1.18
2015-02-28 08:47:36 +01:00
Ian Duncan
bf45ee500d
Remove unnecessary conditional
2015-02-27 17:29:58 +00:00
Ian Duncan
5f218eaf92
Add meta info for noip package
2015-02-27 15:04:06 +00:00
Ian Duncan
71ab1792c4
Add noip2 package
2015-02-27 04:30:08 +00:00
lethalman
69d3adbf3d
Merge pull request #6425 from grwlf/siptools
...
Siptools
2015-02-26 15:00:17 +01:00
William A. Kennington III
cbb706c326
tinc_pre: Rename using date format
2015-02-25 11:53:14 -08:00
Tobias Geerinckx-Rice
d3156d3ca2
bully: switch to working Lrs121 mirror + fetchFromGitHub
2015-02-25 16:27:03 +01:00
Nathaniel Baxter
1e7ac20906
aria2: update from 1.18.9 to 1.18.10
2015-02-24 21:50:49 +11:00
Edward Tjörnhammar
e2df28dee3
i2pd: 0.7.0 -> 0.8.0
2015-02-23 20:00:54 +01:00
Tobias Geerinckx-Rice
cda356a8f8
ipv6calc 0.97.4 -> 0.98.0
2015-02-23 02:04:08 +01:00
Luca Bruno
78834b9254
airfield: mark as broken, don't know what broke it
2015-02-20 14:46:37 +01:00
Luca Bruno
fbc7738867
sproxy: mark as broken, don't know what broke it
2015-02-20 14:07:58 +01:00
koral
c3a4de0b17
aria2: added c-ares dependency + link ssl certificates.
2015-02-18 17:51:02 +01:00
Sergey Mironov
0a006c78bf
dhcpdump: add the tool
2015-02-18 11:52:20 +03:00
William A. Kennington III
f7cdbb091a
Merge pull request #6417 from benley/haproxy
...
haproxy: update to 1.5.11
2015-02-17 22:28:57 -08:00
Dan Peebles
3caa6f4d7d
This doesn't hurt the current darwin stdenv and doesn't affect anything else, but is needed for the upcoming pure darwin stdenv
2015-02-18 01:19:59 -05:00
Dan Peebles
12c1c8d590
wget wants libiconv but doesn't say so
2015-02-18 00:49:37 -05:00
Benjamin Staffin
2efd1a4700
haproxy: update to 1.5.11
...
Change-Id: I6f5d8d62084da89c22e99df2a99b4608ba95f874
2015-02-17 19:57:17 -08:00
Bjørn Forsman
9b79a35371
speedtest-cli: drop the "python2.7-" name prefix
2015-02-17 20:22:39 +01:00
Pascal Wittmann
9dc36774b3
nzbget: update from 14.1 to 14.2
2015-02-16 12:37:12 +01:00
James Cook
f114979de7
Merge pull request #6224 from falsifian/ppp_2.4.7_squash
...
PPP: update to 2.4.7.
2015-02-14 21:17:51 -08:00
Peter Simons
54ce1a1810
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/compilers/ghc/head.nix
pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Luca Bruno
3b17a2054b
polygraph: new package
...
Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries
http://www.web-polygraph.org
2015-02-12 14:29:10 +01:00
James Cook
3baf1c0772
Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash
...
Conflicts:
pkgs/tools/networking/ppp/default.nix
2015-02-10 09:24:38 -08:00
Georges Dubus
1e5ce3f024
openfortivpn: Added expression
2015-02-10 13:57:21 +01:00
William A. Kennington III
c14348a51d
tinc_pre: Update git version
2015-02-09 10:48:36 -08:00
koral
7fc94dd3bb
curl: 7.39.0 -> 7.40.0
2015-02-09 17:34:03 +01:00
Peter Simons
7b99c149a4
Merge branch 'master' into staging.
2015-02-09 16:51:10 +01:00
Domen Kožar
49c67589b6
iodine: 0.6.0-rc1 -> 0.7.0
2015-02-09 06:41:27 +01:00
William A. Kennington III
5a1089d024
Merge pull request #6245 from edwtjo/samba-collate-urls
...
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657
fetchurl: collate samba project urls into a mirror
2015-02-08 22:29:27 +01:00
James Cook
5522aad3ec
ppp: Change maintainer to falsifian.
2015-02-08 11:29:14 -08:00
Lluís Batlle i Rossell
d54611bde7
Updating cjdns to 20150207.
...
Version without memory leaks.
(cherry picked from commit 0e860da001e960e1b7cd4ca3ab9940a8dacd98de)
2015-02-08 19:33:13 +01:00
James Cook
3df42c6499
PPP: Update to 2.4.7.
...
Fixes CVE-2014-3158.
Also remove postPatch and postInstall that don't seem to be needed (any
more?).
2015-02-07 17:43:49 -08:00
lethalman
8b236f2daf
Merge pull request #6119 from lethalman/go
...
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
William A. Kennington III
4834880894
radvd: 2.9 -> 2.10
2015-02-06 12:53:10 -08:00
William A. Kennington III
1e15b88986
iperf: 3.0.10 -> 3.0.11
2015-02-06 12:53:10 -08:00
Ragnar Dahlén
72acae3295
wrk: New package
...
HTTP benchmarking tool.
2015-02-06 15:05:34 +00:00
Pascal Wittmann
e938e70587
Merge pull request #6197 from joachifm/update-dnscrypt-proxy
...
dnscrypt-proxy: bump to version 1.4.3
2015-02-06 13:16:49 +01:00
Joachim Fasting
681f373fb7
dnscrypt-proxy: bump to version 1.4.3
2015-02-06 08:49:26 +01:00
Lluís Batlle i Rossell
4c0ba3f01c
cjdns: Setting no SECCOMP for ARM. It fails to build.
2015-02-05 23:02:55 +01:00
Edward Tjörnhammar
e647414e4a
i2pd: update url
2015-02-05 20:23:22 +01:00
Luca Bruno
3f718a743d
Add dontInstallSrc flag to buildGoPackage
2015-02-05 18:07:28 +01:00
Edward Tjörnhammar
83925c33f6
i2pd: 0.6.0 -> 0.7.0
...
nixos: i2pd.service, fix string escaping
2015-02-05 12:09:59 +01:00
William A. Kennington III
1dd23a28cb
openntpd: More build fixes
2015-02-04 16:17:38 -08:00
William A. Kennington III
6a872c304c
openntpd: Fix url
2015-02-04 16:04:24 -08:00
William A. Kennington III
da1a2184b9
openntpd: 2008 -> 5.7p3
2015-02-04 15:59:53 -08:00
Matej Cotman
6a042a9272
Merge pull request #6118 from devhell/connman
...
connman: 1.26 -> 1.28
2015-02-04 20:01:42 +01:00
Shea Levy
c1aefe5d7e
Merge branch 'master' of git://github.com/gridaphobe/nixpkgs
...
make wget build on darwin
2015-02-04 16:41:15 +00:00
Pascal Wittmann
97e50cac40
Merge pull request #6142 from k0ral/aria
...
aria2: 1.18.8 -> 1.18.9
2015-02-04 16:30:31 +01:00
Luca Bruno
040d475103
Port flannel to buildGoPackage
2015-02-04 15:56:40 +01:00
koral
a3f0c7bff4
aria2: 1.18.8 -> 1.18.9
2015-02-04 15:55:49 +01:00
Luca Bruno
3e20e4c5e6
Drop cjdcmd because of broken go crypto
2015-02-04 10:41:33 +01:00
Eric Seidel
9a1817c778
make wget build on darwin
2015-02-04 00:09:13 -08:00
devhell
968571af95
connman: 1.26 -> 1.28
...
ConnMan 1.28 was released Sunday, February 1st, 2015.
Upgrading ConnMan is strongly encouraged as this release fixes an issue
with DHCPv6 retransmission timer calculation that causes system load to
jump to 100%. In addition, all WiFi P2P issues encountered with Miracast
have been addressed thanks to persistent the reporting and fixing by
Jussi Kukkonen, Tomasz Bursztyka and Jukka Rissanen.
ConnMan no longer hands off foreground autoscanning to wpa_supplicant as
it causes issues when finding hidden WiFi networks. As a result, the
previously recommended build time option has be removed from the
documentation. wpa_supplicant can still be built with autoscan enabled
but as ConnMan no longer enables it run time the issue is mitigated.
Other changes and fixes include:
* Several fixes for handling IPv6 contexts via oFono (Pasi Sjöholm)
* Fix memory deallocation in exit code paths (Hannu Mallat)
* Use OPEN auth_alg for wpa_supplicant open WiFi networks (Slava Monich)
* A WiFi Access Point with unknown strength now has a proper minimum value
which translates to a service 'Strenght' property of 30 (Patrik Flykt)
* Fix byte order in DHCP server identifier (Jukka Rissanen)
* Properly cancel an ongoing service connect if the Agent exits
(Patrik Flykt)
2015-02-03 16:12:47 +00:00
Emery Hemingway
faa5dccab8
new Go support function 'buildGoPackage'
...
add a setupHook to the Go compiler that builds a GOPATH
new buildGoPackage function that overides the phases of stdenv
2015-02-03 14:21:48 +01:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
lethalman
87377cec15
Merge pull request #6064 from ktosiek/sstp
...
Add sstp client.
2015-01-31 13:30:08 +01:00
Tomasz Kontusz
99c0af0d73
Add sstp client.
2015-01-30 20:09:35 +01:00
lethalman
d4e7fada66
Merge pull request #5951 from arno01/socat
...
socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
2015-01-30 11:31:06 +01:00
Lluís Batlle i Rossell
adf6ef3865
cjdns: updating with bugfix, and readd nodejs tools
...
(cherry picked from commit cd80d050cb8145d45c56533625beb82f37177fae)
2015-01-30 09:26:53 +01:00
Shea Levy
52d4b9d982
Merge branch 'tlsdate' of git://github.com/4z3/nixpkgs
2015-01-30 01:07:59 -05:00