Commit Graph

2699 Commits

Author SHA1 Message Date
Shea Levy
e729dfbd3f gcc-4.9: Set isGNU
Fixes #6787
2015-03-13 12:47:17 -04:00
Robin Gloster
282530454a add myself as php and rustc maintainer 2015-03-11 11:24:55 +01:00
Peter Simons
6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Peter Simons
8196130a1d Merge pull request #6711 from phile314/dev
haskell: Add uhc compiler
2015-03-10 11:22:15 +01:00
Philipp Hausmann
2eacaa856b
haskell-uhc: Remove explicit dependency on binary 2015-03-10 00:19:10 +01:00
Arseniy Seroka
b172b9fb37 Merge pull request #6731 from globin/update-rust
Update rust to new nightly (2015-03-09)
2015-03-09 21:59:03 +03:00
Robin Gloster
3a32dae799 update rust to new nightly (2015-03-09) 2015-03-09 18:37:30 +01:00
Peter Simons
e2b033cad9 ghc: re-instate code that configures statically linked builds by default
The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.

Fixes https://github.com/NixOS/nixpkgs/issues/6399.
2015-03-09 15:55:24 +01:00
Eduard Bachmakov
4731485ca2 llvm-3.5: enable RTTI to support mesa
Extracted from #6367.
2015-03-09 15:55:23 +01:00
Philipp Hausmann
1ce75368f1
Add uhc haskell compiler 2015-03-09 13:38:28 +01:00
William A. Kennington III
c9ec23d55c Merge pull request #6673 from taku0/oraclejdk-8u40
oraclejdk: bump to 8u40
2015-03-08 19:16:44 -07:00
William A. Kennington III
2e6e6f9178 Merge pull request #6684 from j-keck/update-scala
update scala to 2.10.5 and 2.11.6
2015-03-08 16:08:40 -07:00
Michael Raskin
a36c914020 update sbcl 2015-03-09 01:03:01 +03:00
Michael Raskin
3d4f7be9a3 Update ECL 2015-03-09 01:03:01 +03:00
Shea Levy
e57e44f867 llvm-3.6 packages: Build everything (except clang and llvm) with clang 2015-03-07 13:08:34 +00:00
Shea Levy
b37fd11351 llvm-3.6 packages: Rearrange directory structure 2015-03-07 12:51:06 +00:00
Shea Levy
3ed077a69b lldb-3.5 is broken, bug in the cmake
lldb-3.6 is working (just waiting on a staging fix to merge), so let's just
mark this broken until we decide to nuke 3.5 all together.

Fixes #6636 refs #6668
2015-03-06 16:16:20 -05:00
Shea Levy
c62b5456f5 Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
Shea Levy
6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Shea Levy
55cf015142 clang-3.6: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Refs #6449
2015-03-06 13:49:49 +00:00
Shea Levy
494ae5fbeb clang: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Fixes #6449 refs #6668
2015-03-06 08:36:42 -05:00
Shea Levy
c08a0d240c ats2: bump 2015-03-05 18:21:56 -05:00
j-keck
7da51f9eb7 scala: update to 2.11.6 2015-03-05 20:49:28 +01:00
j-keck
a1a585078a scala_2_10: update to 2.10.5 2015-03-05 20:49:28 +01:00
Moritz Kiefer
4f3f301807 openjdk8: update to jdk8u40-b25 2015-03-05 18:04:21 +01:00
taku0
137f281849 oraclejdk: bump to 8u40 2015-03-05 23:01:21 +09:00
Peter Simons
1d953779b0 Merge remote-tracking branch 'origin/master' into staging. 2015-03-05 12:24:57 +01:00
Benjamin Saunders
f1b7e4d127 LLVM, clang, and lldb 3.6 2015-03-05 06:44:09 +01:00
Eelco Dolstra
6f33aa8465 orig-gcc -> orig-cc 2015-03-04 22:15:46 +01:00
Eelco Dolstra
97fcb33ac2 cudatoolkit: Fix gcc -> cc
Urgh, we shouldn't have renamed gcc to cc...
2015-03-04 22:15:46 +01:00
William Roe
7dcde14809 go: Update to version 1.4.2 2015-03-04 11:55:47 +00:00
Peter Simons
38c67a358e yap: mark 32 bit Linux build broken 2015-03-04 11:14:58 +01:00
Dan Peebles
57250fc2cc Enable cgo on darwin 2015-03-03 20:03:48 -05:00
William A. Kennington III
adbba6eded Merge pull request #6528 from codyopel/stdenv-fixes
remove stdenv.isBSD
2015-03-02 20:10:07 -08:00
Bjørn Forsman
c47a3b0663 microscheme: update to latest release (0.9.2)
* Don't "externalize url/rev/sha256 to permit easier override".
  Just override 'src' itself. Then you can get the source from anywhere,
  not just git. I needed to touch this anyway, because I want to use
  fetchzip instead of fetchgit for releases (no need to clone repo).
