Commit Graph

5630 Commits

Author SHA1 Message Date
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01: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
Pascal Wittmann
92f3ec3ba5 pngnq: update from 1.0 to 1.1 2015-02-13 11:02:27 +01:00
John Wiegley
b39d5ea309 contacts: New expression for darwin 2015-02-12 16:58:22 -06:00
Vladimír Čunát
d3b25752f1 p7zip: small update to fix CVE-2015-1038 2015-02-12 20:51:26 +01:00
Peter Simons
6827c7d8b0 Merge pull request #6315 from matthiasbeyer/update-gnupg
Update gnupg21 package to gpg-2.1.2
2015-02-12 18:58:06 +01:00
Matthias Beyer
91c31bcc57 Update gnupg21 package to gpg-2.1.2 2015-02-12 16:52:07 +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
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Bjørn Forsman
c42d36de1a genext2fs: add meta.{platforms,license,maintainers} 2015-02-11 20:06:14 +01:00
Shea Levy
52879c9050 pass: fix completion installation 2015-02-11 15:29:34 +00:00
Sander van der Burg
4c7adddcb7 s3fs: Add package 2015-02-11 13:23:58 +00:00
Tobias Geerinckx-Rice
5e608de1ac stress-ng: update 0.03.14 -> 0.03.15 2015-02-10 19:24:52 +01:00
Georges Dubus
1e5ce3f024 openfortivpn: Added expression 2015-02-10 13:57:21 +01:00
Benno Fünfstück
42722a2940 Merge pull request #6279 from j-keck/kpcli
kpcli: 2.7 -> 2.8
2015-02-10 11:31:38 +01:00
Michael Raskin
f6f3813b65 Packaging Asymptote from scratch to get rid of builderDefsPackage 2015-02-10 00:28:00 +03:00
Michael Raskin
7c12355ee1 Update Wine version in Pipelight 2015-02-10 00:28:00 +03:00
William A. Kennington III
c14348a51d tinc_pre: Update git version 2015-02-09 10:48:36 -08:00
Pascal Wittmann
5478bcffae tmsu: update from 0.5.0 to 0.5.1 2015-02-09 19:26:28 +01: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
lethalman
e08eb01c05 Merge pull request #6252 from benley/xbindkeys-config
New package: xbindkeys-config
2015-02-09 11:08:08 +01:00
Benjamin Staffin
ea446390fa New package: xbindkeys-config
The patch is borrowed verbatim from Debian. It is under the same
license as the rest of the package, and is necessary for the app to
work.

There does not seem to be a canonical upstream homepage for this app
other than Debian itself.

Change-Id: I4f0bec32a95778fb12a48bfb280386b65a0d0f9a
2015-02-09 01:36:01 -08:00
j-keck
dc9cdb2beb kpcli: 2.7 -> 2.8 2015-02-09 09:17:33 +01:00
Domen Kožar
49c67589b6 iodine: 0.6.0-rc1 -> 0.7.0 2015-02-09 06:41:27 +01:00
Shea Levy
0d80ab2dd9 Fix grub1 support 2015-02-08 22:28:42 -05:00
William A. Kennington III
2a0754ccbc Merge pull request #5994 from ts468/grub
Add 'target' parameter for GRUB installation chain
2015-02-08 14:18:13 -08: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
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
Pascal Wittmann
97049ccf80 tmsu: update from 0.4.3 to 0.5.0 2015-02-08 11:45:11 +01:00
William A. Kennington III
c8a4ecd91d grub: Doesn't support building bios and efi simultaneously 2015-02-07 20:32:36 -08:00
Eric Seidel
472feaf53b dont need -liconv 2015-02-07 20:29:28 -08:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
William A. Kennington III
ef80d73e6a grub: Enable zfs and efi by default since it's cheap to support 2015-02-07 15:18:37 -08:00
William A. Kennington III
15cf03a8ee Build userspace packages using the userspace zfs 2015-02-07 15:07:39 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
Moritz Ulrich
6a24650cb5 pass: update from 1.6.3 to 1.6.5 2015-02-07 18:49:49 +01:00
aszlig
e05bade342
Merge pull request #6076 (vdirsyncer).
Adds vdirsyncer and dependencies (request_toolbelt and atomicwrites).

It's to synchronize calendars and addressbooks between two storages (for
example between CalDAV/CardDAV and a local folders/files).
2015-02-07 17:10:30 +01:00
Matthias Beyer
e5a0d8bc61 Add nix expression for vdirsyncer 2015-02-07 15:34:23 +01:00
Robert Helgesson
ec61d946eb Update svtplay-dl to 0.10.2015.01.28. 2015-02-07 13:25:19 +01:00
Vladimír Čunát
346c8d7a98 xdg-utils: update from git to fix CVE-2014-9622
Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

That KDE patch no longer applies, but the code seems to take KDE5 into
account already. CC @ttuegel.
2015-02-07 07:35:21 +01:00
Edward O'Callaghan
529e2b281a gnupatch: update from 2.7.1 to 2.7.3 (close #6048)
Potentially fixes CVE-2015-1196.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-02-07 06:48:21 +01:00
William A. Kennington III
b65209849a bareos: 14.2.2 -> 14.2.3 2015-02-06 13:00:40 -08: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
William A. Kennington III
10390a17e4 btrfs-progs: 3.18.0 -> 3.18.2 2015-02-06 12:53:10 -08:00
William A. Kennington III
967ad3fbc3 ceph: 0.91 -> 0.92 2015-02-06 12:17:43 -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