Commit graph

1592 commits

Author SHA1 Message Date
Song Wenwu
5f4fc730b1 add myself to maintainers list, keep it sorted
orc: add myself as a maintainer
2013-08-11 15:14:12 +08:00
Song Wenwu
8e023d078c orc: add missing license (bsd3) 2013-08-11 12:07:57 +08:00
Song Wenwu
094ffb2b08 add orc 0.4.17 2013-08-11 11:00:45 +08:00
Peter Simons
0c331a4a42 haskell-idris: revert update to version 0.9.9
This reverts commit 61c880d558. The new
Idris version depends on a version of LLVM that we don't have in master
yet: it's only in x-updates.
2013-08-03 12:10:39 +02:00
Peter Simons
61c880d558 haskell-idris: update to version 0.9.9 2013-08-03 12:08:22 +02:00
Vladimír Čunát
98f3716650 clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Mathijs Kwik
114b961b8c idris: upgrade to 0.9.9 2013-08-02 11:47:38 +02:00
Peter Simons
b253eb0d59 haskell-elm-server: re-generate expression with cabal2nix 2013-07-29 11:27:01 +02:00
Alexander Foremny
828b1de8f4 Add jailbreak to Elm server 2013-07-27 10:22:07 +02:00
Karn Kallio
c067505c7d aldor: fix the build 2013-07-25 10:11:19 +02:00
Peter Simons
58c08fdefb aldor: fix the sha256 hash (plus minor cosmetic changes) 2013-07-24 10:51:01 +02:00
Lluís Batlle i Rossell
b1db03ece6 Updating go to 1.1.1 2013-07-22 22:18:51 +02:00
Peter Simons
0685198b53 Merge pull request #770 from aforemny/haskell-elm
Add Elm and elm-server
2013-07-21 06:41:26 -07:00
Karn Kallio
bc4c9312a5 Add aldor. 2013-07-17 18:51:51 +02:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Evgeny Egorochkin
d078f07f4c strategoxt.java-front: fix version to match tarball 2013-07-14 02:08:54 +03:00
Evgeny Egorochkin
7e5e50a084 strategoxt.dryad: fix version to match tarball 2013-07-14 02:08:48 +03:00
Peter Simons
e2874236d3 llvm: fix meta.license attribute 2013-07-04 17:53:57 +02:00
Jason "Don" O'Conal
3b490b7ccb llvm: re-disabling tests
accidentally re-enabled doCheck, which isn't working yet
2013-07-04 19:02:40 +10:00
Jason "Don" O'Conal
67e5eb909b llvm: fix build on darwin
* add DYLD_LIBRARY_PATH
* don't build with shared libs
2013-07-04 08:48:55 +10:00
Rickard Nilsson
00df29c471 New package: lessc, version 1.4.0
Compiles LESS to CSS
2013-07-01 15:39:39 +02:00
Rickard Nilsson
cb534f1baa New package: Google Closure compiler version 20130603.
A JavaScript optimizing compiler.
2013-07-01 14:52:57 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Shea Levy
6425ad2847 clang: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:50:56 -04:00
Shea Levy
9b502a9ae1 llvm: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:18:52 -04:00
Vladimír Čunát
3adf8e6429 vala, libusb1, deps of libjpeg: attempt to fix on non-Linux 2013-06-18 17:52:09 +02:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin
ed51d54610 Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
2013-06-13 05:42:53 -07:00
Alexander Foremny
bb53645b0f Add Elm and elm-server 2013-06-12 13:27:22 +02:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin
55249de924 Update Julia to today's revision 2013-06-11 15:44:56 +04:00
Andrew Morsillo
e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Vladimír Čunát
7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Domen Kozar
4213b4aacb fix eval 2013-06-07 11:18:33 +02:00
Evgeny Egorochkin
9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Mathijs Kwik
35d3e38d54 add idris wrapper 2013-06-05 23:36:20 +02:00
Mathijs Kwik
3f9723e02e add idris wrapper 2013-06-05 23:30:38 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Mathijs Kwik
187670c7da add haskell/idris 2013-06-05 12:17:35 +02:00
Michael Raskin
f0276491f9 ECL update 2013-06-04 11:30:32 +04:00
Michael Raskin
0cc921120a SBCL update 2013-06-04 11:30:26 +04:00
Michael Raskin
d82d86eb64 ECL update 2013-06-04 11:29:34 +04:00
Michael Raskin
40a250fc6f SBCL update 2013-06-04 11:10:06 +04:00
Vladimír Čunát
14f36162d2 llvm: switch back to cmake build, so now clang builds 2013-06-01 23:36:38 +02:00
Vladimír Čunát
25471803e4 Merge master into x-updates 2013-05-29 23:25:26 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Bjørn Forsman
8a1409432e sourcery-codebench: fix installation of manpages
Sourcery CodeBench manpages are installed under
share/doc/<target-triplet>/man/. Add symlinks so that the manpages
become available to "man".

