Commit Graph

17047 Commits

Author SHA1 Message Date
Eelco Dolstra
0fd9db3cfb gcc-4.8: Get rid of lib64
Having a separate lib64 is bad because it requires special-casing in
lots of places.

Previously done in e4a11b4d92, which
apparently got lost going from 4.6 to 4.8.
2014-07-01 14:27:57 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
89f8af55f1 Darwin: Use xcrun to get the path to the SDK
Recent versions of Xcode don't install headers in /usr/include but
in a directory like

  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include

So use that instead, falling back to /usr/include in case of an older
version of Xcode.
2014-07-01 11:01:36 +02:00
Oliver Charles
2480f2465c Merge pull request #3138 from flosse/lua5-expat
added luaexpat 1.3.0
2014-07-01 08:47:39 +01:00
Michael Raskin
2466b0bc76 Update lib rem 2014-07-01 11:54:09 +04:00
Michael Raskin
4f4a378a02 Update lib re 2014-07-01 11:54:09 +04:00
John Wiegley
878edcefb4 Merge pull request #3124 from linquize/nodejs-0.10.29
nodejs: Update to 0.10.29
2014-06-30 14:16:27 -05:00
Eelco Dolstra
55e8e0ef9b gcc: Slight builder cleanup 2014-06-30 17:31:02 +02:00
Peter Simons
ee0226e5c8 haskell-pipes-binary: re-generate with latest version of cabal2nix 2014-06-30 17:00:37 +02:00
Peter Simons
fac3be7416 haskell-folds: re-generate with latest version of cabal2nix 2014-06-30 17:00:18 +02:00
Peter Simons
255b68e634 haskell-snap-server: re-generate with latest version of cabal2nix 2014-06-30 17:00:01 +02:00
Michael Raskin
89a8ae6627 Fix download URL for mdds 2014-06-30 18:50:55 +04:00
Eelco Dolstra
7fe89be146 gcc: Fix purity
Somewhere the no-sys-dirs.patch got disabled, so gcc was looking in
/usr/local/include and /usr/lib. Since I can't fix the patch easily,
I've borrowed the --sysroot trick from clang-wrapper. This causes
builtin paths to be prefixed with /var/empty
(e.g. /var/empty/usr/lib), which don't exist.
2014-06-30 16:43:02 +02:00
Peter Simons
2af20dbacf Merge pull request #3088 from aycanirican/master
jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which i...
2014-06-30 15:55:33 +02:00
Michael Raskin
7caec74142 Merge pull request #3118 from NixOS/libreoffice-update-4.2.5
Libreoffice update 4.2.5
2014-06-30 17:39:12 +04:00
Peter Simons
0b1b4e5870 Merge pull request #3133 from deepfire/haskell-yampa
haskellPackages.Yampa:  new expression
2014-06-30 15:35:35 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Cillian de Róiste
336f1f9d88 chromedriver 2.9 -> 2.10 2014-06-30 12:48:38 +02:00
Michael Raskin
d61129a117 Downgrade gnu-efi back: this fixes build of gummiboot without breaking syslinux build 2014-06-30 11:17:19 +04:00
Michael Raskin
89a7cc92a2 Merge pull request #3020 from ambrop72/0ad
Add 0 A.D.
2014-06-30 10:30:41 +04:00
Michael Raskin
5a8a92c01a Merge pull request #3007 from wkennington/master.syslinux
syslinux: Update 4.07 -> 6.02
2014-06-30 10:29:28 +04:00
Michael Raskin
a2dacf72d3 Scala: update to 2.9.3 and fix URL
Fixes #2613

It is a pull request by taku0 with a long story…
2014-06-30 09:37:19 +04:00
Michael Raskin
12e0c22e80 Merge pull request #2610 from taku0/oraclejdk8
add oraclejdk8
2014-06-30 09:26:58 +04:00
Markus Kohlhase
7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
Kosyrev Serge
3ee00efbab haskellPackages.Yampa: new expression 2014-06-29 23:38:54 +04:00
Linquize
446d3253d5 nodejs: Update to 0.10.29 2014-06-29 11:47:07 +08:00
Austin Seipp
2245580812 Merge pull request #3077 from vbgl/cppo
Adds cppo
2014-06-28 20:37:46 -05:00
Austin Seipp
4931b261f9 Merge pull request #3117 from bennofs/haskell-deepseq-generics
haskell-deepseq-generics: new expression
2014-06-28 20:34:55 -05:00
Austin Seipp
7dfb3b17c6 Merge pull request #3121 from deepfire/haskell-sha2
SHA2:  new expression
2014-06-28 20:34:31 -05:00
Austin Seipp
64bb2cf003 Merge pull request #3123 from jagajaga/add_haskell_pkgs
haskell-command-qq: add pkg
2014-06-28 20:34:19 -05:00
Arseniy Seroka
9802165f7a haskel-command-qq: add pkg 2014-06-29 04:25:23 +04:00
Kosyrev Serge
962011de36 SHA2: new expression 2014-06-29 04:13:20 +04:00
Benno Fünfstück
cd48bbfaec haskell-deepseq-generics: new expression 2014-06-28 21:30:14 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Aycan iRiCAN
83e224cacb Merge remote-tracking branch 'upstream/master' 2014-06-28 17:32:15 +03:00
Shea Levy
ff97c5a8ed Add nix-plugins package 2014-06-27 18:25:34 -04:00
Eelco Dolstra
63aff93c9b gperftools: Support Darwin 2014-06-27 20:00:13 +02:00
Aycan iRiCAN
3377abee50 Merge remote-tracking branch 'upstream/master' 2014-06-27 20:55:22 +03:00
Michael Raskin
a25938e85e Update mdds 2014-06-27 16:37:34 +04:00
Michael Raskin
8d514df1ef Adding libodfgen: a library for writing ODF 2014-06-27 16:33:45 +04:00
Michael Raskin
9444cfcab0 Adding libmwaw: a library to import some old Macintosh text document formats 2014-06-27 16:33:45 +04:00
Michael Raskin
077aa91822 Adding libe-book: a library for importing reflowable e-book formats 2014-06-27 16:33:45 +04:00
Michael Raskin
07e4d6dc83 Adding librevenge: a library for creating file importers 2014-06-27 16:33:45 +04:00
Michael Raskin
5e64a8360f Adding libatomic_ops 2014-06-27 16:33:45 +04:00
Austin Seipp
48f2ca07f4 arcanist: 20140617 -> 20140627
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 01:12:49 -05:00
John Wiegley
f9ebbc80a1 haskell-ghc-mod: patch ghc-process.el to avoid hanging
@peti I've determined that the hang which this fixes does not happen all
of the time (in fact, I've been using ghc-mod for weeks without seeing
it once).  But today it happened again, and it made me realize I had
undone this patch locally.  I'm committing it now because it fixes the
problem completely for me, and certainly cannot hurt.
2014-06-26 22:55:25 -07:00
Austin Seipp
593e938341 php: 5.4.29 -> 5.4.30
CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 00:24:45 -05:00
Austin Seipp
658792ab9a Merge pull request #3086 from tomberek/haskell_addmonadlocpp
Haskell: add monadloc-pp
2014-06-26 19:01:12 -05:00
John Wiegley
e36e853817 smljnBootstrap: new expression for running smlnj on darwin 2014-06-26 15:54:45 -07:00
Aycan iRiCAN
0acf2f98b7 Merge remote-tracking branch 'upstream/master' 2014-06-26 23:50:18 +03:00