alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
49200 commits 217 branches 121 tags 4.5 GiB
Commit graph

2063 commits

Author SHA1 Message Date
Chris Double c05f252dac Definitions for Open Dylan 2013.2 (Dylan Language Implementation) 2014-05-27 20:27:47 +12:00
Vladimír Čunát ba190a71c7 Merge branch 'master' into p/stdenv 2014-05-26 19:35:47 +02:00
Domen Kožar a088c6fa36 Merge pull request #2710 from lovek323/mpd 
mpd: fix build on darwin
 2014-05-25 15:34:10 +02:00
Vladimír Čunát 610370f844 gcc: bugfix update 4.8.2 -> .3 
It's supposed to fix over 140 problems from upstream bugzilla.
https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.8.3

A previously separate patch got included in the release.

I tested that stdenv still builds.
 2014-05-23 00:25:36 +02:00
Austin Seipp 925a016113 Merge pull request #2521 from jwiegley/agda 
Build AgdaStdlib before installing it
 2014-05-22 14:22:31 -05:00
Rob Vermaas 1cb2f20511 swiProlog: update from 6.6.3 to 6.6.5 2014-05-22 12:55:03 +02:00
Peter Simons 4f5fce2710 haskell-Elm: update to version 0.12.3 2014-05-21 23:04:30 +02:00
Peter Simons 41d7d0ad31 haskell-elm-server: update to version 0.11.0.1 2014-05-21 23:04:30 +02:00
Jason "Don" O'Conal bcc36ee23e mpd: fix build on darwin 2014-05-21 15:50:15 +10:00
Lluís Batlle i Rossell b194050ee1 Fixing the cross gcc building. 
gcc 4.8 added libatomic, and it has to be disabled in case of
gccCrossStageStatic, as it requires libc.
 2014-05-19 10:26:54 +02:00
Austin Seipp c166bd3e07 jhc: Fix license 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 10:15:06 -05:00
Austin Seipp 1651871250 jhc: 0.8.0 -> 0.8.1 
Also, bootstrap the compiler with GHC 7.6.3 instead of 6.12.3.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-18 10:14:05 -05:00
Austin Seipp b3b6faa5ec Merge pull request #2398 from cstrahan/rust-update 
rust: update to 0.10 release
 2014-05-18 07:49:41 -05:00
Austin Seipp f1dc681538 cryptol: add a convenient clang/lss wrapper 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-17 14:09:09 -05:00
Vladimír Čunát 0430f59d64 llvmPackages.lld: fix build after 3.4.1 update 
Somehow I forgot this package.
 2014-05-16 18:29:12 +02:00
Vladimír Čunát cf1dbbbf72 llvm+clang: maintenance update 3.4 -> 3.4.1 
Slightly hacky for clang at some points, as directory names change strangely.
 2014-05-15 21:02:28 +02:00
Ricardo M. Correia d674594ce3 icedtea7: Add support for grsecurity 2014-05-15 13:25:50 +02:00
Ricardo M. Correia 6021ce8b83 openjdk: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Ricardo M. Correia df503a2ad4 openjdkBootstrap: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Ricardo M. Correia 2204eb9f18 ghc: Add support for grsecurity 
In this case, we also need to specify compilation flags to mark stacks as
non-executable, otherwise PaX will not allow ghc or binaries built by ghc
to run.  This is what gentoo-hardened does as well.
 2014-05-15 13:25:49 +02:00
Ricardo M. Correia 601bd3e6e5 oraclejdk7: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Ricardo M. Correia 06725e95eb gcc: Add support for grsecurity 2014-05-15 13:25:47 +02:00
Ricardo M. Correia f9cd53ba18 llvm: Add support for grsecurity 2014-05-15 13:25:47 +02:00
Karn Kallio 432998852c Add the Mercury compiler to nixpkgs. 2014-05-14 22:44:38 +02:00
Austin Seipp 3fbe6f3292 Merge pull request #2605 from ro6/master 
Ur/Web compiler: new release, 20130421 -> 20140426
 2014-05-14 14:59:09 -05:00
Peter Simons 6c61d41dc9 Drop obsolete Haskell packages WebBits, WebBitsHtml, JsContracts, and flapjax. 
None of our compilers can build these packages. I suppose that stuff has
been replaced by language-ecmascript.
 2014-05-14 15:02:33 +02:00
Moritz Ulrich 172391272d chicken(-dev): Update to 4.8.0.5 / 4.9.0rc1 2014-05-14 12:22:52 +02:00
Lluís Batlle i Rossell 418f0b0169 Revert "go: updating to 1.2.2" 
Now I've read in Release Notes that the '.2' affected only binary releases.
http://golang.org/doc/devel/release.html#go1.2.minor
 2014-05-14 10:16:35 +02:00
Lluís Batlle i Rossell 950fd7644c go: updating to 1.2.2 2014-05-14 10:14:28 +02:00
Austin Seipp 11373a9d05 Merge pull request #2520 from CodeBlock/scala 
scala: Bump to 2.11.0, bump 2.10 to 2.10.4
 2014-05-13 19:44:42 -05:00