NOTE: I use symlinks instead of moving the manpages, because I think
it is best to do as little as possible to prebuilt packages.
2013-05-29 21:58:29 +02:00
Peter Simons
317fcd3b86 Merge pull request #559 from bjornfor/mentor-codebench
Add Sourcery CodeBench Lite toolchain(s)
2013-05-29 02:17:46 -07:00
Bjørn Forsman
f55117ab8a Add Sourcery CodeBench Lite toolchain(s)
Sourcery CodeBench toolchains are prebuilt GCC toolchains from Mentor
Graphics.

Start out by adding ARM EABI and ARM GNU/Linux toolchains. Sourcery
CodeBench is also available for MIPS, Power, SuperH, ColdFire (and
more), so it should be easy to add later, if needed.

AFAIK, the EABI toolchains use newlib and the GNU/Linux ones use glibc.
2013-05-25 21:09:42 +02:00
aszlig
b59d53cc2d
Revert "haxe: Use ignoreExternals and fix build."
This reverts commit a0716f28af.

Starting with r6706, externals now have a fixed revision, so we no longer need
to ignore them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

Conflicts:
	pkgs/development/compilers/haxe/default.nix
2013-05-25 19:01:45 +02:00
aszlig
565b5b522f
haxe: Cosmetics - use -f flag on rm.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:45 +02:00
aszlig
64128b7297
haxe: Update to stable version 3.00.
So, finally, Haxe 3 is stable :-)

An overview of the new features can be found here:

http://haxe.org/manual/haxe3/features

