obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
1.0.1-CVE-2016-2177.diff	openssl: fix CVE-2016-2177	2016-08-23 03:41:03 +03:00
1.0.1-cygwin64.patch	cygwin: openssl for x86_64	2015-05-28 10:53:35 +02:00
1.0.2-CVE-2016-2177.diff	openssl: fix CVE-2016-2177	2016-08-23 03:41:03 +03:00
chacha.nix	openssl-chacha: Split into multiple outputs	2016-04-14 08:32:20 +03:00
darwin-arch.patch
default.nix	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
use-etc-ssl-certs.patch	openssl: Compile in /etc/ssl/certs/ca-certificates.crt	2016-02-03 13:45:05 +01:00