Charles Strahan 6d5db3e93b rust: update to 0.10 release 2014-05-12 13:37:38 -04:00
Robert M. Mather 3729ead3af Ur/Web compiler: new release, 20130421 -> 20140426 2014-05-10 20:42:35 -07:00
Peter Simons 366e3bd7a1 ghc-7.0.1: fix download URL 2014-05-07 20:33:32 +02:00
John Wiegley 854b1fb9fb Build AgdaStdlib before installing it 2014-05-05 19:51:05 -05:00
Ricky Elrod d66cdd3c43 scala: Bump to 2.11.0, bump 2.10 to 2.10.4 2014-05-05 02:14:57 -04:00
Peter Simons c2fd001fd4 Remove obsolete Agda-executable package; the compiler is not part of 'Agda'. 2014-05-04 12:17:35 +02:00
Peter Simons 13b246b221 ghc-head: update snapshot to 7.9.20140430 (and download the tarball from Debian) 
https://github.com/NixOS/nixpkgs/pull/2480
 2014-05-03 20:03:30 +02:00
Rob Vermaas 837ddd22f2 Merge pull request #2388 from bennofs/update-jdk7 
jdk7: update patchversion 51 -> 55.
 2014-05-03 15:59:49 +02:00
Peter Simons 64d662e056 Agda: move compiler and standard library into a common directory 
Also renamed AgdaStdLib attribute to AgdaStdlib, since upstream doesn't
seem to capitalize that name.
 2014-05-03 12:37:17 +02:00
Peter Simons 801a4818c8 Merge pull request #2474 from jwiegley/agda-stdlib 
Add expression for the Agda standard library
 2014-05-03 12:33:26 +02:00
