public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,542 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

6859 Commits

Author SHA1 Message Date
Pascal Wittmann 084595f33a hevea: update from 2.23 to 2.25 2015-08-04 12:17:16 +02:00
Luca Bruno 4a96fa92db cpulimit: does not build on darwin (ZHF) 2015-08-04 10:40:44 +02:00
Tuomas Tynkkynen ba5402a328 debbindiff: Rename to 'diffoscope' and update 26 -> 29 
Upstream has changed the project name to 'diffoscope' since "debbindiff
has grown way beyond a being just a tool to compare Debian packages."

Besides the rename, there are new dependencies on ssdeep, libarchive-c
and sqlite.
 2015-08-04 09:27:33 +03:00
William A. Kennington III f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
William A. Kennington III 8c244bc21c dnsmasq: 2.73 -> 2.75 2015-08-03 12:52:22 -07:00
ts468 c6159b2614 Merge pull request #9101 from ts468/upstream.strongswan 
strongswan: add TNC build option
 2015-08-03 17:53:01 +02:00
Thomas Strobel 6f727a8a83 strongswan: add TNC build option 2015-08-03 17:07:12 +02:00
ts468 1857db1bc9 Merge pull request #9100 from ts468/upstream.omapd 
omapd: init at 0.9.2
 2015-08-03 13:12:28 +02:00
Thomas Strobel 89e78b5211 omapd: init at 0.9.2 2015-08-03 13:04:59 +02:00
Bjørn Forsman c2aadb38a7 ntopng: add extra download URL 
It seems upstream have moved the ntopng-1.2.1.tgz into an "old/"
subdirectory.
 2015-08-03 12:19:34 +02:00
Sander van der Burg dc2a6e3d3d dd-agent: Add support for MongoDB monitoring 2015-08-03 09:09:52 +00:00
Tobias Geerinckx-Rice 9cd4763e9c ipad_charge: init at 2015-02-03 2015-08-03 01:45:13 +02:00
Tobias Geerinckx-Rice a9a0fedb94 stress-ng: 0.04.13 -> 0.04.14 2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice 249b25698e xdelta: tidy up 2015-08-03 01:41:55 +02:00
Thomas Strobel 192091dc06 trustedGRUB2: git -> 1.2.0 2015-08-02 23:03:45 +02:00
Arseniy Seroka 0fb7dafb68 Merge pull request #9078 from joachifm/minisign 
minisign: init at 0.4
 2015-08-02 15:28:48 +03:00
William A. Kennington III 58d1a1b073 ceph: Make python fixes more reliable 2015-08-01 18:45:23 -07:00
William A. Kennington III 1b20c87d1f ceph-git: 2015-07-29 -> 2015-07-31 2015-08-01 18:05:51 -07:00
William A. Kennington III dd41013dba ceph: Remove leaveDotGit as it is non-deterministic 2015-08-01 18:05:51 -07:00
Pascal Wittmann 9cac20afa8 cv: update from 0.7.1 to 0.8 2015-08-01 21:13:38 +02:00
Joachim Fasting 56b39c2cc5 minisign: init at 0.4 2015-08-01 17:20:15 +02:00
Arseniy Seroka b6160fa736 monkeysphere: fix description 2015-08-01 13:28:41 +03:00
Fabian Kirchner b80df37494 Add monkeysphere package 2015-08-01 12:01:32 +02:00
Sander van der Burg 0310b48494 Add mongodb-tools package as dependency to make snapshots and restores work 2015-07-31 16:19:56 +00:00
Tobias Geerinckx-Rice 2ed604e566 Merge pull request #8937 from cheecheeo/entr_init 
entr: init at 3.2
 2015-07-31 12:45:50 +02:00
John Chee 6c14111c9d entr: init at 3.2 2015-07-30 23:05:38 -07:00
Tobias Geerinckx-Rice 03b09e7cd4 eid-viewer: 4.0.7-195-tcm406-258907 -> 4.1.4-v4.1.4-tcm406-270732 2015-07-31 04:47:59 +02:00
Tobias Geerinckx-Rice cf1edbb662 stress-ng: 0.04.12 -> 0.04.13 
Changes: https://launchpad.net/ubuntu/+source/stress-ng/0.04.13-1
 2015-07-31 02:02:09 +02:00
