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
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