JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,491 Commits 2 Branches 0 Tags 12 GiB
4eca50ceb5
Commit Graph

2241 Commits

Author SHA1 Message Date
Domen Kožar
b7eba773dc hhvm: 3.2.0 -> 3.3.0, fix build 
(cherry picked from commit 9d0d9ae9f7ea940ea63dfe019c2818edd6fc376a)
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-12-12 17:09:48 +01:00
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
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
Michael Raskin
a199693cab Update/Fix OVMF 2014-12-11 08:46:13 +03:00
Mateusz Kowalczyk
691b2ac0ad haskell-Agda: update to 2.4.2.2 2014-12-10 09:48:11 +00: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
Maciek Starzyk
c77ae0ced7 urweb: updated to version 20141206 2014-12-06 23:35:51 +01:00
Georges Dubus
d3de398f34 rustSnapshot: upgraded to last master 2014-12-03 16:18:51 +01:00
Ricardo M. Correia
4dca8beea0 icedtea7: Fix patch 2014-12-03 06:05:43 +01:00
Ricardo M. Correia
fbd6f4d9b3 icedtea: Regenerate sources.nix 2014-12-03 05:42:34 +01:00
Ricardo M. Correia
31522e13c7 icedtea: Simplify update script 2014-12-03 05:41:51 +01:00
William A. Kennington III
d2488119cc icedtea7_web: 1.5.1 -> 1.5.2 2014-12-02 16:46:16 -08:00
William A. Kennington III
4dcd691fdf icedtea: 2.4.7 -> 2.5.3 2014-12-02 16:43:24 -08:00
William A. Kennington III
287db58750 icedtea: Fix updater to work with latest icedtea changes 2014-12-02 16:43:01 -08:00
Vladimír Čunát
4426d73ad8 gcc-4.9: maintenance update 2014-12-01 21:30:38 +01:00
Ricardo M. Correia
744dc4abdc rustcMaster: Install docs (into $out/share/doc) 2014-12-01 20:01:52 +01:00
muflax
5fd15e31b0 ccl: fix paths to coreutils 2014-11-29 06:14:53 +00:00
Ricardo M. Correia
d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
Ricardo M. Correia
a83eb0f2a1 rustcMaster: Update from 0.12.0-pre-1336-g394269d -> 0.12.0-pre-1635-g29e928f 2014-11-29 02:04:55 +01:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
muflax
856e5839e1 ccl: 1.8 -> 1.10 (reapply after false revert) 2014-11-27 22:48:07 +00:00
Arseniy Seroka
52ea3bb61f Revert "ccl: 1.8 -> 1.10" 2014-11-28 01:34:54 +03:00
muflax
3c7ac9db06 ccl: 1.8 -> 1.10 2014-11-27 22:33:21 +00:00
Vladimír Čunát
c52db08aa0 sdcc: fix build with glibc-2.20 (from upstream) 2014-11-27 00:51:35 +01:00
Vladimír Čunát
a68c1adc35 *: fix builds by disregarding warning from new glibc 
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803. There will likely appear more of these errors on Hydra in time.
 2014-11-26 23:40:03 +01:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Rene Donner
49561b8b65 julia -> 0.3.3 2014-11-25 20:57:36 +03:00
Pascal Wittmann
c73ce5fa1e lessc: add comment that versions > 2.x break twitter-bootstrap 2014-11-25 18:45:59 +01:00
Eelco Dolstra
e368ca20c9 Fix old Go versions 
http://hydra.nixos.org/build/17432147
http://hydra.nixos.org/build/17439772
 2014-11-25 00:53:06 +01:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Peter Simons
4f48c33b74 haskell-elm-get: jailbreak to fix build with recent http-client 2014-11-24 16:24:12 +01:00
Ricardo M. Correia
855241400c rustcMaster: Update from 0.12.0-pre-1166-g0047dbe -> 0.12.0-pre-1336-g394269d 
Fixes #5056
 2014-11-21 04:04:52 +01:00
Vladimír Čunát
e887fc72d3 nasm: add a do-not-update comment 2014-11-20 17:58:10 +01:00
Vladimír Čunát
e3388aea6e nasm: downgrade again until syslinux gets fixed 
Syslinux won't compile with the new version http://hydra.nixos.org/build/17236670
We've already had one update+revert cycle before.
CC @psub.
 2014-11-20 11:33:25 +01:00
Mateusz Kowalczyk
1bded4188b scala: lib.licenses instead of a string 2014-11-19 18:54:58 +00:00
Mateusz Kowalczyk
03655c332a Add meta.branch to a bunch of packages 
Gives better results in the monitor
 2014-11-19 18:54:58 +00:00
Pascal Wittmann
885a29eefd nasm: update from 2.11.05 to 2.11.06 and adopt it 2014-11-19 08:47:41 +01:00
Moritz Ulrich
b46201250c gforth: Install gforth.el & add meta-data. 2014-11-18 14:45:28 +01:00
cillianderoiste
c1a0440bd3 Merge pull request #5022 from vbgl/roadsend 
Removes roadsend (broken)
 2014-11-18 10:17:45 +01:00
Vincent Laporte
1354bc0eba Updates (and fixes) opa 2014-11-18 07:26:16 +00:00
Vincent Laporte
15eec14f3a Removes roadsend (broken) 2014-11-17 22:42:21 +00:00
Ricardo M. Correia
2d3ec7d6f8 rustcMaster: Update from 0.12.0-pre-961-g93c85eb -> 0.12.0-pre-1166-g0047dbe 2014-11-17 20:39:40 +01:00
Mateusz Kowalczyk
9e79811eb6 AgdaStdlib: update to 0.9 
This should have really been updated with Agda itself.
 2014-11-17 16:48:10 +00:00
Luca Bruno
9631274f77 Add vala 0.26. Will be needed for gnome-terminal 3.14 2014-11-17 14:57:21 +01:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Aristid Breitkreuz
7bb0ff509c remove gcc 3.3 and snx ("SSL Network Extender"), the only package that depends on it 2014-11-16 14:57:42 +01:00
Rene Donner
60eeaf355c update julia, make it portable accross cpu architectures 2014-11-14 16:05:33 +01:00
Eelco Dolstra
ca441636f1 Merge branch 'staging' 2014-11-14 16:00:23 +01:00
Vladimír Čunát
b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Peter Simons
99312f4a51 haskell-Agda: update to version 2.4.2.1 2014-11-14 14:13:40 +01:00