Commit graph

2268 commits

Author SHA1 Message Date
Charles Strahan
df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
Charles Strahan
a188373640 Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
Conflicts:
	pkgs/development/libraries/haskell/ghcjs-dom/default.nix
	pkgs/top-level/haskell-packages.nix
2014-12-27 14:35:01 -05:00
Vladimír Čunát
becf038336 Merge branch 'staging' 2014-12-26 22:41:19 +01:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Michael Raskin
dace8fe45f Merge pull request #5013 from doublec/aliceml
Update aliceml to use git version of Alice ML
2014-12-26 14:21:12 +03:00
Vladimír Čunát
b5bfacefa9 orc: maintenance update
CC maintainer @fuuzetsu.
2014-12-25 11:44:33 +01:00
Vladimír Čunát
47a9d03541 gcc: maintenance update 4.8.3 -> 4.8.4 2014-12-24 23:27:23 +01:00
Peter Simons
157e63c6e6 Update default Haskell compiler from GHC 7.8.3 to 7.8.4. 2014-12-24 09:56:31 +01:00
Peter Simons
8311973759 Add GHC 7.8.4 and create haskellPackages_ghc784 package set. 2014-12-23 20:44:49 +01:00
Ricardo M. Correia
6d1befb7b7 rustcMaster: Update from 0.13.0-pre-2600-g34d6800 -> 0.13.0-pre-2604-g2f3cff6
The previous version had a serious bug.
2014-12-22 23:47:43 +01:00
Ricardo M. Correia
3639bff381 rustcMaster: Update from 0.13.0-pre-1673-g3a325c6 -> 0.13.0-pre-2600-g34d6800 2014-12-22 19:30:01 +01:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Peter Simons
f9580894f2 ghc-head: bump version to most recent snapshot 2014-12-18 19:03:28 +01:00
Peter Simons
c9cd0bc68c ghc-head: fix configure phase to make sure the compiler knows how to use gmp properly
Start with version 7.9 of the compiler, the path to the gmp library must
now be passed to the top-level configure script.
2014-12-18 19:03:28 +01:00
Vladimír Čunát
9cdd231ad3 gcc-4.6: bump to 4.6.4
The dropped patch was applied upstream within the update.
2014-12-14 16:24:31 +01:00
Mathijs Kwik
04f73ed2e4 ghc-head: upgrade to 2014-12-10 2014-12-13 21:17:14 +01:00
Domen Kožar
f4bde46b0f hhvm: use upstream patches to fix the build
(cherry picked from commit b7894032b4708a8c9ccee99aca1b7d6166546d4d)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-13 15:28:12 +01:00
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
Bas van Dijk
6fa969839a Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
Conflicts:
	pkgs/development/libraries/haskell/text-binary/default.nix
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
2014-12-05 07:54:48 +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
Ryan Trinkle
21566e7c56 Remove outdated ghcjs nix expression 2014-12-01 08:09:35 -05:00
Bas van Dijk
f16e4508f4 Use optparse-applicative-0.11.0.1 in ghcjs 2014-11-30 18:08:28 +01:00
Bas van Dijk
9182824c6a Update ghcjs 2014-11-29 14:23:30 +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