Commit Graph

1456 Commits

Author SHA1 Message Date
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Rob Vermaas
d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Gergely Risko
51c69ea60e oracle jdk/jre: use requireFile instead of fetchurl (merge #537)
The user has to accept the EULA nowadays on the oracle website.
2013-05-16 10:58:08 +02:00
Rickard Nilsson
30b3522c14 scala: Remove scalacheck.jar from scala's classpath 2013-05-14 11:28:24 +02:00
Lluís Batlle i Rossell
d4039f99fd go: 1.1 released 2013-05-14 10:58:48 +02:00
Mathijs Kwik
6c423de052 yasm: upgrade to 1.2.0 2013-05-12 22:46:41 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Karn Kallio
5c95ebf300 pakcs: update to version 1.11.2 2013-05-10 14:41:29 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Michael Raskin
0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
Shea Levy
88864e331a Try to fix the tarball.
stdenv.gcc.gcc might be null, e.g. on ppc-linux

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 17:30:04 -04:00
Shea Levy
c4edee4d39 clang: Pass the real gcc install prefix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 15:18:37 -04:00
Lluís Batlle i Rossell
290bc17ff6 Updating go 1.1beta2 to 1.1rc1 2013-05-02 13:17:01 +04:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Lluís Batlle i Rossell
d4ac42ae11 Adding go 1.1 beta 2013-04-30 11:58:22 +04:00
Eelco Dolstra
a5606a1d9a pakcs: Disable in Hydra because the build doesn't terminate
It appears to loop saying:

ERROR: load_files/2: No permission to load source `/tmp/nix-build-pakcs-1.10.0.drv-1/pakcs/lib/.curry/pakcs/Prelude.pl' (Non-module file already loaded into module prologbasics; trying to load into user)

http://hydra.nixos.org/build/4760096
2013-04-26 11:09:13 +02:00
Peter Simons
cd470bc296 idris: drop obsolete package, it doesn't compile anywhere 2013-04-24 13:21:05 +02:00
Peter Simons
e0b57c9fb9 ghc: bump HEAD compiler to version 7.7 2013-04-24 13:21:05 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin
b98ece6bc2 Auto-update some packages; no early build failures (SBCL and Wine not yet fully built) 2013-04-23 09:15:48 +04:00
Peter Simons
fdf1d45a38 ghc: add version 7.6.3 (and a corresponding package set) 2013-04-21 20:10:27 +02:00
Peter Simons
431b774cc0 ghc: greatly simplify the GHC compiler wrapper
The wrapper script accumulated some cruft over the last couple of months
because we did changes in freaky ways to avoid triggering re-builds of all
Haskell packages. Most of these kludges have been thrown out now.

This patch doesn't change the behavior of the wrapper except for one thing: the
internal helper scripts "ghc-get-packages.sh" and "ghc-packages.sh" are no
longer installed in the bin directory of the generated derivation.
2013-04-20 23:28:53 +02:00
Peter Simons
4dd05a51ed ghc-binary: don't refer to /bin/sh 2013-04-20 23:28:11 +02:00
Peter Simons
2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Patrick John Wheeler
3bf0d2b960 ghc-wrapper: install the GHC documentation into the user's profile
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.

See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
2013-04-20 22:14:44 +02:00
Peter Simons
4914e63a89 Merge changes from branch 'master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Rob Vermaas
a24458c219 Update oracle jdk to 1.6.0_45b06 2013-04-18 20:18:09 +02:00
Vladimír Čunát
368f1a25fd swiProlog: major update to 6.2.6
However, from news this does *not* seem to be a big change.
2013-04-18 10:29:29 +02:00
Vladimír Čunát
d8a2ae8d01 some libintl and libiconv cleanups + non-linux fixes 2013-04-14 13:43:09 +02:00
Vladimír Čunát
74c4e30a9c vala: attempt to fix on FreeBSD 2013-04-13 23:30:26 +02:00
Vladimír Čunát
c6d9178d02 vala: attempt to fix build for FreeBSD 2013-04-13 23:29:56 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Vladimír Čunát
b6e3834ce0 gcc47: minor update to 4.7.3
Tested buildability on x86_64-linux + stdenv-updates.
2013-04-12 03:07:31 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Lluís Batlle i Rossell
9ce7b29393 gcc-wrapper: avoiding one glibc rebuild, for gcc.crossDrv
In fact 'glibc.crossDrv' didn't work. I'm not sure it should work; I think it
isn't required for much.
2013-04-10 18:26:42 +02:00
Vladimír Čunát
4c62d0d144 gcc42: fix build via a patch from arch 2013-04-10 14:46:50 +02:00
Lluís Batlle i Rossell
0ccd57bcd6 mono: update to 2.11.4
Just to have a newer version.
2013-04-08 11:53:08 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Peter Simons
642b07f988 gcc: add version 4.8.0 2013-04-04 14:27:44 +02:00
Peter Simons
62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Peter Simons
64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Lluís Batlle i Rossell
b10ab7a19a tinycc: updating it to 0.9.26
I simplified the expression a bit. And I renamed it to 'tcc'.
I think everyone calls it tcc.
2013-04-01 12:50:45 +02:00
Rok Garbas
38fce2879f Merge pull request #413 from ebzzry/master
Add chicken-4.8.1
2013-03-30 23:34:01 -07:00
Lluís Batlle i Rossell
c7307122bf gcc47: Making the arm patch only for arm.
I don't know how, but it seems to break mips (noticed by ludo):
http://hydra.nixos.org/build/4530024
2013-03-29 21:56:01 +01:00
Lluís Batlle i Rossell
7405ddee2f gcc47: fixing the arm eabi hf build
Picking an upstream gcc patch.
2013-03-29 18:34:40 +01:00
Peter Simons
fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
aszlig
a0716f28af
haxe: Use ignoreExternals and fix build.
Now, our builds shouldn't break anymore once there is a new change in ocamllibs.

I've used revision 256 from ocamllibs, because this was approximately the
revision we had back then when Haxe 2.10 got released.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:55 +01:00