This version now has a new build target "tools", so let's use it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:45 +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
Vladimír Čunát
d45b50ce6f llvm: add forgotten patch, WIP 2013-05-16 18:49:47 +02:00
Vladimír Čunát
70882b980c WARNING: history from now is going to change (mesa+llvm)
Current WIP, only tested nouveau (3D works very well).
2013-05-16 17:16:02 +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 1278859d31, reversing
changes made to 0c020c98f9.

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
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
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
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
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
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
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
aszlig
735779cee4
neko: Update to new upstream version 2.0.0.
This is required in order to support Haxe 3, but won't hurt (tested with a few
projects) even in Haxe 2.x.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-27 00:26:55 +01:00
Rommel M. Martinez
1c4e7e78ce Add chicken-4.8.1 2013-03-26 22:52:54 +08:00
Peter Simons
83d0a3a37c ghc: add meta.license attribute to all compiler versions 2013-03-23 15:58:14 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Shea Levy
a7359deca8 edk2: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-19 13:59:40 -04:00
Lluis Batlle
61f9b4f61b Fixing the go timezones. glibc doesn't include the zoneinfo anymore. 2013-03-19 11:48:12 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Vladimír Čunát
8acaea6d57 gcc33: fix build on i686 2013-03-16 21:08:57 +01:00
Vladimír Čunát
198d4fbe41 gcc33: fix build by --disable-multilib 2013-03-16 20:59:46 +01:00
Vladimír Čunát
dd25120e8e gcc34: fix build on i686 2013-03-16 20:40:04 +01:00
Peter Simons
893c684e99 pkgs/development/compilers/ghc/with-packages.nix: include share/emacs/site-lisp in the generated environment
This change allows 'ghc-mod' to be included in such a GHC environment,
which is important because the tool is GHC version-specific.
2013-03-15 19:58:08 +01:00
Shea Levy
ef82ab3fca Merge branch 'sdcc' of git://github.com/bjornfor/nixpkgs
New package, it builds, I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 18:51:17 -04:00
Bjørn Forsman
859a227595 sdcc: new nixpkg (SDCC -> Small Device C Compiler)
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.),
Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the
Microchip PIC16 and PIC18 targets. It can be retargeted for other
microprocessors.
2013-03-11 21:59:40 +01:00
Peter Simons
807cd9ff16 haskell-idris: update to version 0.9.7 2013-03-11 11:26:14 +01:00
Peter Simons
4610d8b81a jhc: enable Hydra build on Linux 2013-03-11 10:47:21 +01:00
Andres Loeh
54e0fe3ec1 ghc: update HEAD snapshot 2013-03-10 21:14:45 +01:00
Vladimír Čunát
dc5c4917a5 vala: update to 0.19 2013-03-10 19:53:43 +01:00
Michael Raskin
f80dfee0c5 SBCL: patch for new Glibc no longer needed 2013-03-08 17:55:11 +04:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Michael Raskin
197af84cc6 SBCL: update to 1.1.5 2013-03-07 00:40:51 +04:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Shea Levy
c308b10ec0 Scala should work on all supported platforms 2013-02-26 11:18:16 -05:00
Vladimír Čunát
0e9b88cc4a sbcl: fix and minor update 2013-02-24 18:20:57 +01:00
Vladimír Čunát
5f758e6ea3 dragonegg: fix via update 2013-02-23 14:57:31 +01:00
Shea Levy
acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
598c958a7d haskell-idris: update to version 0.9.6.1 2013-02-20 11:58:01 +01:00
Shea Levy
f081cacda7 gcc: Don't symlink lib and lib64 when building multilib 2013-02-16 18:54:47 -05:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons
97faa4c319 ghc-with-packages.nix: include man pages in the generated profile 2013-02-11 23:26:06 +01:00
Shea Levy
86feda1106 Add multilib gcc-4.6.
libquadmath seems to require that the bootstrap gcc be multilib too.
2013-02-08 14:27:42 -05:00
Rob Vermaas
047f174801 Remove old static versions of aterm/sdf2-bundle, don't build currently and not used anywhere. 2013-02-07 22:09:32 +01:00
Michael Raskin
a2ba6d5bdd Julia: update/fix 2013-02-05 11:24:00 +04:00
Peter Simons
f929eecfa7 ghc-7.6.2: cosmetic, no functional change 2013-01-30 17:30:51 +01:00
Peter Simons
7848756283 Parallel building is enabled again in GHC 7.6.2, because we hope the issues
we've had with earlier versions have been remedied. If anyone experiences build
errors with this package, please file issue at Github!
2013-01-30 17:30:25 +01:00
Peter Simons
75fcdfbb9e ghc-head: update to snapshot version 7.7.20121213 2013-01-30 12:25:38 +01:00
Aristid Breitkreuz
3a68505c6e GHC 7.6.2 2013-01-29 20:42:28 +01:00
Eelco Dolstra
5f638a4e53 gcc-4.4: Fix build
http://hydra.nixos.org/build/3896514
2013-01-29 11:44:08 +01:00
Eelco Dolstra
f7cc884de4 gwt: Remove obsolete version 2013-01-28 18:31:17 +01:00
Eelco Dolstra
d8f8a29758 gcc-upc: Remove
This version (4.0) is obsolete.  And UPC will be merged in GCC 4.8
anyway.
2013-01-28 17:19:04 +01:00
Eelco Dolstra
d2b76e68d0 gcc-4.1: Remove
No longer used and doesn't build.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
cb07844c9d gcc-2.95: Remove
Hasn't built in a long time.
2013-01-28 17:19:03 +01:00
Eelco Dolstra
5f6de267f0 gcc-4.0: Remove 2013-01-28 17:19:03 +01:00
Eelco Dolstra
6eb71ff01c gcc-4.3: Apply siginfo_t fix
Borrowed from Gentoo.
2013-01-28 17:19:02 +01:00
Eelco Dolstra
ac9932d133 iasl: Fix build
http://hydra.nixos.org/build/3887583
2013-01-28 17:19:01 +01:00
Lluís Batlle i Rossell
3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
Peter Simons
c941ab98a7 haskell-idris: update to version 0.9.6 2013-01-25 14:52:03 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Shea Levy
296cd66009 clang requires libxlm2, on darwin at least 2013-01-22 16:29:28 -05:00
Shea Levy
857742ea22 clang/llvm: 3.2 2013-01-22 14:33:55 -05:00
Shea Levy
eb6c8aec62 openjdk: Update to 7u6b24 2013-01-22 12:58:07 -05:00
Vladimír Čunát
fa8e19e879 Merge pull request #263 from aforemny/mit-scheme
Fix mit-scheme
2013-01-21 03:07:01 -08:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Eelco Dolstra
0db6ea6f76 Remove some oversized packages from the channel
E.g. urbanterror takes up 2x720 MiB.
2013-01-17 22:34:08 +01:00
Alexander Foremny
0500d16899 Fix mit-scheme
These changes are necessary for me to use mit-scheme on i686 NixOS.
mit-scheme in the current state should be broken on x86_64 either and
these changes should fix, too. I however did not test this.
2013-01-12 13:11:55 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00