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
Peter Simons
1d191dd56f
haskell-idris: update to version 0.9.10
2013-12-02 16:25:34 +01:00
Moritz Ulrich
31cdbe4a31
Chicken: Fix build on OS X.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-29 11:47:00 +01:00
Moritz Ulrich
78cb479f73
Chicken: Set PLATFORM for all supported platforms.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 23:23:40 +01:00
Moritz Ulrich
32fbf27bc3
Chicken: Downgrade to latest stable release & add pkgs.chicken-dev.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-28 22:08:30 +01:00
Michael Raskin
a4701db302
Updating SBCL to 1.1.13
2013-11-25 10:59:36 +04:00
Vladimír Čunát
b5fba47147
Merge branch master into x-updates
...
Conflicts (not used, deleted):
pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Bjørn Forsman
fed248c78e
sdcc: bump 3.2.0 -> 3.3.0
...
SDCC 3.3.0 Feature List:
* Many small improvements in code generation for the z80-related ports - merged smallopts branch
* lospre (currently enabled for z80-related and hc08-related ports only) - merged lospre branch
* More efficient initialization of globals in z80, z180, r2k and r3ka ports.
* Inclusion of tests from the gcc test suite into the sdcc regression test suite led to many bugs being found and fixed.
* Split sdas390 from sdas8051
* Merged big parts of ASxxxx v5 into sdas
* New pic devices (synchronization with MPLABX 1.60). (Except for very old MCU-s.)
* New script which disassembles those hex files, in which MCS51 code there is. (mcs51-disasm.pl)
* Added the PIC16F1788 and PIC16F1789 devices.
* C11 _Alignof operator.
* C11 _Alignas alignment specifier.
* C11 _Static_Assert static assertion.
Numerous feature requests and bug fixes are included as well.
2013-11-21 23:22:06 +01:00
zimbatm
8677a22dd5
Fixes go 1.1.2 compilation on OSX Maverick
...
Apparently Apple thinks that faking gcc wiht a clang stub but not providing a
compatile libgcc.a is not going to cause any issues. They really do hate GPL.
2013-11-17 13:51:37 +00:00
Vladimír Čunát
68430cf3d7
Merge branch master into x-updates
...
Conflicts (trivial, minor update on master, major here):
pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Petr Rockai
2c9f0e059a
clang: Do not try to build clang-tblgen in LLVM's build path.
2013-11-16 13:53:48 +01:00
Peter Simons
b1f7180d6c
Merge pull request #1188 from peti/reimplement-ghcWithPackagesOld-by-wrapping-ghcWithPackages
...
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
2013-11-11 05:00:11 -08:00
Karn Kallio
1e80c57274
scala: add expression for scala 2.10.x branch.
2013-11-11 12:11:00 +01:00
Peter Simons
e4d841eef4
Re-implement ghcWithPackagesOld as a variant of ghcWithPackages that ignores collisions.
...
This change is intended to fix <https://github.com/NixOS/nixpkgs/issues/1161 >
and to address some of the concerns that come up during the discussion of
<d64917ad17
>.
2013-11-09 20:41:52 +01:00
Peter Simons
981c287355
ghc: several enhancements to the new "with-packages" wrapper
...
1) The wrapper erroneously used the ghc-pkg flag "--package-db" instead of
"--global-package-db". The result was that packages installed locally in
~/.ghc and ~/.cabal were invisible to GHC. This has been fixed.
2) The wrapper now deals gracefully with an empty package set: if no package
is requested to be included in the wrapped environment, the wrapper just
installs a pristine GHC.
3) Correctly configure the "docdir" path returned by ghc-paths.
4) Added some comments that describe the idea behind our ghc-paths patches and
gives users same sample shell code that can be used to import our special
environment variables into the currently running shell, so that programs
outside of the wrapped environment can use them, too.
2013-11-09 20:36:25 +01:00
Peter Simons
f92a5cbfc6
pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
...
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:
(pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };
See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
Peter Simons
89c566fcfd
pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages
...
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.
The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
2013-11-07 12:14:19 +01:00
Eelco Dolstra
77dc219127
gcc: Support FreeBSD
2013-11-06 10:41:02 +01:00
Eelco Dolstra
da426c7df5
Fix some meta.platforms attributes to build more stuff on Darwin
2013-11-05 10:46:59 +01:00
Peter Simons
0e831bd525
Resurrect the old ghcWithPackages wrapper under the attribute name 'ghcWithPackagesOld'.
2013-11-04 19:42:49 +01:00
Peter Simons
40a31df497
haskell-Elm: update to version 0.10.0.2
2013-11-01 14:20:11 +01:00
Mathijs Kwik
f4903d890e
Merge branch 'master' into x-updates
2013-11-01 08:35:16 +01:00
Mathijs Kwik
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Peter Simons
094edba311
ghc-with-packages.nix: make sure that GHC itself is included in the environment
2013-10-28 17:54:28 +01:00
Peter Simons
19cfd3da63
haskell-Elm: update to version 0.10.0.1
2013-10-27 19:07:14 +01:00
Peter Simons
9eea6c64fb
Merge branch 'origin/master' into stdenv-updates.
2013-10-27 10:58:24 +01:00
Peter Simons
f5e8f1ccc1
ghc: update HEAD version to 7.7.20130828
2013-10-27 10:22:21 +01:00
Peter Simons
d64917ad17
Back-port Haskell-related improvements from stdenv-updates.
...
* There now is full support for building Haskell packages as shared libraries
for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
attributes:
- enableSharedLibraries configures Cabal to build of shared libraries in
addition to static ones. This option requires that all dependencies of
the package have been compiled for use in shared libraries, too.
- enableSharedExecutables configures Cabal to prefer shared libraries when
linking executables.
The default values for these attributes are arguments to the haskellPackages
expression.
* Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
of build and test suite errors. Without this setting, GHC seems unable to
deal with the UTF-8 character encoding that's generally considered standard
in the Haskell world.
* The Cabal builder supports a new attribute 'testTarget' to specify the exact
set of tests to be run during the check phase.
* The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons
91f2c362de
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Bjørn Forsman
200d629733
Fix evaluation error caused by the "ats" expression
2013-10-26 12:43:12 +02:00
Shea Levy
665c4882e8
Add ats
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-25 13:33:32 -04:00
Peter Simons
cf08417baa
haskell-Elm: update to version 0.10
2013-10-24 23:29:54 +02:00
Song Wenwu
b23741da34
Add smlnj-110.76
...
Based on patch by Marc Weber:
http://lists.science.uu.nl/pipermail/nix-dev/2010-December/005625.html
Close #1058 .
2013-10-21 21:46:55 +03:00
Peter Simons
fae8fd8ef1
ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency
2013-10-20 15:40:36 +02:00
Malcolm Matalka
ab744d2053
Add Ocaml 4.01.0.
...
Close #1065 .
2013-10-19 18:07:20 +03:00
Peter Simons
3ec00b51f8
gcc: update to 4.8.x branch to 4.8.2
2013-10-19 15:10:27 +02:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons
e9163ad4c9
ghc: configure RPATH that allows ghc's shared libraries to find each other
...
Prior to this patch, libHSrts.so didn't know how to load libffi.so.
See issue #1081 for further details.
2013-10-18 18:39:04 +02:00
Peter Simons
b258b45a4f
haskell-idris: update to version 0.9.9.3
2013-10-18 12:52:27 +02:00
Michael Raskin
75bb099867
Update Julia
2013-10-14 11:55:59 +04:00
Michael Raskin
6be28d142f
Update SBCL to 1.1.12
2013-10-13 10:34:55 +04:00
Shea Levy
74d72d89ea
Update edk2 and OVMF
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-09 10:30:44 -04:00
Rob Vermaas
2066508131
Add argument to oraclejdk to allow installation of Java Cryptography Extension with unlimited strength. User needs to download these themselves, and need to accept a license agreement (Java SE BCL License Agreement)
2013-10-08 11:31:12 +02:00
Domen Kožar
49f8e371a1
Merge pull request #1049 from bjornfor/description-fixes
...
More description fixes
2013-10-06 07:05:20 -07:00
Bjørn Forsman
083d0890f5
More description fixes
...
* Remove package name
* Start with upper case letter
* Remove trailing period
Also reword some descriptions and move some long descriptions to
longDescription.
I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons
2e60cd53b7
Merge pull request #1046 from DriesVanDaele/master
...
add tabling to yap
2013-10-06 02:58:53 -07:00
Vladimír Čunát
4bcdeb49a1
mesa: update 9.1.6 -> 9.2.1, enable R600 LLVM stuff
2013-10-05 21:18:35 +02:00
Dries Van Daele
89964dd241
add tabling to yap
2013-10-05 20:59:34 +02:00
Bjørn Forsman
28ac782583
Some description fixes
...
There are many more packages to fix, this is just a start.
Rules:
* Don't repeat the package name (not always that easy...)
* Start with capital letter
* Don't end with full stop
* Don't start with "The ..." or "A ..."
I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons
a71c1ca748
haskell-idris: update to version 0.9.9.2
2013-09-25 18:25:00 +02:00
Vladimír Čunát
0adae9f822
llvm: add support for R600
...
It will be useful for mesa >= 9.2.*
Also, I want to restart the build on Hydra, as it succeeds for me.
2013-09-24 23:10:48 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
900a35738c
haskell-idris: update to version 0.9.9.1
2013-09-22 13:25:08 +02:00
Peter Simons
f998111d2c
ghc-7.6.3: undo commit 7c8ba75
...
The change was supposed to trigger a re-build to fix a broken GHC binary
on the Hydra build farm, but now it turns out that the cause for the
errors we're seeing isn't GHC: all kinds of (non-Haskell) packages are
broken.
2013-09-21 09:51:35 +02:00
Peter Simons
7c8ba7557c
ghc-7.6.3: cosmetic change to force a re-build
2013-09-20 19:27:22 +02:00
Lluís Batlle i Rossell
41e95c68b3
go: adding an option to remove external references in godoc
...
godoc pages point to googleapis and google plus URLs, for every visit in
your local godoc. I added an option to disable that (the hard way, it
takes out the references). I don't think it removes any feature of
godoc.
2013-09-15 11:57:52 +02:00
Peter Simons
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
Zef Hemel
8d001c1a08
Darwin support for Go 1.1 ( close #952 )
2013-09-14 15:13:26 +02:00
Peter Simons
da6b1e6d81
idris: re-generate with cabal2nix
2013-09-11 20:45:18 +02:00
Peter Simons
39043ce87e
yap: add 'zlib' and 'gmp' build inputs to enable additional features
2013-09-11 20:43:04 +02:00
Dries Van Daele
412b970479
Update YAP to version 6.2.2
2013-09-11 19:40:10 +02:00
Dries Van Daele
3d5e7a99f4
Update SWI-Prolog to version 6.4.1
2013-09-11 19:00:31 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Vladimír Čunát
b1be46e932
Merge branch 'master' into x-updates
2013-09-07 16:19:46 +02:00
Ricardo M. Correia
6039f2effe
go: update to 1.1.2
...
Also fix impurity in src/pkg/net/lookup_unix.go.
2013-09-07 05:10:50 +02:00
Evgeny Egorochkin
bf82983581
Merge pull request #926 from grwlf/urweb-2013
...
Ur/Web: Version bump
2013-09-06 15:51:24 -07:00
Sergey Mironov
190dcbbc7a
Ur/Web: Version bump
2013-09-07 00:36:40 +04:00
Vladimír Čunát
9475e4d50a
llvm (merge amend): fix evaluation
...
Regular binutils now include gold.
2013-09-02 15:45:29 +02:00
Vladimír Čunát
74488e2b58
Merge branch 'x-updates' into stdenv-updates
...
Conflicts (simple):
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Peter Simons
98fcc2f746
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-08-30 10:45:11 +02:00
Vladimír Čunát
2fda1165da
Merge branch 'master' into x-updates
2013-08-28 10:37:41 +02:00
Bjørn Forsman
a74ab8c0a1
cudatoolkit: fix missing dependencies
...
Some of the java tools failed to run (notably nsight) because of missing
libraries. This fixes it.
2013-08-27 14:11:23 +02:00
Justin Bedo
6c2985e8d7
Update CUDA Toolkit to 5.5
2013-08-27 13:44:56 +02:00
Peter Simons
95491128cf
gprolog: update to version 1.4.4, clean up installation layout, update license information
2013-08-27 13:21:29 +02:00
Vladimír Čunát
c1e62e7e91
Merge branch 'master' into x-updates
2013-08-22 19:29:09 +02:00
Petr Rockai
8bc805a211
llvm: Build the LLVMgold.so plugin for ld.gold &c.
...
Conflicts (simple):
pkgs/development/compilers/llvm/default.nix
2013-08-18 21:35:17 +02:00
Peter Simons
0d7118814b
Merge branch 'origin/master' into stdenv.
2013-08-17 10:00:16 +02:00
Peter Simons
898348a80d
ghc-head: update to version 7.7.20130816
2013-08-16 23:47:59 +02:00
Ludovic Courtès
2e937c437a
unmaintain several packages
2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Moritz Ulrich
f15af7c8e6
avra-1.3.0: Assember for the Atmel AVR microcontroller family
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-14 23:37:17 +02:00
Peter Simons
7147de66c6
haskell-Elm: update to version 0.9.0.2
2013-08-14 11:53:06 +02:00
Peter Simons
dff0f73d25
haskell-elm-server: update to version 0.9.0.2
2013-08-14 11:53:06 +02:00
Alexander Foremny
219e45b5f5
Disable tests in Elm
...
Elm does not serve any tests besides a test that always fails.
2013-08-14 10:02:05 +02:00
Peter Simons
bb312b77b5
ghc-head: update to version 7.7.20130811
2013-08-11 23:50:05 +02:00
Gergely Risko
de35a6dbb9
Export ghci config files for ghc-vis and ghc-heap-view
2013-08-11 23:50:04 +02:00
Peter Simons
8a09380383
haskell-Elm: update to version 0.9.0.1
2013-08-11 23:50:03 +02:00
Peter Simons
b5b53e250b
haskell-elm-server: update to version 0.9
2013-08-11 23:50:03 +02:00
Domen Kožar
94105045b4
typo
2013-08-11 17:13:46 +02:00
Bjørn Forsman
078213e892
orc: add a comment about the license
2013-08-11 14:50:55 +02:00
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
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +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
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
James Cook
5be89ac733
openjdk: Don't statically link C++ runtime, close #730 .
...
This fixes a build error (https://github.com/NixOS/nixpkgs/issues/707 ).
Thanks to
http://mail.openjdk.java.net/pipermail/build-dev/2012-January/005349.html
2013-07-08 09:15:33 +02: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
Vladimír Čunát
73183e5c70
gcc44: minor update 4.4.6 -> .7
2013-06-30 22:28:17 +02:00
Vladimír Čunát
38477f5b0b
gcc43: minor update 4.3.4 -> .6
2013-06-30 18:48:06 +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
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02: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
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14:45 +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
Peter Simons
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02: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