John Wiegley 7d788d5e4f Add expression for the Agda standard library 2014-05-02 19:15:38 -05:00
Austin Seipp 27a0d56514 compcert: Fix Hydra platforms 
Copy-pasta error, and compcert doesn't really make sense on Darwin or
64bit linux (it's callPackage_i686 anyway).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-02 14:07:36 -05:00
Austin Seipp 0c51a4ac98 nixpkgs: add CompCert 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 19:11:46 -05:00
Peter Simons 7452e8b4eb haskell-Elm: update to version 0.12.1.3 2014-05-01 21:57:03 +02:00
Austin Seipp 52514efb16 cryptol: Replace URLs with something meaningful 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-29 17:54:37 -05:00
Austin Seipp d9d76f1a3a cryptol: add 1.8.x expression 
This also includes support for the verification tools I'm using. Cryptol
2 is still the default obviously.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-29 17:50:55 -05:00
Austin Seipp e590c0a867 ats/ats2: clean-up, adopt, add Hydra packages 
This also bumps ATS2 to version 0.0.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-27 11:26:16 -05:00
Benno Fünfstück 9d15c568d8 Fix whitespace 2014-04-26 21:15:06 +02:00
Austin Seipp 5401849e3a cryptol v2.0.0 
This comes with several extra libraries, including GraphSCC, monadLib,
presburger, process and smtLib, all required as build dependencies. But
otherwise totally automated via cabal2nix.

Next up is CVC4 (a total pain in the ass to package) for proving/SAT
support.

I have another WIP branch for the unfree 1.x series which I may (or may
not) add later as it has external verification tech at the moment.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-25 05:42:00 -05:00
Benno Fünfstück a2de61e2b6 jdk7: update patchversion 51 -> 55. 2014-04-25 12:29:25 +02:00
Shea Levy a3b1f48c5d Add gcc-4.9.0 2014-04-23 10:45:00 -04:00
Karn Kallio 4587bbbca2 pakcs: update hash for latest version. 2014-04-23 10:54:58 +02:00
Ricardo M. Correia b2250ad851 icedtea7: Update from 2.4.6 -> 2.4.7 
Fixes a bunch of CVEs.

Removed 2.4.6 build patch, as it's no longer necessary.
 2014-04-23 01:39:07 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'. 
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
 2014-04-21 10:00:35 +02:00
Shea Levy 88e531d8dc Fix gcc bug 58800. 
See #2330 for details, except I needed to remove the Changelog change from the patch
 2014-04-20 09:46:21 -04:00
Shea Levy 2364bd807d Revert "Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs" 
The patch doesn't apply

This reverts commit 094eea8f6a, reversing
changes made to 552d66cd9e.
 2014-04-20 09:36:15 -04:00
Shea Levy 094eea8f6a Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs 
Description from ambrop72:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800

I have not been able to test this due to nix wanting to rebuild lots of
things before building gcc.
Patch was created with: svn diff -r 203872:203873
http://gcc.gnu.org/svn/gcc/branches

This should fix a crash in OpenSCAD: openscad/openscad#514
 2014-04-20 09:32:50 -04:00
ambrop7@gmail.com 7eeb94e8dc Add patch for GCC bug 58800. 2014-04-20 12:40:32 +02:00
Rok Garbas 805ec7e54a Merge pull request #2320 from iyzsong/unmaintain 
drop my maintainship of orc and vala
 2014-04-19 19:55:24 +01:00
宋文武 6da2470034 drop my maintainship of orc and vala 2014-04-19 23:21:51 +08:00
Marco d6aee89fd7 Fix build of MLton on Linux i686 2014-04-19 14:30:39 +01:00
Marco Maggesi 3737ec7c74 Enable compilation of MLton on darwin 2014-04-19 14:30:39 +01:00
Vladimír Čunát c8f633564e orc: bugfix update (mainly memory leaks), doCheck 2014-04-19 13:59:18 +02:00
Lluís Batlle i Rossell 44bda71b88 Adding ghdl 0.31 mcode flavour 
This allows having a recent ghdl, without building it with gcc.
The major drawback is the speed.
 2014-04-16 10:35:45 +02:00
Bjørn Forsman 99afbf9e91 sdcc: bump 3.3.0 -> 3.4.0 
This new sdcc doesn't need older boost, so switch to nixpkgs default
version (currently 1.55).
 2014-04-13 19:46:00 +02:00
Peter Simons 4604d52df4 GHC version 7.8.1 has been deprecated because of a serious bug. 
We'll have version 7.8.2 out soon.

http://www.haskell.org/pipermail/ghc-devs/2014-April/004605.html
http://www.haskell.org/pipermail/ghc-devs/2014-April/004616.html
 2014-04-11 22:33:11 +02:00
Vladimír Čunát 07dc578572 llvm(Packages) on darwin: attempts to fix 
- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
 2014-04-10 21:19:40 +02:00
Ricardo M. Correia 76551abef2 icedtea7_web: Fix configure phase not finding bash 2014-04-10 00:15:53 +02:00
Ricardo M. Correia f6799983bd icedtea7_web: Update from 1.4.2 -> 1.5 
Fixes CVE-2012-4540.
 2014-04-10 00:15:53 +02:00
Ricardo M. Correia 442e1bbaab icedtea7: Fix building v2.4.6 by backporting fix 
See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1726
 2014-04-10 00:15:47 +02:00
Ricardo M. Correia a644b7ba60 icedtea7: Update from 2.4.5 -> 2.4.6 2014-04-10 00:14:44 +02:00
Peter Simons 740c502a77 swiProlog: update from 6.6.2 to 6.6.3 2014-04-09 12:41:11 +02:00
Peter Simons 23c7a249d3 ghc: add release version 7.8.1 2014-04-08 21:35:48 +02:00
Austin Seipp f14540a619 fsharp: 3.1 -> 3.1.0 
This matches the traditional upstream versioning for FSharp in the wild

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-04-08 10:54:25 -05:00
Peter Simons d9c8db4a20 Elm: fix build by ignoring the build instructions provided by upstream 
According to <https://github.com/elm-lang/Elm/issues/384>, Elm's release
archive comes with a Setup.hs that cannot compile an Elm release. Duh!

Replacing the custom Setup.hs file with a dummy version fixes this
issue.

Close <https://github.com/NixOS/nixpkgs/issues/2089>.
 2014-04-08 13:17:51 +02:00
Mathijs Kwik 7f6a2f81b9 idris: upgrade to 0.9.12 2014-04-06 11:47:46 +02:00
Shea Levy 50a0b55a01 Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs 
Update ffmpeg dependency to 0.10 in oraclejdk7
 2014-04-05 15:23:02 -04:00
Gergely Risko 44190ff1b9 Update ffmpeg dependency in oraclejdk7 2014-04-02 23:36:47 +02:00
Vladimír Čunát 23d38a3e22 gcc44: disable parallel build 
Maybe 4.4 is no longer needed? #699
 2014-04-02 19:07:58 +02:00
Vladimír Čunát 11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Karn Kallio 5d68efd230 aldor: update to 1.2.0 version in development. 2014-03-31 21:41:20 +02:00
Karn Kallio db21a0da97 pakcs: update hash for 1.11.3 release, which was updated without a version change. 2014-03-31 21:40:50 +02:00
Austin Seipp c038133721 fsharp: fix missing --replace argument 
This should fix the Hydra build.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-29 19:55:12 -05:00
Bjørn Forsman b5bd583bb8 gcc-arm-embedded: add meta attributes 2014-03-29 18:28:41 +01:00
ambrop7@gmail.com 8b94e22f33 Add gcc-arm-embedded. 
These are packages for precompiled ARM microcontroller compilers from
https://launchpad.net/gcc-arm-embedded.

[Bjørn: modify commit message (add paragraph).]
 2014-03-29 17:57:45 +01:00
Michael Raskin 1eb42d9d79 Merge pull request #2048 from echaozh/master 
add julia 0.2.1 release
 2014-03-28 23:03:04 -07:00
Shea Levy f3e9e3dea5 Merge branch 'u/icedtea' of git://github.com/wizeman/nixpkgs 
icedtea7, icedtea7_web: New packages
 2014-03-28 23:25:25 -04:00
Shea Levy 35165063a7 Merge branch 'clang-fix-fsanitize' of git://github.com/redbaron/nixpkgs 
Fix -fsanitize=... options for clang
 2014-03-28 21:58:56 -04:00
Zhang Yichao 10511b4712 add julia 0.2.1 release 2014-03-28 18:39:26 +08:00
Peter Simons 0f86e37b6c haskell-Elm: update to version 0.12 2014-03-27 13:12:52 +01:00
Peter Simons 27ebc33d65 haskell-elm-server: update to version 0.11 2014-03-27 13:12:52 +01:00
Ricardo M. Correia 342fc9c207 go: Add myself as maintainer to receive Hydra notifications 2014-03-27 12:37:18 +01:00
Ricardo M. Correia e39b70dd79 go: Update to 1.2.1 2014-03-27 12:37:18 +01:00
Ricardo M. Correia 5fbc63be35 icedtea7_web: New package 
Java web browser plugin and an implementation of Java Web Start.
 2014-03-26 21:07:36 +01:00
Ricardo M. Correia be8667627a icedtea: Workaround javaws/web plugin start-up error 
This is a workaround to avoid the error: "java.io.IOException: RSA premaster
secret error".

In Java Web Start and the Java web plugin, there seems to be a Java policy
that prevents untrusted code from being loaded, and (probably for security
reasons) it doesn't like the files in the JDK's lib/icedtea/jre/lib/ext
directory to be symlinks.

Worked around it by copying those files instead of symlinking them.
 2014-03-26 21:07:36 +01:00
Ricardo M. Correia 6ec21a5dd1 icedtea: Add update script 2014-03-26 21:07:36 +01:00
Ricardo M. Correia 72d457de2f icedtea7: New package 
Free Java environment based on OpenJDK 7.0 and the IcedTea project.
 2014-03-26 21:07:36 +01:00
Maxim Ivanov 2780cf2838 Fix -fsanitize=... options for clang 
When using -fsanitize=... options clang implicitly
links binary to static libraries which are part of
llvm, but expects them to be found under clang prefix
 2014-03-26 13:06:22 +00:00
Artyom Shalkhakov 0242b3c6ac Adding ATS1, updating ATS2 package. 2014-03-25 04:53:13 +01:00
Peter Simons 5c3be05e90 ghc-HEAD: fix build on recent versions of Darwin 2014-03-22 17:08:47 +01:00
Peter Simons e54ae8cce1 ghc-7.8.1: fix build on recent versions of Darwin 2014-03-22 17:08:47 +01:00
Peter Simons ec8e5b99fc ghc-7.4.2: fix build on recent versions of Darwin 2014-03-22 17:08:47 +01:00
Austin Seipp 2560f2e78b fsharp: 3.0 -> 3.1, and attempt to fix build 
Hopefully this fix will appease hydra - the distributed autogen.sh
script is annoying.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-21 04:09:06 -05:00
Shea Levy 2d97dd3fb7 Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs 
fsharp: Upgrade to fsharp-3.0

[ Shea: I'm merging thoughtpolice's commits without further testing
beyond code inspection, as I believe their work has proven itself ]
 2014-03-20 20:07:44 -04:00
Shea Levy 1150fa67eb Merge branch 'mono-3.2' of git://github.com/thoughtpolice/nixpkgs 
upgrade Mono -> 3.2.8 + LLVM support

[ Shea: I'm merging thoughtpolice's commits without further testing
beyond code inspection, as I believe their work has proven itself ]
 2014-03-20 20:05:04 -04:00
Peter Simons 4d03052c9c ghc: update HEAD snapshot to 7.9.20140313 2014-03-15 09:11:47 +01:00
Shea Levy 7939ca1e99 Merge branch 'update-java7' of git://github.com/bennofs/nixpkgs 
oraclejdk7: add missing dependencies
 2014-03-14 20:04:22 -04:00
aszlig 23b43c6a9b
gcc-4.8: Use --with-as/ld for MinGW-w64 as well. 
On MinGW, we're passing these programs to the configure script, but this
obviously won't work for non-autoconf-based projects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:55:51 +01:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx. 
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
 2014-03-12 10:16:51 +01:00
aszlig a9ef42f33c
gcc-4.8: Add ObjC and ObjC++ support for Darwin. 
Cross-compiling stuff against Mac OS X's CoreFoundation won't work
without ObjC support, and we don't want to compile commandline utilities
only, right?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:45 +01:00
aszlig 9a0a85827c
gcc-4.8: Hook in cross-darwin libc and binutils. 
Let's finally hook everything into the existing cross-building
infrastructure. We're using --with-sysroot instead of --with-headers
here, because the XCode SDK contains references to /usr/lib.

I've tried to patch those references, but unfortunately (at least with
install_name_tool) it isn't possible to change those refernces in stub
dylibs.