* Latest release has "make install" improvements, simplifying our
  install.
2015-03-02 21:55:55 +01:00
Georges Dubus
9e59c9ad84 Merge pull request #6623 from woehr/master
Upgrade Rust compiler
2015-03-02 21:38:29 +01:00
Peter Simons
5341196f01 Merge branch 'master' into staging. 2015-03-02 21:10:36 +01:00
Jordan Woehr
5821e91bd1 Restructure rustc derivations for ease of updating.
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
2015-03-02 12:40:55 -07:00
Eelco Dolstra
ea0d6a7fc0 Add CUDA toolkit 6.5 2015-03-02 00:24:00 +01:00
Pascal Wittmann
92664a84ad nasm: update from from 2.11.05 to 2.11.08
2.11.06 had a bug that broke syslinux [1], this bug was
fixed in 2.11.07, but there was never a tar-ball release
of that version.

[1] http://sourceforge.net/p/nasm/mailman/message/33074214/
2015-02-26 14:43:44 +01:00
Peter Simons
d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
codyopel
e29b0da9c7 remove stdenv.isBSD 2015-02-24 22:15:51 -05:00
Aistis Raulinaitis
9adb387327 Ur/Web version bump 2015-02-23 02:40:27 -08:00
vbgl
6668a05abc Merge pull request #6521 from lostdj/ltp/upstream-master/emscripten1.29.10
emscripten: update from 1.29.3 to 1.29.10.
2015-02-23 11:03:54 +01:00
Vladimír Čunát
bc51573f8a dragonegg-3.5: fix by dropping included patch
It seems to compile a hello-world fine.
2015-02-23 09:37:07 +01:00
Peter Simons
b8bf8e502c ghc: re-instate code that configures statically linked builds by default
The compiler should not expect to have dynamic versions of all libraries
available, because that configuration doesn't play along nicely with statically
linked libraries.

Fixes https://github.com/NixOS/nixpkgs/issues/6399.
2015-02-22 21:55:27 +01:00
Eduard Bachmakov
c0def4a169 llvm-3.5: enable RTTI to support mesa
Extracted from #6367.
2015-02-22 20:03:14 +01:00
lostdj
bca50ddb7d emscripten: update from 1.29.3 to 1.29.10. 2015-02-22 21:35:38 +03:00
Ben Darwin
63d61cee7f teyjus: 2.0-b2 2015-02-21 19:55:24 -05:00
Luca Bruno
3391728c63 dragonegg: fix sha256 2015-02-20 14:51:24 +01:00
Jim Garrison
66097d8f4f julia: 0.3.5 -> 0.3.6 2015-02-19 00:07:20 -08:00
Dan Peebles
c6ce6460c4 Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin) 2015-02-18 02:05:56 -05:00
Dan Peebles
3a423e4405 It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools 2015-02-17 22:39:31 -05:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Joel Taylor
4b6d83199a Fix temp directory paths for GHC 7.0.4 on Darwin
This is a remnant of https://github.com/NixOS/nixpkgs/pull/6268
2015-02-16 23:42:59 -08:00
Antoine R. Dumont
172d78923b Add microscheme derivation
(A Scheme subset for Atmel microcontrollers.)

