Commit Graph

21133 Commits

Author SHA1 Message Date
Rickard Nilsson
95fdc8cf29 openjdk: Introduce JAVAX_NET_SSL_TRUSTSTORE env
This small patch makes it possible to control java's truststore path through
the environment. This lets you add (system- or session-wide) CAs that should
be allowed by Java. Java users can still use -Djavax.net.ssl.truststore to
override the truststore set by JAVAX_NET_SSL_TRUSTSTORE.

Something like this can be used to build the truststore (in this example just
using the standard pkgs.cacert CA-bundle):

{
  environment.variables.JAVAX_NET_SSL_TRUSTSTORE = "${
    pkgs.runCommand "cacerts" {} ''
      ${pkgs.perl}/bin/perl \
        ${pkgs.path}/pkgs/development/compilers/openjdk/generate-cacerts.pl \
        ${pkgs.jre}/bin/keytool \
        ${pkgs.cacert}/etc/ca-bundle.crt
      mv cacerts $out
    ''
  }";
}

Ideally, the dependency on pkgs.cacert should also be removed from pkgs.openjdk
to avoid rebuilding java each time the standard CA-bundle changes. Something
along the example above must then be added to NixOS (however, it would be
nice to not depend on ${pkgs.jre}/bin/keytool to generate that environment
variable).
2014-12-12 01:14:09 +01:00
Mateusz Kowalczyk
3b3e2a62d3 haskell-gtk3: update to 0.13.3 2014-12-10 09:49:15 +00:00
Mateusz Kowalczyk
439a71f1b4 haskell-hxt: update to 9.3.1.9 2014-12-10 09:49:00 +00:00
Mateusz Kowalczyk
06498b06ed haskell-vty: update to 5.2.6 2014-12-10 09:48:37 +00:00
Mateusz Kowalczyk
b5ba9e3558 haskell-github: update to 0.13.1 2014-12-10 09:48:27 +00:00
Mateusz Kowalczyk
691b2ac0ad haskell-Agda: update to 2.4.2.2 2014-12-10 09:48:11 +00:00
Mateusz Kowalczyk
4d520d9e12 haskell-call: new package 2014-12-10 09:42:03 +00:00
Mateusz Kowalczyk
c4b4dfa1dc haskell-elevator: new package 2014-12-10 09:42:03 +00:00
Mateusz Kowalczyk
4c3417df44 haskell-objective: update to 0.6.1 2014-12-10 09:42:02 +00:00
Mateusz Kowalczyk
811cc55739 haskell-minioperational: update to 0.4.8.1 2014-12-10 09:42:02 +00:00
Mateusz Kowalczyk
891a293aa6 haskell-bindings-portaudio: new package 2014-12-10 09:42:02 +00:00
Mateusz Kowalczyk
a50a7ca3da haskell-hspec-laws: new package 2014-12-10 07:45:16 +00:00
Domen Kožar
0fcef83b0d fix a bunch of perl modules 2014-12-10 01:38:00 +01:00
Vincent Laporte
ef5c48326a Adds ocaml-fieldslib
This library defines a syntax extension for OCaml using Camlp4 that
can be used to define first class values representing record fields,
and additional routines, to get and set record fields, iterate and
fold over all fields of a record and create new record values.

Homepage: https://ocaml.janestreet.com/
2014-12-09 19:37:48 +01:00
Bjørn Forsman
99eab9f1e2 buildbot{,-slave}: update 0.8.8 -> 0.8.10
Build tested. Source distribution is now on pypi instead of googlecode.
2014-12-09 19:14:03 +01:00
Domen Kožar
d3ed0ab32b PyQt: fix build 2014-12-09 13:23:13 +01:00
Domen Kožar
d7ab16aee4 remove cppnetlib, we already have cpp-netlib 2014-12-09 12:24:57 +01:00
lethalman
765eab6d5b Merge pull request #5269 from luke-clifton/lc-soundtouch
Added SoundTouch library
2014-12-09 10:25:26 +01:00
Luke Clifton
e62aa58f71 Added SoundTouch library 2014-12-09 17:15:30 +08:00
Bjørn Forsman
3871539d3b thrift: update 0.9.1 -> 0.9.2
* Drop unneeded patch to fix build error; now included upstream
* Fetch tarball instead of using git
* Drop unneeded autotools deps since we're building from tarball

