3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

54480 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
Jaka Hudoklin c96df1fece Merge pull request #5302 from ambrop72/virtualbox-network-interface
virtualbox: Unbreak the nixos module.
2014-12-12 00:30:34 +01:00
ambrop7@gmail.com 65393ca8d3 virtualbox: Unbreak the nixos module. 2014-12-12 00:16:33 +01:00
Jaka Hudoklin 8b512261be Add cava, console-based Audio Visualizer for Alsa 2014-12-12 00:09:32 +01:00
Jaka Hudoklin e1383d0833 Merge pull request #5300 from ambrop72/virtualbox-network-interface
virtualbox: Allow disabling the network interface.
2014-12-11 23:51:52 +01:00
lethalman 786a0c92c6 Merge pull request #5299 from bjornfor/gnome-enable-mtp-support
nixos/gnome: enable MTP support in gvfs
2014-12-11 23:41:05 +01:00
Jaka Hudoklin 91961c2a32 nixos/mesos: fix typo 2014-12-11 23:35:39 +01:00
ambrop7@gmail.com 9fa2c35ec8 virtualbox: Allow disabling the network interface.
The current nixos module for VirtualBox unconditionally configures a vboxnet0
network interface at boot. This may be undesired, especially when the user wants
to manage network interfaces in a centralized manner.
2014-12-11 23:35:03 +01:00
Jaka Hudoklin 4be1089781 nixos: move kubernetes & fleet to services/cluster 2014-12-11 23:32:37 +01:00
Jaka Hudoklin 1465d9321d thc-hydra: include postgresql brute-force support 2014-12-11 23:25:26 +01:00
Jaka Hudoklin 3ceb789c36 john: use systemd wide config, and not from store 2014-12-11 23:25:26 +01:00
Jaka Hudoklin 5dac2ec412 Merge pull request #5297 from fmapfmapfmap/tor-extra-config
Tor module: append redundant specifications of 'extraConfig', via 'types.lines'.
2014-12-11 23:22:52 +01:00
Jaka Hudoklin deb28cf0b1 nixos: container tarball release
- Create container nixos profile
- Create lxc-container nixos config using container nixos profile
- Docker nixos image, use nixos profile for its base config
2014-12-11 23:17:27 +01:00
Jaka Hudoklin a782b890d5 nixos/make-system-tarball: extra commands to be executed before archive 2014-12-11 23:17:27 +01:00
Bjørn Forsman f3a46c3858 nixos/gnome: enable MTP support in gvfs
To support browsing files on Android phones in Nautilus (and other GVFS
based file browsers).
2014-12-11 23:13:39 +01:00
lethalman 747488ae66 Merge pull request #5268 from prikhi/fix-dina-font
dina-font: fix the installPhase
2014-12-11 23:10:23 +01:00
Vladimír Čunát 80e3018bc0 Merge #5286: ati-driver: Update to 4.12 2014-12-11 22:12:20 +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
Domen Kožar d83bae657a deluge: 1.3.10 -> 1.3.11 2014-12-11 15:40:59 +01:00
vi c005dc0e6b Tor module: append redundant specifications of 'extraConfig', via 'types.lines'. 2014-12-11 14:23:48 +00:00
Peter Simons dfbb2b37b5 haskell-hackage-db: update to version 1.11 2014-12-11 14:06:08 +01:00
Domen Kožar 8853d30707 pythonPackages.pyptlib: disable tests
(cherry picked from commit c8d9073c0e)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 11:46:36 +01:00
Peter Simons 5ff896ff65 haskell-hackage-db: update to version 1.10 2014-12-11 11:42:05 +01:00
Domen Kožar aaf998f604 remove libvlc, unused package
cc @ttuegel
2014-12-11 10:38:52 +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
Domen Kožar 3dc551fcc3 opentsdb: patch shebangs in correct directory
(cherry picked from commit 105b77f36f1810287b0f32036ae5303dae8c5a66)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 09:17:45 +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
Domen Kožar 27281f660c fix builds for rest of kernel modules on 3.18 2014-12-11 02:03:43 +01:00
Shea Levy 10751129d0 Don't require forcing utils to get to lib 2014-12-10 19:28:45 -05: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
Mateusz Kowalczyk 3d713ff1d6 youtube-dl: update from 2014.12.06.1 to 2014.12.10.3 2014-12-10 23:22:24 +00:00
Peter Simons eb6279974a Merge pull request #5285 from tmcdonell/master
haskell-c2hs: update to 0.20.1
2014-12-11 00:06:35 +01:00
Mateusz Kowalczyk 3750da1226 tibia: update to 10.70 2014-12-10 22:06:28 +00:00
Maciek Starzyk 8989a32d34 j: Fix building libj.so 2014-12-10 22:43:42 +01:00
Trevor L. McDonell 01d274e7bd Update c2hs to 0.20.1 2014-12-10 16:01:37 -05:00
Jascha Geerds b15311027f ati-driver: Fix support for linux kernel 3.17 2014-12-10 21:30:31 +01:00
Domen Kožar 9768adaf1e Revert "xulrunner: use gold linker"
This reverts commit 4a3510ae2b.

Error occurs randomly http://hydra.nixos.org/eval/1165369
2014-12-10 21:15:25 +01:00
Jascha Geerds 3525f7135f ati-driver: Bump version to 14.12 2014-12-10 21:12:54 +01:00
Domen Kožar 89fa1733fa python3Packages.dateutil_2_1: fix build 2014-12-10 21:10:15 +01:00
Vladimír Čunát 15b9626a3d kde: fix CVE-2014-8600 by upstream patches
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.
2014-12-10 19:38:50 +01:00
Vladimír Čunát c8a53923fc libyaml: fix CVE-2014-9130 by upstream patch 2014-12-10 19:26:09 +01:00
Vladimír Čunát 225ddcda9a cpio: fix CVE-2014-9112 by Fedora patch 2014-12-10 19:20:28 +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