Use of the actual git HEAD because the actual tarball compiles but
segfault at runtime.

Upload the BLINK.ms sample on arduino board (/dev/ttyACM0):

```sh
$ sudo ./result/bin/microscheme -m UNO -d /dev/ttyACM0 -auc ~/repo/perso/microscheme/examples/BLINK.ms
Microscheme 0.8, (C) Ryan Suchocki
>> Treeshaker: After 4 rounds: 84 globals purged! 22 bytes will be
reserved.
>> 18 lines compiled OK
>> Assembling...
>> Uploading...

avrdude: AVR device initialized and ready to accept instructions

Reading | ################################################## | 100%
0.00s

avrdude: Device signature = 0x1e950f
avrdude: reading input file
"/home/tony/repo/perso/microscheme/examples/BLINK.hex"
avrdude: writing flash (2080 bytes):

Writing | ################################################## | 100%
0.35s

avrdude: 2080 bytes of flash written

avrdude: safemode: Fuses OK (E:00, H:00, L:00)

avrdude done.  Thank you.

>> Cleaning Up...
>> Finished.
```
2015-02-16 23:09:48 +01:00
Eelco Dolstra
2ba9ae0129 Fix bad licenses on CUDA packages
They were marked as "nonfree" rather than "unfree", causing them to be
allowed with allowUnfree = false.
2015-02-15 22:29:47 +01:00
Peter Simons
155e926274 ghc: disable parallel building for older versions again
This change accidentally crept in with the recent Darwin changes.
2015-02-14 19:41:49 +01:00
Joel Taylor
fd18936a32 Add purity to GHC builds on Darwin 2015-02-14 19:41:49 +01:00
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
Ricardo M. Correia
9526284cfe rustc: Update from 0.12 -> 1.0.0-alpha 2015-01-20 22:19:16 +01:00
Ricardo M. Correia
550124c126 rustc: Rename 0.12.nix -> 1.0.0-alpha.nix 2015-01-20 22:19:16 +01:00
Moritz Kiefer
1af7967007 Add cocreature as maintainer of openjdk8 2015-01-20 19:07:54 +01:00
Vincent Laporte
038c7b3fbb fsharp: update from 3.1.1.26 to 3.1.1.31 2015-01-20 09:30:09 +01:00
Vincent Laporte
46e3a701a5 mono: update from 3.2.8 to 3.8.0 2015-01-20 09:30:09 +01:00
Moritz Kiefer
9b7e398a3c Patch sh paths 2015-01-20 09:02:08 +01:00
Moritz Kiefer
46d59c3251 Add meta attribute to openjdk8 2015-01-20 09:02:07 +01:00
Moritz Kiefer
9d9f33863b Add openjdk8 2015-01-20 09:02:07 +01:00
Eelco Dolstra
365ce3ddba openjdk-bootstrap: Don't depend on the length of the Glibc version
Building the bootstrap OpenJDK failed if the Glibc version string is
not 4 characters, e.g. "2.12.1" would cause a corrupt tarball.
2015-01-19 23:24:47 +01:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Jim Garrison
90181a4a3d Don't overspecify the julia version
This is to bring the julia version information into accordance with
section 7.3.2 of the nixpkgs manual:

    The version in the filename should leave out unnecessary detail.
    For instance, if we keep the latest Firefox 2.0.x and 3.5.x
    versions in Nixpkgs, they should be named firefox/2.0.nix and
    firefox/3.5.nix, respectively (which, at a given point, might
    contain versions 2.0.0.20 and 3.5.4).

