Commit graph

1258 commits

Author SHA1 Message Date
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Michael Raskin
0d6306be4d Merge pull request #4950 from joachifm/dnscrypt-proxy
dnscrypt-proxy service
2014-11-13 00:25:05 +03:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Joachim Fasting
216ed76821 dnscrypt-proxy: new expression 2014-11-11 22:46:49 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Vladimír Čunát
adb831e8bc strongswan: -lgcc_s, fixes #4925
CC maint. @shlevy.
2014-11-11 07:42:00 +01:00
Vladimír Čunát
4849e32abe curl: update to fix CVE-2014-3707 2014-11-10 21:34:03 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Edward Tjörnhammar
c329e5bbd9 i2pd: added package, service 2014-11-09 09:55:35 +01:00
Emery Hemingway
67a2a58314 cjdns: service tweaks, new NixOS test 2014-11-08 23:39:02 +01:00
Aristid Breitkreuz
928177aa91 Merge pull request #4834 from offlinehacker/pkgs/flannel/add
Add flannel, etcd backed network fabric for containers
2014-11-08 19:56:16 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Michael Raskin
3e118edf3a Refactor and fix fdm build. Moved makeFlags definition because non-builderDefs packages cannot use $out in direct variable definitions like makeFlags. 2014-11-07 12:05:15 +03:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Rickard Nilsson
f2b6b9871f new package: swaks, a command line SMTP tool 2014-11-05 21:43:25 +01:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Michael Raskin
167115f1a2 Update siege HTTP load-tester 2014-11-05 11:56:19 +03:00
Jaka Hudoklin
f253186e96 Add flannel, etcd backed network fabric for containers 2014-11-04 19:32:30 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
William A. Kennington III
7c605db462 tinc_pre: Update to f57d53c 2014-11-03 14:21:30 -08:00
Jaka Hudoklin
c2d4fd7360 Merge pull request #4762 from ambrop72/badvpn-debug
badvpn: Add debug flag to enable assertions.
2014-11-03 14:07:28 +01:00
William A. Kennington III
7b06577d4b iperf3: 3.0.8 -> 3.0.9 2014-11-02 17:22:01 -08:00
ambrop7@gmail.com
4664321cd3 badvpn: Add debug flag to enable assertions. 2014-11-01 15:16:28 +01:00
Franz Pletz
e630ee2fdd wget: Update to 1.16 (fix CVE-2014-4877)
This patch updates wget to the current version, 1.16. This release fixes a
remotely exploitable security issue: CVE-2014-4877.

A dependency on libidn was added and the testsuite now depends on
python3. A patch that disables a test was removed because it is not needed
anymore.

As I intend to take care of wget in the future, I added myself to the
maintainers.
2014-10-30 10:30:08 +01:00
Nikolay Amiantov
1f101efa88 update-resolv-conf: add package 2014-10-28 03:04:14 -07:00
Bjørn Forsman
d12da7007c fping: set meta.platforms 2014-10-27 18:20:46 +01:00
Lluís Batlle i Rossell
f3d978be65 cjdns: installing contrib scripts
I made the nodejs and python scripts have the proper shebang. A lot more
of them could be updated to reference store paths (calls to "python",
etc.)

(cherry picked from commit 2fb382afb6319065f20af22d86774df190beb0d5)
2014-10-25 15:52:54 +02:00
viric
f75e5330f3 Merge pull request #4658 from ehmry/cjdns
cjdns: update 20140928 to 20141023
2014-10-24 23:20:52 +02:00
Emery Hemingway
957602c40c cjdns: update 20140928 to 20141023 2014-10-24 17:15:13 -04:00
Lluís Batlle i Rossell
7da0fecf32 Adding an extra url for nc6. The previous was failing. 2014-10-24 23:14:35 +02:00
Edward Tjörnhammar
a5af1c228e Adding fetchurl mirrors for roy marples projects(dhcpcd, openresolv) 2014-10-23 19:45:33 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Emery Hemingway
70e0577886 update cjdns from 20140922 to 20140928 2014-10-21 13:08:54 -04:00
Eelco Dolstra
d316346d42 Merge pull request #4588 from edwtjo/dhcpcd-update
dhcpcd: 6.4.7 -> 6.5.1
2014-10-20 10:52:17 +02:00
Edward Tjörnhammar
3b08861278 dhcpcd: 6.4.7 -> 6.5.1 2014-10-19 08:22:17 +02:00
Michael Raskin
a32e534262 SSL support for cadaver DAV client 2014-10-18 21:47:49 +04:00
William A. Kennington III
061cbc40f6 radvd: 2.7 -> 2.8 2014-10-17 16:56:35 -07:00
Shea Levy
b5fe0d32b6 Merge branch 'strongswan-charon-cmd' of github.com:ftrvxmtrx/nixpkgs
strongswan: enable charon-cmd
2014-10-14 09:54:28 -04:00
Jascha Geerds
e6ec404b0b Update plasma-nm 2014-10-14 13:17:55 +02:00
Siarhei Zirukin
8799219f1e strongswan: enable charon-cmd 2014-10-14 10:02:02 +02:00
Mateusz Kowalczyk
b9c2fe5fd8 Merge pull request #4400 from matejc/seeksservice
seeks: update and write nixos module
2014-10-13 21:37:11 +01:00
Michael Raskin
53a5b67d5e Adding mailsend tool 2014-10-13 18:18:34 +04:00
Matej Cotman
76a7b0ba68 seeks: upgrade and add optional seeks_confDir 2014-10-13 13:10:49 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Eelco Dolstra
79d0d7b437 Unify gcc-wrapper and clang-wrapper 2014-10-11 22:26:39 +02:00
Aristid Breitkreuz
4d1fdb9380 stunnel 5.05 2014-10-11 14:16:37 +02:00
Lluís Batlle i Rossell
82b6d7ff9a Updating inadyn to 1.99.10.
(I wnated the cache-dir option)
2014-10-10 17:07:17 +02:00
Austin Seipp
2241ce448e stunnel: 5.03 -> 5.04
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:09:31 -05:00
codyopel
2986ca34d6 rtorrent-git: new package 2014-10-09 20:47:27 +02:00