philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1650 commits

Author SHA1 Message Date
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
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
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