mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity
54438 commits 218 branches 122 tags 7.1 GiB
Commit graph

21156 commits

Author SHA1 Message Date
Peter Simons 46b0c68ea2 Merge pull request #5282 from rickynils/java-truststore-env 
openjdk: Read SSL truststore from JAVAX_NET_SSL_TRUSTSTORE
 2014-12-12 09:22:15 +01:00
Austin Seipp 0bdff430a4 nixpkgs: rr 2.0.0 -> 3.0.0, with 64bit support 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-12 01:20:23 -06:00
Jaka Hudoklin 0d01793870 Merge pull request #5290 from bbarker/gradle221 
keeping gradle updated
 2014-12-12 03:06:33 +01:00
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
Shaun Sharples 5f18c41a1b haskell-ekg-bosun: update to 1.0.3 2014-12-11 21:20:30 +01:00
Shaun Sharples 4d2f2c18de haskell-wreq: update to 0.3.0 2014-12-11 21:20:30 +01:00
Shaun Sharples 663bee7e8b haskell-http-client: update to 0.4.6 2014-12-11 21:20:29 +01:00
Vincent Laporte c99c8c3e43 dypgen: adds meta.platforms 2014-12-11 16:15:02 +01:00
Peter Simons dfbb2b37b5 haskell-hackage-db: update to version 1.11 2014-12-11 14:06:08 +01:00
Peter Simons 5ff896ff65 haskell-hackage-db: update to version 1.10 2014-12-11 11:42:05 +01:00
Domen Kožar 776d796221 folly: disable on 32bit (unsupported) 2014-12-11 10:38:52 +01:00
Domen Kožar 3c9828fd77 classpath: fix build 2014-12-11 10:38:52 +01:00
Vincent Laporte cb3f9bf160 omake: add meta.platforms 2014-12-11 09:19:30 +01:00
Michael Raskin a199693cab Update/Fix OVMF 2014-12-11 08:46:13 +03:00
bbarker 2682c01f29 keeping gradle updated 2014-12-11 04:19:14 +01:00
Mateusz Kowalczyk 562fdc2050 Revert "haskell-hxt: update to 9.3.1.9" 
This reverts commit 439a71f1b4.

This is because hxt-9.3.1.9 needs >=mtl-2.2.1
 2014-12-10 23:27:45 +00:00
Trevor L. McDonell 01d274e7bd Update c2hs to 0.20.1 2014-12-10 16:01:37 -05:00
Vladimír Čunát c8a53923fc libyaml: fix CVE-2014-9130 by upstream patch 2014-12-10 19:26:09 +01:00
Emery Hemingway be2060f1e7 glibc_multi: fix package name (close #5284) 
"multi" should be between the "glibc" and the version
 2014-12-10 18:31:31 +01:00
Mateusz Kowalczyk b13301ecbe ffmpeg: update from 2.4.4 to 2.5 (close #5279) 2014-12-10 18:13:53 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove 
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
 2014-12-10 17:19:37 +01:00
Pascal Wittmann bab97e1687 gnet: update from 2.0.7 to 2.0.8 2014-12-10 17:12:41 +01:00
Eelco Dolstra 55d59eefb3 php: Really update to 5.4.34 
75738437a4 only updated the version string...
 2014-12-10 17:09:47 +01:00
Domen Kožar 01a91a2831 boringssl: fix build 
(cherry picked from commit 1b10d224c8)
 2014-12-10 14:05:50 +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