Commit Graph

2390 Commits

Author SHA1 Message Date
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
2015-02-13 22:13:25 +01:00
Joel Taylor
2a5dacbf6b patch shebangs in boot script 2015-02-13 10:37:47 +01:00
Joel Taylor
dcafdf47ea Revert "Revert "Build GHC HEAD from git checkout"."
This reverts commit 15416dd2ec.
2015-02-13 10:37:47 +01:00
John Wiegley
68c6ca44e6 sbcl_1_2_0: port over joelteon's change to 1.2.8 2015-02-12 15:05:37 -06:00
John Wiegley
1dea4e5297 Merge pull request #6321 from joelteon/sbcl
Linker flags for sbcl on Darwin
2015-02-12 15:54:05 -05:00
Joel Taylor
b43fc565f1 linker flags for sbcl 2015-02-12 12:14:35 -08:00
Vladimír Čunát
8afa77cb07 vala-0.26: minor update to fix CVE-2014-8154
@lethalman: it seems strange to me to have the 0.23.* version as
the default, as it's even an unstable release.
2015-02-12 20:43:55 +01:00
Peter Simons
15416dd2ec Revert "Build GHC HEAD from git checkout".
This reverts commit 52c8d7c4ab. The new
expression doesn't compile: http://hydra.nixos.org/build/19594431/nixlog/1/raw.
2015-02-12 20:15:56 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Joel Taylor
52c8d7c4ab Build GHC HEAD from git checkout 2015-02-11 14:32:54 -08:00
Joel Taylor
db4cb021c0 Add purity to GHC builds on Darwin. 2015-02-10 22:08:01 +01:00
lethalman
e7762c55bb Merge pull request #6281 from ehmry/nim
nim: initial package at 0.10.2
2015-02-10 16:08:07 +01:00
Emery Hemingway
e65e8983d9 nim: initial package at 0.10.2 2015-02-10 09:48:41 -05:00
Luca Bruno
10e7572d17 Use go1.4 instead of go-1.4 in derivation names. Closes #6243
I chose meta.branch because go 1.1 and 1.2 had this already.
2015-02-09 10:16:14 +01:00
Dan Peebles
da8ab2d947 Get mlton a little closer to working on darwin+clang (thanks to gridaphobe). Still impure, and needs more work. 2015-02-08 19:24:44 -05:00
Dan Peebles
a29cc5a911 A build of libc++abi that doesn't rely on a full llvm build (more lightweight boostrap upcoming) 2015-02-08 13:38:29 -05:00
Dan Peebles
19c359ce2a substituteInPlace doesn't seem to work properly on this bash, so use sed instead 2015-02-08 03:04:41 -05:00
Dan Peebles
507d65d7d4 Get rid of default search paths in clang 3.5 2015-02-08 02:12:51 -05:00
Dan Peebles
c4253520fe These two are unused 2015-02-08 00:34:02 -05:00
Dan Peebles
0c6598beaf gccApple is dead. Leaving the top-level attribute for a little longer, but no need to keep its unused code. 2015-02-08 00:28:37 -05:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Michael Raskin
236029ef83 Fix Lazarus build (somewhat) by referring to gcc libgcc_s.so by currently-woring attribute path 2015-02-08 01:09:09 +03:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
Shea Levy
a7dad535e4 Merge branch 'openjdk8' of git://github.com/cocreature/nixpkgs
Update to openjdk8u31b13
2015-02-05 14:22:12 -05:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Shea Levy
0e225c0e37 llvm-3.5: Don't try to use libc++ on linux 2015-02-04 11:30:25 -05:00
Luca Bruno
a594f0bcd5 Port gox to buildGoPackage 2015-02-04 13:46:32 +01:00
Eric Seidel
4a467ec02b move libcxx[abi] into llvm tree 2015-02-03 14:58:10 -08:00
Eric Seidel
fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Eric Seidel
2ca30151c2 add llvm-3.5 2015-02-03 13:58:32 -08:00
Peter Simons
f637b5368b ghc-head: re-use the $version attribute in the URL to prevent mismatches 2015-02-03 17:01:09 +01:00
Peter Simons
86753ed326 ghc-7.10.1: fix misspelled version number in build expression 2015-02-03 17:01:09 +01:00
Emery Hemingway
faa5dccab8 new Go support function 'buildGoPackage'
add a setupHook to the Go compiler that builds a GOPATH
new buildGoPackage function that overides the phases of stdenv
2015-02-03 14:21:48 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Michael Raskin
9b29267511 Oops, botched SBCL update, fixing source hash 2015-02-01 23:55:31 +03:00
Michael Raskin
594f33bb17 Update SBCL 2015-02-01 18:41:33 +03:00
Moritz Kiefer
f215189d1d Make openjdk work with nonreparenting wms 2015-01-28 09:51:43 +01:00
Moritz Kiefer
7c40fe361a Update to openjdk8u31b13 2015-01-28 09:00:48 +01:00
Moritz Kiefer
ea30130943 Fix openjdk8 build for i686
see http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
2015-01-28 08:59:40 +01:00
Peter Simons
e1c72b6bd3 yap: update from 6.2.2 to 6.3.3 2015-01-27 14:04:53 +01:00
Cray Elliott
a9b774204b Update GHC 7.10.1 expression to RC2 2015-01-26 22:41:27 -08:00
Ricardo M. Correia
27eb5adac7 icedtea7: Update from 2.5.3 -> 2.5.4
Contains 17 security fixes.
2015-01-27 04:39:15 +01:00
Edward Tjörnhammar
c457bbb2bb Merge pull request #5912 from taku0/oraclejdk-8u31_7u75_7u76
oraclejdk: bump to 8u31, 7u75, and 7u76
2015-01-24 21:05:30 +01:00
Peter Simons
3b35ae7a73 cryptol: update 2.x branch to version 2.1.0 and remove broken 1.x build 2015-01-23 13:24:40 +01:00
taku0
267ea498b6 oraclejdk: bump to 8u31, 7u75, and 7u76 2015-01-23 15:44:22 +09:00
Brendan Long
51902ba32d go: Update to version 1.4.1.
Also had to fix the code that was trying to make sure the go-* folders get renamed to just "go".

Resolves #5797
2015-01-22 21:49:41 -05:00
Peter Simons
b96edd41a5 Merge pull request #5844 from krisajenkins/elm
Updating Elm packages.
2015-01-22 22:49:27 +01:00
vbgl
7edbd7ad19 Merge pull request #5041 from vbgl/mono
Updates mono, fsharp and monodevelop

Closes #4782.
2015-01-21 13:54:37 +01:00
Ricardo M. Correia
e7d72312c8 rustcMaster: Update from 0.13-dev-g6539cb4 -> 1.0.0-dev-ga833337 2015-01-20 22:19:17 +01:00