So after bugging @tpoechtrager with annoying questions (thanks again), I
think my initial approach (patching the SDK itself and/or regenerating
the dylib stubs) was way to complicated so I ended up with this
implementation.

Also, I've added a condition to binutilsCross to use cctools if the libc
is set to libSystem. This might need some cleanups someday, mainly to
figure out how to properly bridge cctools and binutils.

So, as an example on how to cross-compile GNU Hello to Darwin, you can
use something like this:

(import <nixpkgs> {
  crossSystem = {
    config = "x86_64-apple-darwin13";
    arch = "x86_64";
    libc = "libSystem";
    platform = {};
  };
}).hello.crossDrv

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-12 10:00:44 +01:00
Andres Loeh b2b4e46198 Add GHC-7.8.1-rc2. 2014-03-11 20:14:24 +01:00
Austin Seipp f277d6f4a0 fsharp: specify exact mono path, install fsi/fsc binaries 
fsc/fsi are just symlinks for backwards compatibility.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-08 15:45:55 -06:00
Austin Seipp 6eb7a3078c mono: add LLVM support (3.4svn build) 
This adds LLVM support in Mono using their custom fork, based on LLVM
3.4svn upstream. Somehow, it's gone for a while without a patch to fix
the CMakeLists.txt in the fork...