Tobias Geerinckx-Rice 7b30d6a8cb sudo: add withInsults flag (disabled by default) 
The feature Nix neither needs nor deserves.
Requires the "insults" to be explicitly enabled in sudoers.
This adds 1.6 MB to your sudo as some kind of cruel meta-joke.
 2015-07-31 02:02:08 +02:00
Tobias Geerinckx-Rice c0f59dc0bb lz4: remove test restrictions 
Tests are still disabled by default.
 2015-07-31 02:02:07 +02:00
Tobias Geerinckx-Rice 6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Eelco Dolstra 55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
John Wiegley 6c1d408b47 bup: Patch to work on Darwin 10.10 2015-07-30 16:20:04 -07:00
Bjørn Forsman 0c71406dd3 asciidoc: fix old copy/paste error 2015-07-30 16:36:38 +02:00
Tobias Geerinckx-Rice 9294f368f9 eid-mw: 4.1.2 -> 4.1.4 2015-07-30 16:18:37 +02:00
Lancelot SIX ca54849eb9 torbrowser: 4.5.2 -> 4.5.3 (close #8953) 2015-07-30 15:55:22 +02:00
Susan Potter a9e2cf0af3 jwhois: fix path to lynx in $lynx/etc/jwhois.conf 
Close #8696.
Fixes issues found when jwhois attempts to launch terminal browser
(lynx) for HTTP whois queries, for example:

    $ whois blah.io
    [Querying http://www.io.io/cgi-bin/whois]
    [HTTP: Unable to run web browser: /usr/bin/lynx: No such file or directory]

Tested via:

    grep lynx \
      /nix/store/bymgmn2vvw1n7nbb1isy87xg94s8f2ml-jwhois-4.0/etc/jwhois.conf \
      | cut -f2 -d'"' \
      | xargs stat -t
 2015-07-30 15:52:28 +02:00
Eelco Dolstra 61a858783c nix-repl: Bump 2015-07-30 12:08:20 +02:00
Eelco Dolstra 8a5000cc78 nixUnstable: Update to 1.10pre4200_76cc8e9 
Also unify the nixStable and nixUnstable expressions.
 2015-07-30 12:08:20 +02:00
William A. Kennington III 49caeecdaa ceph-git: 2015-07-23 -> 2015-07-29 2015-07-29 18:15:08 -07:00
William A. Kennington III fdc076c986 ceph: Enable accelio only on 10+ 2015-07-29 18:15:08 -07:00
Pascal Wittmann 290fc1d044 parallel: update from 20150622 to 20150722 2015-07-29 22:38:07 +02:00
Pascal Wittmann 3df27bec74 bmon: update from 3.7 to 3.8 2015-07-29 22:36:55 +02:00
Bjørn Forsman 72d7e4048c moreutils: 0.55 -> 0.57 
(Implicitly fixes build, since 0.55 source has disappeared.)

Also add needed "docbook_xml_dtd_44" dependency for the new version.
 2015-07-29 15:46:15 +02:00
Rob Vermaas 9430294114 Update awscli to 1.7.41 2015-07-29 09:08:51 +00:00
Arseniy Seroka e4107bdec3 Merge pull request #9023 from benley/awscli-completion 
awscli: Make bash and zsh completions work
 2015-07-29 00:35:27 +03:00
devhell 4838367a5e profile-cleaner: 2.34 -> 2.35 
Built and tested locally. Unfortunately there is no clear changelog
available.
 2015-07-28 22:13:35 +01:00
lethalman 5bae65da23 Merge pull request #9012 from womfoo/facter 
Add facter
 2015-07-28 18:36:34 +02:00
Luca Bruno 4f320818e2 dmtx-utils: depend on imagemagick (ZHF) 2015-07-28 17:57:11 +02:00
Kranium Gikos Mendoza 78309d9825 facter: init at 3.0.2 2015-07-28 19:53:32 +08:00
Nikolay Amiantov 9d815b266d thermald: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov b2d5326e3a sdl-jstest: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov 3a2275dd84 imgurbash: add package 2015-07-28 12:33:29 +03:00
Benjamin Staffin 8de7d148c8 awscli: Make bash and zsh completions work 2015-07-28 01:14:34 -07:00
Tobias Geerinckx-Rice e8596c189f colordiff: 1.0.13 -> 1.0.15 
Changes:
- Big improvements to side-by-side diff detection
- Additional colordiffrc example colour scheme file to match 'git diff'
- Misc fixes
 2015-07-27 01:54:08 +02:00
Tobias Geerinckx-Rice 08f866d887 xdelta: 3.0.9 -> 3.0.10 2015-07-27 01:54:08 +02:00
Eelco Dolstra f98c7f2976 More docs in separate outputs 2015-07-26 22:46:45 +02:00
Eelco Dolstra 6a91bf20c8 groff: Move docs to separate output 
This cuts the size of the package by ~10 MB.
 2015-07-26 22:46:44 +02:00
Eelco Dolstra 48efe637ac xdg-utils: Don't depend on "which" 2015-07-26 22:46:23 +02:00
Tobias Geerinckx-Rice df6381afec stress-ng: 0.04.11 -> 0.04.12 
Fixes/features:
  * Fix segfault in metrics because MMAPFORK macro not defined correctly
  * Add --cpu-load-slice option for CPU stressor time slice tweaks
 2015-07-24 22:03:32 +02:00
Vladimír Čunát a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
lethalman 5d60c20fd8 Merge pull request #8731 from cheecheeo/fzf-master 
fzf
 2015-07-24 10:13:01 +02:00
William A. Kennington III 0e1d8f0d7d ceph-git: 2015-07-20 -> 2015-07-23 2015-07-23 15:15:02 -07:00
William A. Kennington III 6d30af58a0 ceph: Fix detection of git versioning 2015-07-23 15:14:50 -07:00
Domen Kožar 6492dc8900 Merge pull request #8928 from brodul/borg 
Add borg backup software (fork of attic)
 2015-07-23 23:31:36 +02:00
Samuel Rivas 55ad2d2150 Fix wyrd to compile with ocaml 4.02 
camlp4 is now a separate package instead of shipping within the ocaml package
 2015-07-23 19:50:01 +02:00
Peter Simons dc5084b4d1 nixops: fix Emacs syntax highlighting 2015-07-23 19:47:43 +02:00
Peter Simons 5fcdd7c0dc nixopsUnstable: disable broken documentation build 2015-07-23 19:47:16 +02:00
Tobias Geerinckx-Rice dfeaaa8909 geolite-legacy: use correct local naming scheme 
Following http://dev.maxmind.com/geoip/legacy/install/city/:

  "Then rename the *.dat file to GeoIP.dat, GeoIPRegion.dat, or
   GeoIPCity.dat, for the GeoIP Country, Region or City databases,
   respectively."

Using the default "GeoLiteCity*.dat" name caused ipv6calc to miss it
(verified using `ipv6calc -vv`).
 2015-07-23 04:09:15 +02:00
Tobias Geerinckx-Rice 72fd2a609c ipv6calc: make geoip and geolite-legacy "optional" 2015-07-23 03:12:22 +02:00
Tobias Geerinckx-Rice 0c00290fbb ipv6calc: 0.98.0 -> 0.99.0 2015-07-23 03:12:22 +02:00
Tobias Geerinckx-Rice c805663bf4 stress-ng: 0.04.10 -> 0.04.11 
Changes: https://launchpad.net/ubuntu/+source/stress-ng/+changelog
 2015-07-23 03:12:21 +02:00
Arseniy Seroka fad983f95f Merge pull request #8960 from fpletz/package/horst 
horst: init at git-2015-07-22
 2015-07-23 02:31:51 +03:00
Franz Pletz 6079babed8 horst: init at git-2015-07-22 2015-07-23 01:18:16 +02:00
William A. Kennington III ac36ed18eb dhcpcd: 6.9.0 -> 6.9.1 2015-07-22 14:33:06 -07:00
Vladimír Čunát 2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
Arseniy Seroka 1b8933f8f3 Merge pull request #8942 from bendlas/i2p-update 
i2p: 0.9.19 -> 0.9.20
 2015-07-22 23:12:36 +03:00
Luca Bruno 92150ef3ac zerotierone: doesn't build on i686 (ZHF) 2015-07-22 20:27:53 +02:00
William A. Kennington III b827583831 sudo: 1.8.14p1 -> 1.8.14p3 2015-07-22 11:26:59 -07:00
Luca Bruno befef13d37 chaps: not supported on i686 (ZHF) 2015-07-22 11:37:38 +02:00
Luca Bruno 6151349d07 partclone: fix download (ZHF) 2015-07-22 10:58:21 +02:00
Herwig Hochleitner 604dfd33f4 i2p: 0.9.19 -> 0.9.20 2015-07-22 10:33:31 +02:00
Dan Peebles 75a7f96b44 knockknock: minor cleanup 2015-07-22 01:32:09 +00:00
Dan Peebles a8c7abdb8d knockknock: init 
A simple but secure port knocking daemon and associated tool (NixOS modules upcoming)
 2015-07-22 01:26:40 +00:00
Arseniy Seroka 91289b13d4 Merge pull request #8926 from dezgeg/pr-memtester 
memtester: init at 4.3.0
 2015-07-22 01:34:52 +03:00
Arseniy Seroka 431555f86b Merge pull request #8934 from ollieh/ksuperkey 
ksuperkey: init
 2015-07-22 01:33:42 +03:00
Oliver Hunt a855efe7db ksuperkey: init 2015-07-21 21:37:29 +00:00
Andraz Brodnik b655b1c49d Add borg backup software (fork of attic) 
Borg is a fork of attic backup software. It is more actively developed,
with more features.
 2015-07-21 20:41:13 +02:00
Tuomas Tynkkynen 8de63957a5 memtester: init at 4.3.0 2015-07-21 19:59:41 +03:00
Edward Tjörnhammar f7d962cd42 aiccu: patch gnutls api change 2015-07-21 10:48:36 +02:00
Austin Seipp 3793ff5290 nixpkgs: torsocks 2.0.0 -> 2.1.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 21:50:29 -05:00
Austin Seipp 4a6b7fc563 nixpkgs: stunnel 5.16 -> 5.20 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 21:50:29 -05:00
William A. Kennington III 17d045c74b ceph-git: 2015-07-15 -> 2015-07-20 2015-07-20 18:07:16 -07:00
Austin Seipp c2f1ac9885 nixpkgs: ssdeep 2.12 -> 2.13 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:34 -05:00
Austin Seipp cbf14b9d8f nixpkgs: dd-agent 5.2.3 -> 5.4.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 13:52:33 -05:00
Georges Dubus eb9475d110 nox: updated to 0.0.2 2015-07-20 17:09:33 +02:00
Rok Garbas 46516fc19e connmanui: update to latest (e4a8ddcca08 -> fce0af94e12) 2015-07-20 16:53:50 +02:00
Peter Simons 07fd9384f5 texlive: flip the default for the assertion so that normal users can build it 2015-07-20 16:39:39 +02:00
Vladimír Čunát 52b3546e4a merge #8617: recoll: filters for LaTeX, RTF, and WP 2015-07-20 11:00:04 +02:00
Vladimír Čunát 1fee4ce381 nzbget: fix URLs, fixes #8860 
/cc maintainer @pSub.
 2015-07-20 09:57:01 +02:00
William A. Kennington III 6eab1065f1 ceph: Fix wrapper path 2015-07-19 19:44:48 -07:00
William A. Kennington III 05c0fc15c0 Merge branch 'master.upstream' into staging.upstream 2015-07-19 15:20:04 -07:00
Arseniy Seroka fcd855fa7f Merge pull request #8883 from joachifm/dnscrypt-proxy-1_6_0 
dnscrypt-proxy: 1.5.0 -> 1.6.0
 2015-07-20 00:33:04 +03:00
William A. Kennington III 8734f01830 sudo: 1.8.13 -> 1.8.14p1 2015-07-19 12:09:14 -07:00
William A. Kennington III 8d4f9d8d6b ceph: Add missing boost 1.58 compat patch 2015-07-19 12:03:28 -07:00
William A. Kennington III 2ad250f4fa Merge branch 'staging.next' into staging.upstream 2015-07-19 02:21:28 -07:00
Vladimír Čunát 9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Tobias Geerinckx-Rice 84aea56778 netsniff-ng: 0.5.9-{27-g3beaa23 -> 34-g95c4582} 
Several flowtop fixes/enhancements.
 2015-07-18 23:45:37 +02:00
Joachim Fasting b9895740ba dnscrypt-proxy: 1.5.0 -> 1.6.0 2015-07-18 20:31:18 +02:00
William A. Kennington III 8420f5c483 ceph: Boost 1.58 compat 2015-07-17 20:39:12 -07:00
William A. Kennington III 754f21df19 file: Fix hash 2015-07-17 14:37:48 -07:00
William A. Kennington III fd5f56dc50 file: 5.23 -> 5.24 2015-07-17 14:37:20 -07:00
William A. Kennington III 1caf3e1724 Merge branch 'master.upstream' into staging.next 2015-07-17 14:34:56 -07:00
Arseniy Seroka 37c09b0433 Merge pull request #8865 from rycee/update/socat 
socat2pre: 2.0.0-b7 -> 2.0.0-b8
 2015-07-18 00:29:46 +03:00
Lluís Batlle i Rossell ce597e1e1b updating tor to 0.2.6.10 
I checked the tarball signature.

I fixed the optimised build (broken since 2013) and I added seccomp.
 2015-07-17 18:24:35 +02:00
Peter Simons 32a81524fe release-lib: rename config option "inHydra" to "allowTexliveBuilds" 
Also, take the value of that attribute as an argument to the module so
that Hydra maintainers who don't mind building TexLive have a chance to
do so.
 2015-07-17 14:13:40 +02:00
Vladimír Čunát 9f37e91ec5 Merge master into staging 
There are larger-rebuild changes: gnutls and samba.
 2015-07-17 06:38:04 +02:00
William A. Kennington III 967abfc786 efivar: 0.20 -> 0.21 2015-07-16 20:07:17 -07:00
William A. Kennington III da5e25dcaa tinc: 2015-06-20 -> 2015-07-17 2015-07-16 20:07:17 -07:00
William A. Kennington III 97d8c1cb23 tinc: 1.0.25 -> 1.0.26 2015-07-16 20:07:17 -07:00
Robert Helgesson 12ec56030e socat2pre: 2.0.0-b7 -> 2.0.0-b8 2015-07-16 23:27:04 +02:00
goibhniu a076e4bee6 Merge pull request #8864 from rycee/package/gmic 
gmic: init at 1.6.5.0
 2015-07-16 22:50:16 +02:00
Robert Helgesson 6a1519c631 gmic: init at 1.6.5.0 2015-07-16 22:02:21 +02:00
Luca Bruno 60d19b3adc Revert "gnupg: fix build on darwin" 
This reverts commit db3602b5d6.

Fixed libusb build by 82d2960f15
 2015-07-16 10:36:29 +02:00
John Chee 17c1428bfb fzf: 0.9.13 -> 0.10.0 2015-07-15 19:59:20 -07:00
William A. Kennington III 3adb0e713c ceph: 2015-06-06 -> 2015-07-15 2015-07-15 17:46:45 -07:00
William A. Kennington III c1c757cea4 ceph: 9.0.1 -> 9.0.2 2015-07-15 17:46:31 -07:00
William A. Kennington III 0861cb2c7d Merge pull request #8845 from rycee/fix/dtach-CVE-2012-3368 
dtach: fix CVE-2012-3368
 2015-07-15 17:41:45 -07:00
William A. Kennington III c8c11371b9 Merge pull request #8732 from lovek323/gnupg-darwin 
gnupg: fix build on darwin
 2015-07-15 17:37:59 -07:00
Bjørn Forsman 9ad01e41de eplot: init at 2.07 
Create plots quickly with gnuplot.

http://liris.cnrs.fr/christian.wolf/software/eplot/
 2015-07-15 23:37:33 +02:00
Robert Helgesson d68d929291 dtach: fix CVE-2012-3368 2015-07-15 18:19:46 +02:00
Joachim Fasting 4bd52ddb88 untex: init at 1.2 2015-07-15 17:03:18 +02:00
Joachim Fasting bcb314853a unrtf: init at 0.21.9 2015-07-15 17:03:17 +02:00
Bjørn Forsman 2926f3aa2c fgallery: init at 1.7 
fgallery is a static photo gallery generator.

http://www.thregr.org/~wavexx/software/fgallery/
 2015-07-15 16:02:37 +02:00
William A. Kennington III 25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
William A. Kennington III 369febb956 btrfsprogs: 4.1.1 -> 4.1.2 2015-07-15 01:58:34 -07:00
ts468 c930417537 Merge pull request #8830 from ts468/upstream.tpm-luks 
tpm-luks: update -> git-2015-07-11
 2015-07-15 10:52:20 +02:00
Thomas Strobel 127300a51d tpm-luks: update -> git-2015-07-11 2015-07-15 10:22:40 +02:00
Tobias Geerinckx-Rice a42b2e5f85 netsniff-ng 0.5.9-21-g8c75168 -> 0.5.9-27-g3beaa23 
Functional changes:
- trafgen: Print min packet size in error message
- flowtop man: Add note about activating netfilter connection tracking
- flowtop: Fix flows disappearing
- flowtop: Fix hanging while waiting for collector
 2015-07-15 03:31:54 +02:00
Arseniy Seroka 2fa88f65ea Merge pull request #8812 from k0ral/xurls 
xurls: init at 0.6.0
 2015-07-14 14:13:08 +03:00
koral 562f760f20 xurls: init at 0.6.0 2015-07-14 08:27:29 +00:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Maciek Starzyk d3284944a1 obnam: 1.8 -> 1.12 2015-07-13 23:44:56 +02:00
William A. Kennington III d253b3d875 coreutils: Skip sparse cp test as it fails reliably with btrfs on ubuntu 14.04 2015-07-13 13:48:59 -07:00
William A. Kennington III b2ae45bd77 btrfsProgs: Cleanup some old build changes 
The change of optimization flags should be safe for all platforms as
the default for most applications is -O2. It is also unecessary to
forcefully link against libgcc_s as btrfsprogs no longer errors when
scrubbing without this linkage.
 2015-07-13 12:34:06 -07:00
Pascal Wittmann 1e9561ff39 bareos: fix build (ZHF) 2015-07-13 13:43:11 +02:00
Tuomas Tynkkynen 3b81288a58 debbindiff: init at version 26 
[Bjørn: set namePrefix = "" to align attrname/pkgname, break overlong
lines, change patchPhase into postPatch so that 'patches' can still be
used.]
 2015-07-13 08:31:55 +02:00
Tuomas Tynkkynen 2ad7463144 pythonPackages.magic: Fix loading libmagic.so 
Even with the previous `python.patch` file around, libmagic.so isn't
found. Instead patch it to use an absolute path, using a similar
approach that is used by the `python_magic` package (which is another
libmagic python wrapper library as well).
 2015-07-13 08:29:05 +02:00
Pascal Wittmann dc608ff237 sbsigntool: fix build (ZHF) 2015-07-12 23:41:10 +02:00
James Cook a456168e5b Merge pull request #6702 from joachifm/dnscrypt-proxy 
nixos: some improvements for dnscrypt-proxy
 2015-07-12 00:17:46 -07:00