Julia uses semantic versioning (http://semver.org), so the third
digit (the patch level) represents backwards-compatible bug fixes
only.
2015-01-19 09:35:18 -08:00
Jim Garrison
9dba81cd29 Enable tests for Julia 0.3.X
It was mentioned in PR #5842 that Julia's testsuite fails under nixpkgs.

This PR enables the testsuite for Julia 0.3.X to demonstrate that it
works.

Since Julia is numerical software, I think it is a great idea to
merge this current PR so that Julia will always be tested in the
future.

I was unable to get the tests to pass on the 0.2.X branch.  However,
this branch is dead (its latest commit was Aug 8) and will receive
no more releases.
2015-01-19 08:57:06 -08:00
Wout Mertens
7c3fa29e30 Fix LOCALE_ARCHIVE handling 2015-01-19 14:50:52 +01:00
lethalman
19a105ac9e Merge pull request #5823 from vandenoever/emscripten
Update emscripten to 1.29.3.
2015-01-19 14:41:31 +01:00
Peter Simons
134d1a80c6 Add a package set for GHC 7.10.1-rc1 and bump GHC HEAD to 7.11.x.
Fixes https://github.com/NixOS/nixpkgs/issues/5836.
2015-01-19 13:55:31 +01:00
Kris Jenkins
fb4a6119b6 Updating Elm packages.
This includes updates to elm -compiler, -make, -package and -reactor.
-repl's test suite currently breaks.

The build for elm-reactor could be more concise, but it's clean. The
final build step for elm-reactor ultimately relies on elm-package
downloading some libraries, so anything radically better would probably
need nix to step in and somehow emulate elm-package. That would take
more knowledge about elm & nix than I have...
2015-01-19 09:31:35 +00:00
Jos van den Oever
35cce01afa Update to 1.29.3. 2015-01-18 11:17:49 +01:00
Peter Simons
20560e667a Remove obsolete, broken, and unnecessary versions of GHC.
These versions have been removed:

 - 6.4.2-binary.nix
 - 6.4.2.nix
 - 6.6.1.nix
 - 6.8.2.nix
 - 6.8.3.nix
 - 6.10.1-binary.nix
 - 6.10.1.nix
 - 6.10.2.nix
 - 6.10.3.nix
 - 6.11.nix
 - 6.12.1-binary.nix
 - 6.12.1.nix
 - 6.12.2.nix
 - 7.0.1.nix
 - 7.0.2.nix
 - 7.0.3.nix
 - 7.2.1.nix
 - 7.4.1.nix
 - 7.6.1.nix
 - 7.6.2.nix
 - 7.8.3-binary.nix

As a rule of thumb, we keep the latest version in every major release. If
someone feels up to the task of fixing versions 6.4.x, 6.6.x, and 6.8.x, then
please don't hesitate to revive those builds.

Fixes https://github.com/NixOS/nixpkgs/issues/5630.
2015-01-17 20:29:00 +01:00
Peter Simons
d1fc5370e9 ghc: pass explicit 'ncurses' path to ./configure instead of finding through the environment
Fixes https://github.com/NixOS/nixpkgs/issues/5616. For real this time!
2015-01-17 20:29:00 +01:00
Vladimír Čunát
a0bf07827b mpc: also rename the attribute to libmpc
Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
2015-01-17 09:55:32 +01:00
Eric Seidel
88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Shea Levy
16fe4be790 Add isGNU attribute to gccs 2015-01-14 20:26:57 -08:00
Pascal Wittmann
e38c351f2b Merge pull request #5774 from j-keck/scala_2.11.5
scala: update to 2.11.5
2015-01-15 01:10:59 +01:00
j-keck
67fc5b509a scala: update to 2.11.5 2015-01-15 00:11:14 +01:00
Peter Simons
1912736a86 ghc-7.8.4: re-implement "fix build on Darwin" to avoid re-builds on Linux
Originally, I thought that I can commit a "clean" patch -- even if it
triggers re-builds -- because those re-builds were triggered by the
ncurses patch to GHC anyway . That patch had to be reverted, though, so
now I'm rewriting this patch to avoid re-builds on Linux.

What a mess. :-(
2015-01-15 00:06:06 +01:00
Peter Simons
df76eb1268 ghc: revert "propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc."
I thought that [1] could be fixed by ensuring that ncurses is available in the
environment (because ghc exports it as a propagateBuildInput), and indeed that
change fixed *some* build failures we've had before. However, the same error
still occurs with other packages, like hledger [2] and Agda [3]. Frankly, I
have no idea why those packages fail and others don't. But clearly the fix was
inadequate, so I'm reverting commit a8076c76.

[1] https://github.com/NixOS/nixpkgs/issues/5616
[2] http://hydra.cryp.to/build/372451/nixlog/1/raw
[2] http://hydra.cryp.to/build/373161/nixlog/1/raw
2015-01-14 22:24:33 +01:00
Peter Simons
a8076c7654 ghc: propagate 'gmp' and 'ncurses' to ensure users can link the 'haskeline' library, etc.
Fixes https://github.com/NixOS/nixpkgs/issues/5616.
2015-01-14 11:24:59 +01:00
Eric Seidel
a92afcd34a ghc-7.8.4: fix build on Darwin
https://github.com/NixOS/nixpkgs/pull/5746
2015-01-14 11:24:59 +01:00
Peter Simons
c11f898e7e Merge pull request #4548 from echo-oddly/clash
new package: clash
2015-01-13 22:45:02 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Peter Simons
ddf0804a87 ghc-7.8.3-binary: remove broken platforms
The source tarballs URLs and hashes for everything but x86_64-darwin
were just copied from the 7.0.4 binaries. That's not going to work. :-(
2015-01-13 21:25:14 +01:00
Vladimír Čunát
995c9db5e6 openjdk: add platforms on darwin to fix #5634 2015-01-13 16:42:32 +01:00
Peter Simons
e6bd78e8e5 Merge pull request #5718 from ryantrinkle/master
Pull submodules of the ghcjs-boot repository recursively
2015-01-12 10:20:10 +01:00
Michael Raskin
9a6afa95c1 Re-add SBCL 1.2.5 --- for StumpWM compatibility 2015-01-12 02:11:13 +03:00
Ryan Trinkle
363259acec Pull submodules of the ghcjs-boot repository recursively
Without this, the result will not match the sha256 provided
2015-01-11 18:03:45 -05:00
Michael Raskin
ff800b4270 Julia: update OpenBLAS dependency version 2015-01-12 01:46:57 +03:00
Michael Raskin
3452bc132f SBCL: 1.2.5 -> 1.2.7 2015-01-11 16:43:29 +03:00
Domen Kožar
44912c2ac1 Merge pull request #5598 from brendanlong/go-1.4
go: Update to 1.4
2015-01-11 07:46:58 +01:00
Jim Garrison
04729dd26a julia: 0.3.3 -> 0.3.5 2015-01-09 22:50:27 -08:00
Georges Dubus
74f15178b1 racer: updated to last git master 2015-01-09 14:16:04 +01:00
Peter Simons
c023a2778c Merge pull request #5641 from teh/master
Fix elm-reactor.
2015-01-08 15:18:54 +01:00
Tom Hunger
b32df8f6a7 Fix elm-reactor.
The elm-reactor setup.hs file tries to build an elm file that's not
distributed in the cabal archive. The archive contains the
already-compiled js file so the step is unnecessary and I'm patching
it out.
2015-01-08 14:12:20 +00:00
John Ericson
d47f443866 rustc: Cleanup HEAD and 0.12 derivations
Hopefully they are now easier to maintain.
2015-01-08 08:37:43 +00:00
John Ericson
f7092bb9d8 rustcMaster: Missing paren in error message 2015-01-08 08:22:56 +00:00
William A. Kennington III
3e931d40d7 openjdk-darwin: Add missing home passthru 2015-01-07 15:02:14 -08:00
Peter Simons
c1c0b4bbfd ghc: bump HEAD compiler to 7.10.1-rc1 2015-01-07 23:58:23 +01:00
William A. Kennington III
406fefdf83 icedtea_web: Cleanup java home 2015-01-07 14:55:41 -08:00
William A. Kennington III
238f4d1652 jdkPath: Remove in favor of jdk.home 2015-01-07 14:55:41 -08:00
William A. Kennington III
c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
William A. Kennington III
bbc4262514 java: Add home passthru 2015-01-07 14:55:41 -08:00
Ricardo M. Correia
e78763da0d rustcMaster: Rust's install script now installs the docs 2015-01-07 17:32:42 +01:00
Karn Kallio
691b047cfb mercury: Update to 14.01.1 2015-01-07 12:56:59 +01:00
Ricardo M. Correia
e43cde6a6c rustcMaster: Update from 0.13.0-pre-2763-g6366631 -> 0.13.0-pre-3497-g6539cb4 2015-01-07 05:50:40 +01:00
Brendan Long
8c3399f4d8 go: Update to 1.4 2015-01-06 13:31:02 -06:00
Karn Kallio
19cd862a6d pakcs: advance version 1.11.3 to 1.11.4, also fixing the build. 2015-01-06 11:15:48 +01:00
Domen Kožar
f2b01a662d fix tarball job, fixes #5559 2015-01-04 13:58:46 +01:00
aszlig
c08a49bffc
go: Remove explicitly adding libgcc_s.so.
As of 65221567c1, it's no longer needed.

This is part of an attempt to fix nixpkgs tarball evaluation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-03 18:39:31 +01:00
John Wiegley
79b214ef95 ats, ats2: refine supported platforms to linux 2015-01-03 07:53:06 -05:00
Vincent Laporte
0ed2a253f1 Adds hop 2.5.1
HOP is a multi-tier programming language for the Web 2.0 and the
so-called diffuse Web.

Homepage: http://hop.inria.fr/
2015-01-02 00:01:40 +01:00
Vincent Laporte
5d36f5831c bigloo: propagate gmp build input 2015-01-01 23:55:30 +01:00
Peter Simons
735436c0c1 elm-make: re-generate with cabal2nix 2015-01-01 23:07:41 +01:00
Peter Simons
0a0965f2ac elm-reactor: mark broken
http://hydra.cryp.to/build/297517/nixlog/2/raw
2015-01-01 18:15:50 +01:00
Michael Raskin
3ee63790df Using the OpenJDK currency date patch for icedtea 2015-01-01 15:45:35 +01:00
Karn Kallio
330a4a28dd openjdk : Patch to extend valid currency change dates to 20 years. 2015-01-01 15:45:33 +01:00
William A. Kennington III
5fe743930a kerberos: Use default kerberos instead of krb5 2015-01-01 15:45:32 +01:00
Tobias Geerinckx-Rice
56692eec7c Fix user-facing typos (mainly in descriptions) 2015-01-01 15:45:32 +01:00
Ricardo M. Correia
24bb7dc46f rustcMaster: Update from 0.13.0-pre-2604-g2f3cff6 -> 0.13.0-pre-2763-g6366631 2015-01-01 15:45:31 +01:00
Tom Hunger
c53b959c0e Update elm to 0.14.
Note that elm has a different package split: The old Elm 0.13 package
is now elm-compiler, elm-make and elm-package.

Instead of invoking "elm" one now has to use "elm-make".

I kept the 0.13 version of elm around in case someone depends
on it.
2015-01-01 15:45:30 +01:00
Alexander Kjeldaas
f98df44ada Eradicate gzip -9 without -n 2015-01-01 15:45:30 +01:00
Charles Strahan
a0d62bf978 ghcjs: update to latest 2014-12-31 01:15:13 -05:00
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
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
David Virgilio
73b7bf6773 new package: clash-ghc 2014-11-20 08:38:09 -06: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
Chris Double
eaf74a6b77 Update aliceml to use git version of Alice ML
This allows 64 bit builds of Alice ML and removes the need for old
versions of gcc to build.

The license is changed to 'mit' from the 'bsd' that it was previously
as the COPYING files in the alice and seam repositories appear to be
the modern style MIT variant (also known as the ICU variant).

Added myself as the maintainer.
2014-11-18 01:05:42 +13:00
Ryan Trinkle
ed6bfa2318 Update ghcjs 2014-11-17 01:08:11 -05: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
Vladimír Čunát
961ed7c8b4 dmd: fix 32-bit build and some nitpicks
CC #4976.
2014-11-14 14:12:32 +01:00
Vladimír Čunát
b4214da14e gcc_multi: sync the change to 4.6 and 4.9 as well 2014-11-13 22:38:57 +01:00
Vladimír Čunát
457850397a gcc_multi: prevent overwritten libs after 51f1b4ec48 2014-11-13 22:30:32 +01:00
BlackEdder
959f706ace rdmd: update to new version
Source of old version was not available anymore. Update also depends on
newer version of dmd.
2014-11-13 20:51:32 +00:00
BlackEdder
fbd2330aff dmd: update to 2.066.1 2014-11-13 14:57:58 +00:00
Mateusz Kowalczyk
12379b27c8 mozart: use longDescription field 2014-11-13 13:50:49 +00:00
Michael Raskin
1fd3e9116b Fix software-version function in SBCL by changing uname location from /bin/ 2014-11-13 13:11:24 +03:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Michael Raskin
6c39bbde6d Set correct current platform support for Mozart binary 2014-11-11 13:57:00 +03:00
Domen Kožar
eba10b008f fix tarball eval 2014-11-11 07:21:43 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Michael Raskin
b6203b804b Mark binary distribution of Mozart/Oz 2.0 as such 2014-11-09 19:26:55 +03:00
stewart
076677d0bf removed shebang in builder.sh 2014-11-09 19:26:55 +03:00
stewart
a5756e79f2 depricate mozart-1.4 for mozart-2 2014-11-09 19:26:55 +03:00
Ricardo M. Correia
12a19684c7 rustcMaster: Fix test failure under grsec kernels 2014-11-09 04:59:31 +01:00
Ricardo M. Correia
4fc73a7873 rustcMaster: Update to newer rev 2014-11-09 04:59:31 +01:00
Maciek Starzyk
f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Peter Simons
484b26569a ghc-head: update to version 7.9.20141106 2014-11-07 23:22:27 +01:00
Michael Raskin
689f1af563 Refactor Lazarus build a bit and build it with all the components by default 2014-11-07 11:41:12 +03:00
Vincent Laporte
3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
karsten gebbert
9cbbd93c74 add elm-reactor to the package list 2014-11-04 11:47:32 +01:00
Peter Simons
b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Peter Simons
030a044800 Merge pull request #4812 from krgn/elm-repl
add elm-preprepl to package list
2014-11-03 23:00:50 +01:00
Michael Raskin
f1f5ac184f Update GCL 2014-11-04 00:37:42 +03:00
Michael Raskin
e4c64a6805 Update Lazarus 2014-11-04 00:37:42 +03:00
karsten gebbert
9868f13799 add elm-get to haskell packages 2014-11-03 21:46:20 +01:00
karsten gebbert
f646d1f6ec add elm-preprepl to package list 2014-11-03 21:31:32 +01:00
Peter Simons
984b0cbd8a uhc: remove broken package
https://github.com/NixOS/nixpkgs/issues/3565
2014-11-03 18:33:02 +01:00
Eelco Dolstra
73b75f6157 gcc: Fix bug causing Glibc miscompilation
http://hydra.nixos.org/build/16564205
2014-11-03 13:27:53 +01:00
Evgeny Egorochkin
9b05a425cd golang: add meta.branch 2014-11-03 13:12:47 +02:00
Peter Simons
a9560e3497 nasm: Revert "update from 2.11.05 to 2.11.06"
This reverts commit bce477f846, which
breaks syslinux.
2014-11-03 11:29:18 +01:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Michael Raskin
8b092fe505 Adding Julia 0.3.2 — will make default after a little testing 2014-11-02 23:51:59 +03:00
Michael Raskin
db7d2c753e Update SBCL to 1.2.5 2014-11-02 21:52:11 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Peter Simons
f12ef69336 idris: jailbreak to fix build with recent version of 'lens' 2014-11-01 21:08:06 +01:00
Peter Simons
aa91690dad agda: jailbreak to fix build with recent versions of 'text' 2014-11-01 21:08:03 +01:00
Peter Simons
2dac9abdde scala: fix the sha256 checksum from https://github.com/NixOS/nixpkgs/pull/4753 2014-11-01 21:07:36 +01:00
Evgeny Egorochkin
bce477f846 nasm: update from 2.11.05 to 2.11.06 2014-11-01 14:52:11 +02:00