The upstream commit is based on the mono3 branch.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-08 14:57:49 -06:00
Michael Raskin 8b83156598 Update SBCL 2014-03-08 21:13:00 +04:00
Austin Seipp 429c536ddd fsharp: update to 3.0 
Also, add myself to the maintainer list.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-08 09:01:00 -06:00
Austin Seipp 3b69f4b109 mono: add myself to maintainer list. 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-07 20:53:12 -06:00
Austin Seipp 09f0d1f661 mono: 2.11.4 -> 3.2.8 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-07 20:23:52 -06:00
Peter Simons 7b898a1d6a yap: revert update from 6.2.2 to 6.3.3 
This reverts commit 41c662dcf6. The update
doesn't compile in i686, and I don't have time to investigate at the moment.
 2014-03-07 23:16:33 +01:00
Peter Simons a1439ae0c2 swiProlog: update from 6.6.1 to 6.6.2 2014-03-05 15:32:15 +01:00
Peter Simons 41c662dcf6 yap: update from 6.2.2 to 6.3.3 2014-03-05 15:32:15 +01:00
aszlig e64b342fa8
Use mingw-w64 for 32bit Windows builds as well. 
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-03-03 22:38:48 +01:00
Vladimír Čunát a78f47917a go: don't assume sse2 on i686 (maybe fixes build) 2014-02-26 15:57:13 +01:00
Peter Simons 65aaf865a7 nasm: update from 2.10 to 2.11.01 2014-02-24 22:04:40 +01:00
Peter Simons 57e4d68025 haskell-idris: update to version 0.9.11.2 2014-02-13 10:57:43 +01:00
Domen Kožar 76a67c571a Merge pull request #1717 from linquize/vala 
vala: Update to 0.23.2
 2014-02-12 21:19:34 +01:00
Linquize 8cf797b1b5 vala: Update to 0.23.2 2014-02-11 23:35:00 +08:00
Peter Simons 96756095b7 haskell-idris: update to version 0.9.11.1 2014-02-10 20:54:53 +01:00
Artyom Shalkhakov 52e99bc723 Bumping ATS/Postiats version to 0.0.5. 2014-02-09 16:26:46 +01:00
Benno Fünfstück 303c418035 Workaround for relocation error 
This works around "java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference"
 2014-02-07 15:07:12 +01:00
Mathijs Kwik fc30e8e9b5 llvm: remove duplicate ncurses buildInput 2014-02-06 10:01:13 +01:00
Karn Kallio 19027ca0a6 pakcs: advance version to 1.11.3, which is compatible with SWI Prolog 6.6 2014-02-05 23:06:51 +01:00
Eelco Dolstra c3d84d15ce Apply makeOverridable to stdenv 
This removes the need for hacks like stdenv.regenerate.  It also
ensures that overrideGCC is now stackable (so ‘stdenv = useGoldLinker
clangStdenv’ works).
 2014-02-05 19:18:33 +01:00
Lluís Batlle i Rossell 627c82b991 gcc 4.8: no need for the arm eabi patch. 2014-02-04 10:18:27 +01:00
Shea Levy 72b5403ee8 edk2/OVMF: Update 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-03 18:32:21 -05:00
Shea Levy eb4e04c24f gcc-4.6: unmaintain 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-03 18:14:52 -05:00
Shea Levy b47609410b ats: unmaintain 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-03 18:14:27 -05:00
Shea Levy 9cf29b7039 llvm: Propagate ncurses and zlib 
Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-03 18:11:00 -05:00
Karn Kallio b572051882 mlton: fix build with latest version. 2014-02-03 23:30:18 +01:00
Shea Levy 134546bca2 clang: Fix linking with -flto 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-02 20:39:16 -05:00
Shea Levy 86c587134b llvm-3.4: Try to fix build on darwin 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-02-02 19:47:59 -05:00
Michael Raskin 177b0a0e8b Update GCL source to latest release 2014-02-02 21:36:22 +04:00
Michael Raskin 6b0769ef90 Use dynamical libbfd because static one is searched in strange places 2014-02-02 21:14:55 +04:00
Domen Kožar 7c70ef4dee Merge pull request #1638 from wkennington/cache.mumble 
Add more configurable options to mumble
 2014-01-31 00:03:20 -08:00