TODO: Package boost-test library, so that we can run the test suite.
2014-12-08 22:54:14 +01:00
Alex Chapman
31b163b90b Add haskellPackages.ofx at version 0.4.0.0 2014-12-09 07:04:49 +11:00
Thomas Tuegel
efe278acfc fontconfig-ultimate.rendering: correct typo in ultimate-lightest 2014-12-08 10:57:25 -06:00
Thomas Tuegel
322bb7a67b fontconfig: include user config through NixOS module 2014-12-08 10:55:24 -06:00
Thomas Tuegel
d75485c945 Add fontconfig-ultimate-20141123 2014-12-08 10:55:23 -06:00
Domen Kožar
de99c9c955 Merge branch 'staging' 2014-12-08 16:28:45 +01:00
Luca Bruno
9d86b4683d gobject-introspection: add glib to propagatedBuldInputs 2014-12-08 16:21:01 +01:00
Edward Tjörnhammar
7102ef5d49 Revert "nixpkgs: remove tsocks"
torsocks and tsocks are not equivalent. torsocks needs a
tor proxy for DNS, tsocks do not.

This reverts commit 1ef6470f15.

tsocks: adding myself as maintainer
2014-12-08 11:51:22 +01:00
Vincent Laporte
6a69a25c56 Adds coq-interval
This library provides vernacular files containing tactics for
simplifying the proofs of inequalities on expressions of real numbers
for the Coq proof assistant.

Homepage: http://coq-interval.gforge.inria.fr/
2014-12-08 09:15:13 +01:00
Peter Simons
774b0fc028 haskell-hackage-db: update to version 1.9.1 2014-12-07 16:31:56 +01:00
Bjørn Forsman
28d98c701b hidapi: add a comment on the license
hidapi allows the user to chose between GPLv3, BSD or HIDAPI license
(more liberal).
2014-12-07 16:15:52 +01:00
Bjørn Forsman
c970104135 hidapi: update/fix description
Description should start with capital letter.
2014-12-07 16:14:07 +01:00
Peter Simons
479602aae8 haskell-hackage-db: update to version 1.9 2014-12-07 15:31:43 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Vincent Laporte
7893825613 coq-flocq: license 2014-12-07 13:14:33 +01:00
Maciek Starzyk
c77ae0ced7 urweb: updated to version 20141206 2014-12-06 23:35:51 +01:00
Peter Simons
0d9001e934 haskell-preprocessor-tools: remove obsolete version 0.1.3 2014-12-06 16:41:40 +01:00
Peter Simons
e56b1610e7 haskell-ixdopp: remove obsolete package 2014-12-06 16:41:22 +01:00
Arseniy Seroka
6641f5d220 binary-strict: add haskell pkg 2014-12-06 18:34:23 +03:00
Arseniy Seroka
3cc8b15721 haskell: add pkg lin-alg 2014-12-06 18:24:30 +03:00
Bjørn Forsman
9e174b90c8 lttng-ust: update from 2.5.0 to 2.5.1 2014-12-06 15:22:44 +01:00
Bjørn Forsman
b161910db1 lttng-tools: update from 2.5.0 to 2.5.2 2014-12-06 15:22:27 +01:00
Bjørn Forsman
7f25c8357b liburcu: update from 0.8.4 to 0.8.6 2014-12-06 15:21:55 +01:00
Austin Seipp
1ef6470f15 nixpkgs: remove tsocks
tsocks is old, and users should be using torsocks these days instead.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:26 -06:00
Peter Simons
85f5c1a1dd haskell-cabal2nix: update to version 1.72 2014-12-05 19:14:45 +01:00
Peter Simons
efccab0cf2 Merge pull request #5232 from joachifm/haskell-mvc
haskell-packages: add mvc and mvc-updates
2014-12-05 18:53:02 +01:00
Peter Simons
6b45125f59 Merge pull request #5231 from luke-clifton/lc-linear-opengl
Haskell package: linear-opengl
2014-12-05 18:52:49 +01:00
Luke Clifton
e9a24c96be Jailbreak fixed upstream. Bumping to 0.2.0.4 2014-12-05 22:52:35 +08:00
Jascha Geerds
0be4c3b484 libtoxcore: Disable tests 2014-12-05 15:04:17 +01:00
Joachim Fasting
0a9c590c8c haskell-mvc-updates: new expression 2014-12-05 14:25:50 +01:00
Joachim Fasting
757c39877b haskell-mvc: new expression 2014-12-05 14:25:50 +01:00