William A. Kennington III 4dae2621e3 mcpp: Add package 2014-01-30 21:56:17 -06:00
Benno Fünfstück 264dcdddf1 Fixes 2014-01-30 19:40:42 +01:00
Benno Fünfstück 5d6fdd8abb oraclejdk7: add missing dependencies 2014-01-30 18:24:58 +01:00
Eelco Dolstra e8a401a0c9 llvm-3.4: Only build on Linux 
It doesn't build on Darwin because it depends on Valgrind:
http://hydra.nixos.org/build/8616143/nixlog/1/raw
 2014-01-30 13:49:17 +01:00
Eelco Dolstra 8893f10d6a ghc: Fix building on Darwin 
http://hydra.nixos.org/build/8598783
 2014-01-30 13:45:48 +01:00
Petr Rockai 7c24880b4c Merge branch 'pr/cuda-sdk' of git://github.com/dguibert/nixpkgs 2014-01-29 18:36:15 +01:00
David Guibert 42911b1903 cuda: install the SDK using multiple-outputs support 2014-01-29 15:48:55 +01:00
Eelco Dolstra 5150dbfdbe openjdk-darwin: Behave the same as openjdk-linux 2014-01-28 12:10:27 +01:00
Shea Levy 1cb628c2e7 clang: the --sysroot purity trick doesn't take care of the -dynamic-linker setting 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-27 12:50:21 -05:00
Peter Simons 666cfebff1 idris: re-generate with cabal2nix 2014-01-27 11:49:20 +01:00
Shea Levy c0e93ca39d Unmaintain old llvm versions 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-26 21:01:13 -05:00
Petr Rockai 81598537a7 Merge branch 'vlstill-llvm-multivers' 2014-01-26 23:48:54 +01:00
Vladimir Still 3209170626 LLVM: Allow building gold plugins together with llvm 3.{1,2}. 2014-01-26 22:53:27 +01:00
Vladimir Still 69af3f4a78 clang_31: Allow clang to find system includes in gcc dirs. 
Backported fix.
 2014-01-26 22:51:58 +01:00
Shea Levy 3901d21c80 Idris: Build with llvm backend and libffi support 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-26 13:54:11 -05:00
Vladimir Still 11a7520928 llvm: Bring back old expressions for llvm & clang 3.[123]. 2014-01-26 19:16:50 +01:00
Peter Simons ea288d47bd haskell-Elm: update to version 0.11 2014-01-26 00:02:33 +01:00
Eelco Dolstra 981cac8e10 openjdk: Hackery to ensure that tools.jar is found 
HotSpot uses the absolute path of libjvm.so to determine the java.home
property (ignoring $JAVA_HOME), which is in turn used by
ToolProvider.getSystemJavaCompiler() to load tools.jar.  So we need to
do some trickery to ensure that if java gets invoked from the jdk
output (ratherthan the jre output), it finds libjvm.so in the jdk output.
 2014-01-25 03:04:46 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Shea Levy 3b20a10ae9 Fix tarball 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-22 15:54:40 -05:00
Michael Raskin 77fa75b1ba Merge pull request #1572 from bennofs/update-java7 
java: Update to version 7u51
 2014-01-22 12:29:23 -08:00
Benno Fünfstück 42fb68d6a9 java: Update to version 7u51 2014-01-22 21:22:18 +01:00
Georges Dubus f8afc745bf rust: fixed i686 build 2014-01-22 19:29:20 +01:00
Georges Dubus 49dd0867a7 rust: Fixed build 2014-01-22 16:36:05 +01:00
Georges Dubus 6eed023894 rust: patched the source to hardcode gcc path 
to avoid using a wrapper.
 2014-01-22 13:33:04 +01:00
Georges Dubus 35aa131371 rust: fixed build for i686 and maybe darwin 2014-01-22 13:33:04 +01:00
Shea Levy d18bc25b95 Rename linuxManualConfig to buildLinux 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-21 20:05:55 -05:00
Shea Levy 6bdafbad9b Build static libs with gcc 
This was the behavior pre stdenv-updates and is needed by some users

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-21 16:11:29 -05:00
Peter Simons cb21683794 ghc: disable parallel building 
It sucks, I know, but GHC just doesn't compile reliably when built with
some -j<n> option. :-( We have build errors because of apparent race
conditions all over the place on Hydra. This causes so much trouble for
users that it's not worth keeping this option enabled, IMHO.
 2014-01-21 20:35:49 +01:00
Peter Simons 95934138bc gprolog: patch hard-coded path to the temporary file /tmp/make.log 2014-01-21 20:07:26 +01:00
Eelco Dolstra f5773e1f02 gcc-4.8: Enable Darwin and FreeBSD 2014-01-21 14:23:27 +01:00
Shea Levy 407c60fdf9 Fix tarball 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-20 20:33:06 -05:00
Shea Levy fea2266290 llvm: Split llvmFull into separate derivations 
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-20 20:33:06 -05:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Shea Levy 55e6303d6a Add full llvm build, update libc++ and dragonegg 
Some packages in the llvm suite (e.g. compiler-rt) cannot be built
separate from the build of llvm, and while some others (e.g. clang) can
the combined build is much better tested (we've had to work around
annoying issues before). So this puts llvm, clang, clang-tools-extra,
compiler-rt, lld, lldb, and polly all into one big build (llvmFull).
This build includes a static llvm, as dynamic is similarly less tested
and has known failures.

This also updates libc++ and dragonegg. libc++ now builds against
libc++abi as a separate package rather than building it during the
libc++ build.

The clang purity patch is gone. Instead, we simply set --sysroot to
/var/empty for pure builds, as all impure paths are either looked up in
the gcc prefix (which we hard-code at compile time) or in the sysroot.
This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in
the normal Linux paths by default, which is the proper behavior IMO.

polly required an updated isl. When stdenv-updates is merged, perhaps we
can update the isl used by gcc and avoid having two versions.

Since llvm on its own is now separate from the llvm used by clang, I've
removed myself as maintainer from llvm and will leave maintenance of
that to those who are interested in llvm separate from clang.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-20 05:42:38 -05:00
Shea Levy 0e74c9f4dc Fix tarball 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 13:38:37 -05:00
Shea Levy cb24530135 Fix whitespace 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 12:40:31 -05:00
Shea Levy 4b9da6697b Merge branch 'master' of git://github.com/madjar/nixpkgs 
rust: Add

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-19 12:39:17 -05:00
Georges Dubus 2a0f1cd6f1 rust: Add 2014-01-19 17:30:36 +01:00
Mathijs Kwik 6072a289fc llvm: no-rule-aarch64.patch is only needed on 3.3 
the fix just missed 3.3 but it's in 3.4
see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625
 2014-01-18 19:13:29 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Vladimír Čunát 2848336491 ghc-7.6.3: disable parallel building (fails on Hydra) 2014-01-17 21:57:30 +01:00
Peter Simons a3f00d61f8 Merge pull request #1521 from maggesi/marginal-updates 
Update Io lang to version 2013.12.04
 2014-01-17 02:47:04 -08:00
Marco Maggesi e9e2e8ace6 PolyML expression: Factorize version number in a separate variable 2014-01-15 15:58:27 +01:00
Shea Levy c056a69fdd darwin openjdk: set jre attribute. 
Fixes tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
 2014-01-15 01:06:04 -05:00
Marco Maggesi aa8f36e238 Update PolyML to version 5.5.1 2014-01-14 15:27:10 +01:00
Peter Simons 67e3917864 gfortran-4.8: re-enable parallel building 
86802e68ff added a patch that fixes the
race condition with bconfig.h.
 2014-01-14 13:36:25 +01:00
Peter Simons 4fc64ac741 Merge pull request #1518 from wizeman/u/gcc_47_bconfig 
gcc 4.7 build fix attempt
 2014-01-14 04:30:33 -08:00
Eelco Dolstra cda63e94c3 openjdk: Fix setting $JAVA_HOME 2014-01-14 10:47:08 +01:00
Ricardo M. Correia bf3476c7d2 gcc: Fix build error on gcc 4.7 
Specifically, we are trying to fix the following error seen on Hydra:

../../gcc-4.7.3/gcc/gengtype-lex.c:1:21: fatal error: bconfig.h: No such file or directory

The patch is taken from gcc's SVN revision 193691.
 2014-01-14 01:33:34 +01:00
Vladimír Čunát ae0c9b626f llvm: add 3.4, urge for versioned usage 
The 3.4 code was tested preliminary in x-updates,
described by 2e4eab1228.

Updates to llvm break builds of dependent packages (in all cases I've seen),
and often upstream isn't too fast in porting to the newest version.
Consequently, it seems better to keep more versions (two ATM),
both in one file to share eventual changes.
Also, using versioned llvm_* attributes is proposed because of this.
 2014-01-13 21:53:50 +01:00
Eelco Dolstra 033374d601 gcc: Fix building 4.5 and 4.6 2014-01-13 20:53:06 +01:00
Peter Simons 471f0e7b36 swi-prolog: update to version 6.6.1 2014-01-13 17:10:11 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Vladimir Still 4918c1436b rdmd: Add (D language compiler helper). 2014-01-11 19:08:40 +01:00
Vladimir Still b78871efa6 dmd: Add (D language compiler). 2014-01-11 19:08:40 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Eelco Dolstra 4775dee8b9 openjdk: Set JAVA_HOME in a setup-hook 2014-01-09 12:50:38 +01:00
Domen Kožar d1c1fce801 Merge pull request #1470 from iyzsong/vala 
vala: update and cleanup
 2014-01-08 09:51:47 -08:00
Song Wenwu 7a61edec6b vala: fix typo in license 2014-01-07 18:06:36 +08:00
Eelco Dolstra c3d31749fb Remove gcc 4.7 
There is really no reason to keep it around, given that it was never
the default in Nixpkgs.
 2014-01-07 10:36:15 +01:00
Song Wenwu 4262c4bb9d vala: update to 0.23.1, remove old versions 
set license to lgpl2Plus
add myself to maintainers
and some cleanup
 2014-01-07 17:31:52 +08:00
Eelco Dolstra f1efeb4b3c Get rid of tabs 2014-01-07 10:28:07 +01:00
Eelco Dolstra bdf34e9059 gcc: Don't use attrByPath 2014-01-07 10:27:45 +01:00
Eelco Dolstra 90e533b685 openjre: Propagate setJavaClassPath 
Thus, any package that has the JRE or JDK in its build inputs will
automatically have $CLASSPATH set up properly.
 2014-01-06 14:36:14 +01:00
Peter Simons 74c4d15bf2 haskell-elm-server: update to version 0.10.1 2014-01-06 12:09:55 +01:00
Vladimír Čunát 0f3155f246 mlton: fix build by updating 2014-01-05 15:20:48 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Vladimír Čunát f78534ca0f gcc-4.7: fix the parallel-bconfig patch 
I'm sorry I forgot to test the 4.8 patch against 4.7. Now it's ported.
 2014-01-04 12:37:17 +01:00
Eelco Dolstra 79675fad6e openjdk: Use multiple outputs 
This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
 2014-01-03 11:56:40 +01:00
Eelco Dolstra 7f11ef6345 openjdk: Skip configurePhase 
The build phase also runs "make sanity", so there is no need to do it
twice.
 2014-01-03 11:56:40 +01:00
Eelco Dolstra 7edfe92f5f openjdk: Fix manpage cleanup 2014-01-03 11:56:40 +01:00
Eelco Dolstra 02f7e85d99 openjdk: Remove obsolete header file hack 2014-01-03 11:56:40 +01:00
Vladimír Čunát 86802e68ff gcc-4.{7,8}: hacky fix for parallel builds 
The hash of stdenv is unchanged, as we use profiled compiler,
which has parallel builds disabled (conditional patch).
 2014-01-03 10:42:46 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Peter Simons cc6331d0fe haskell-Elm: update to version 0.10.1 2013-12-30 20:49:29 +01:00
Rob Vermaas 96a51da082 Oraclejdk7: Fix hash and extracted path for jce_policy.zip. Add extra rpath. 2013-12-30 12:39:48 +01:00
Michael Raskin d22106ab2d Update SBCL to 1.1.14 2013-12-30 02:30:55 +04:00
Domen Kožar 5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates 
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
 2013-12-28 18:51:23 +01:00
Vladimír Čunát 2265bab69d llvm: fix heavily parallel builds 2013-12-28 17:32:01 +01:00
Eelco Dolstra 9f75797d0b Merge remote-tracking branch 'origin/glibc-2.18' 2013-12-26 14:49:19 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik 84538c25da go: removeGodocExternals no longer needed 2013-12-23 10:24:32 +01:00
Lluís Batlle i Rossell 10f250f65c Adding go 1.2. 
It doesn't include godoc anymore.

I could reproduce this, building this package:
http://code.google.com/p/go/issues/detail?id=6999
 2013-12-23 09:43:19 +01:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor 1b28fd4866 orc: update from 0.4.17 to 0.4.18 2013-12-21 02:28:25 +02:00
Eelco Dolstra e76c334756 openjdk: Remove some unnecessary stuff from the installation 2013-12-20 18:29:07 +01:00
Eelco Dolstra 778539e871 openjdk: Update to 7u40b43 2013-12-20 18:29:06 +01:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Eelco Dolstra 134ba27ea2 Merge remote-tracking branch 'origin/master' into glibc-2.18 2013-12-18 15:42:54 +01:00
Eelco Dolstra 04c364d181 gnat: Attempt to fix random build failures 
Sometimes the build failes with:

  In file included from ../../gcc-4.4.6/gcc/ada/seh_init.c:44:
  ../../gcc-4.4.6/gcc/system.h:418: error: conflicting types for 'strsignal'
  /nix/store/6h129q168ahnl2nzw6azr239cba884ng-glibc-2.18/include/string.h:560: note: previous declaration of 'strsignal' was here

and sometimes it doesn't.  Hopefully disabling parallel builds fixes
this.

http://hydra.nixos.org/build/7179481
 2013-12-18 15:41:24 +01:00
Peter Simons 3e052e242f gfortran48: disable parallel make to avoid apparent race condition 
See <http://hydra.nixos.org/build/7125754> as an example of a failed build.
 2013-12-17 12:18:07 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Vladimír Čunát 4855b0a22e dragonegg: fix build via update to 3.3 2013-12-11 12:14:01 +01:00
Vladimír Čunát 089da3ee5c Merge master into x-updates 
Conflicts (simple):
	pkgs/top-level/all-packages.nix
 2013-12-10 13:00:02 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Shea Levy ac21aa9a82 Unpacking jce requires zip 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-12-09 13:25:07 -05:00
Shea Levy 088f472fe5 Add oracle jdk 7 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-12-09 11:37:40 -05:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
 2013-12-07 14:17:16 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Peter Simons a7bd862f0b haskell-idris: update to version 0.9.10.1 2013-12-03 22:23:21 +01:00
Peter Simons dc662dcaa2 ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202 2013-12-03 22:23:20 +01:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00