1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 00:54:11 +00:00
Commit graph

227 commits

Author SHA1 Message Date
Marc Weber fff1ba967e New proposal on howto library dependencies could be handled.
Just install ghc68_wrapper which will install the required dependencies ghc
(and libraries) itself.
The list libraries given in the wrapper attribute set can be user tuned in the future ?
An alternative would be creating something similar to the gcc/g++ include/ lib/ scheme which
is could be used by ghc to find installed packages..

svn path=/nixpkgs/trunk/; revision=9581
2007-11-05 09:27:36 +00:00
Marc Weber 16d701c9ab rxvt-unicode and jdk update provided by Tobias Hammerschmidt
svn path=/nixpkgs/trunk/; revision=9561
2007-10-31 12:17:14 +00:00
Eelco Dolstra 4095c41c33 * Temporary hack to prevent mass recompiles.
svn path=/nixpkgs/trunk/; revision=9551
2007-10-29 11:29:47 +00:00
Michael Raskin 0c4c2cb04d Added missing fortran.sh . Doesn't work, though
svn path=/nixpkgs/trunk/; revision=9550
2007-10-29 11:23:22 +00:00
Michael Raskin 98b2568a0f Tried to fortran-tune (insuccessfully) gcc expressions. They must accept mpfr and gmp anyway if we ever will build fortran.
svn path=/nixpkgs/trunk/; revision=9545
2007-10-28 20:19:43 +00:00
Andres Löh 23d6fce80d * adding ghc-6.8 even though it still segfaults on my machine
(it's marked lowPrio for now, so it shouldn't break anything)

svn path=/nixpkgs/trunk/; revision=9482
2007-10-19 13:24:29 +00:00
Michael Raskin 2a59b66914 Corrected fpc configuration generation after update.
svn path=/nixpkgs/trunk/; revision=9474
2007-10-19 07:59:48 +00:00
Michael Raskin 187c737e3c FPC version bump
svn path=/nixpkgs/trunk/; revision=9405
2007-10-04 19:18:31 +00:00
Eelco Dolstra 544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra 45a2c87402 * Support for mirror:// URLs a la Gentoo (NIXPKGS-70). Instead of
fetchurl {
      url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  you can write

    fetchurl {
      url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  which causes fetchurl to try the SourceForge mirrors listed in the
  `sourceforge' attribute in build-support/fetchurl/mirrors.nix.
  (They're currently tried in sequence, and the lists of mirrors are
  not configurable yet.)

  The syntax for mirror URLs is mirror://site/path/to/file, where
  `site' is currently one of `sourceforge', `gnu' (mirrors of
  ftp://ftp.gnu.org/pub/gnu) and `kernel' (mirrors of
  http://www.all.kernel.org/pub/).

svn path=/nixpkgs/trunk/; revision=9197
2007-08-27 12:44:01 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Marc Weber 88640db58e hugs98 expression
svn path=/nixpkgs/trunk/; revision=9168
2007-08-20 10:33:42 +00:00
Andres Löh 920ce3551d * make ghc use the nix-provided gmp
- this fixes ghc on x86_64 and hopefully doesn't break 32-bit
  - ghc-6.6.1 and -6.6 are tested on 64-bit, 6.4.2 might fail

svn path=/nixpkgs/trunk/; revision=9132
2007-08-15 11:25:20 +00:00
Michael Raskin aae4a8db7a Added Free Pascal Compiler.
svn path=/nixpkgs/trunk/; revision=9102
2007-08-11 20:55:40 +00:00
Andres Löh 6710a5e02f * make ghcboot work on 64-bit
svn path=/nixpkgs/trunk/; revision=9067
2007-08-07 23:59:08 +00:00
Eelco Dolstra 61656532dd * GCC 4.0.4.
svn path=/nixpkgs/trunk/; revision=9062
2007-08-07 12:05:10 +00:00
Armijn Hemel 838879a4ac fix hash for ghc
svn path=/nixpkgs/trunk/; revision=8818
2007-06-02 17:15:19 +00:00
Eelco Dolstra 13567556bf * Give the real GCC a lower priority than the GCC wrapper so that both
can be installed in a user environment without conflict.  This is
  useful if you need gcov (which isn't symlinked in the GCC wrapper).

svn path=/nixpkgs/trunk/; revision=8809
2007-05-31 13:00:49 +00:00
Eelco Dolstra 2a804eb95b * Backported the gcc 4.2 patch to 4.1
* Update to gcc 4.1.2.
* Removed some unnecessary stuff from the patch.

svn path=/nixpkgs/trunk/; revision=8739
2007-05-24 13:30:09 +00:00
Eelco Dolstra 59d7cc0cd0 * Maybe libmudflap and libssp work now.
svn path=/nixpkgs/trunk/; revision=8724
2007-05-20 21:21:35 +00:00
Eelco Dolstra 062308aabf * Remove some "fixed" header files.
* Strip the gcc executables.

svn path=/nixpkgs/trunk/; revision=8723
2007-05-20 21:09:49 +00:00
Eelco Dolstra b8dae869b3 * Trying to get gcc 4.2.0 to compile...
* Compute --enable-languages in the Nix expression instead of in the
  builder.
* Pass some flags through the Make command line instead of patching
  the Makefiles.
* gcc: generate code for i686 by default (instead of i386).
* gcc: patch out some references to /lib and /usr/lib.

svn path=/nixpkgs/trunk/; revision=8722
2007-05-20 20:27:55 +00:00
Armijn Hemel 8191ee8927 fix patch, still does not build cleanly
svn path=/nixpkgs/trunk/; revision=8716
2007-05-17 23:37:57 +00:00
Armijn Hemel 15c8486e51 gcc 4.2.0 stubs. untested.
svn path=/nixpkgs/trunk/; revision=8715
2007-05-17 16:27:54 +00:00
Eelco Dolstra 41291a5b26 * Fix Mesa-related evaluation errors.
svn path=/nixpkgs/trunk/; revision=8708
2007-05-16 14:49:28 +00:00
Andres Löh e3f701c311 * ghc version 6.6.1
svn path=/nixpkgs/trunk/; revision=8654
2007-05-06 15:39:39 +00:00
Eelco Dolstra 0caae36936 * Purity fix: don't use /usr/bin/install.
svn path=/nixpkgs/trunk/; revision=8619
2007-04-26 22:28:26 +00:00
Armijn Hemel 52cb80f235 remove cross compilers. Work is done on a seperate branch and these compilers are not functional anyway right now.
svn path=/nixpkgs/trunk/; revision=8587
2007-04-16 21:45:29 +00:00
Eelco Dolstra 0005a37b8d * In the JDK packages, don't return false if the platform is
unsupported.  This gives a type error ("value is a boolean while 
  an attribute set was expected").

svn path=/nixpkgs/trunk/; revision=8576
2007-04-16 10:07:06 +00:00
Eelco Dolstra 61171e3f15 * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=8478
2007-03-29 13:37:39 +00:00
Martin Bravenboer 753eae47d1 jdk-without-plugin fix
svn path=/nixpkgs/trunk/; revision=8460
2007-03-28 18:29:26 +00:00
Martin Bravenboer a9c0d60adb disabled sharpbang test
svn path=/nixpkgs/trunk/; revision=8458
2007-03-28 17:49:51 +00:00
Martin Bravenboer f92b856311 added ncurses support to ocaml
svn path=/nixpkgs/trunk/; revision=8457
2007-03-28 17:15:03 +00:00
Martin Bravenboer 9d9372cd58 Make jdk plugin support optional to avoid deps on gcc 3.3.6 everywhere.
svn path=/nixpkgs/trunk/; revision=8452
2007-03-28 15:21:43 +00:00
Eelco Dolstra e0ad264f43 * Get GCC 3.3 to build on x86_64/powerpc-linux. Not tested.
svn path=/nixpkgs/trunk/; revision=8439
2007-03-28 12:29:36 +00:00
Martin Bravenboer fb91f1b319 M pkgs/development/compilers/jdk/jdk6-linux.nix
M    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Various fixes to get javaws and mozillaPlugin to work. Requires gcc3.3
libstdc++ to be in the dynamic library path.


svn path=/nixpkgs/trunk/; revision=8434
2007-03-27 22:02:55 +00:00
Martin Bravenboer 778d516e41 A pkgs/tools/typesetting/pdfjam
A    pkgs/tools/typesetting/pdfjam/builder.sh
A    pkgs/tools/typesetting/pdfjam/default.nix

Added pdfjam, a package with the following tools:

    * pdfnup, which allows PDF files to be "n-upped" in roughly the
      way that psnup does for PostScript files.

    * pdfjoin, which concatenates the pages of multiple PDF files
      together into a single file

    * pdf90, which rotates the pages of one or more PDF files through
      90 degrees (anti-clockwise).

M    pkgs/development/compilers/jdk/jdk6-linux.nix

Typo


svn path=/nixpkgs/trunk/; revision=8404
2007-03-21 12:53:01 +00:00
Martin Bravenboer d86846bb6a Fixes in x86_64 support for the jdk.
svn path=/nixpkgs/trunk/; revision=8329
2007-03-18 00:33:32 +00:00
Martin Bravenboer 03dbe4cf1f Added x86_64-linux support to the jdk.
svn path=/nixpkgs/trunk/; revision=8326
2007-03-17 14:37:23 +00:00
Martin Bravenboer c212318239 patch unpack200 before running the construct script
svn path=/nixpkgs/trunk/; revision=8198
2007-03-05 21:33:47 +00:00
Martin Bravenboer 038454978f Use unzip to avoid unpurities
svn path=/nixpkgs/trunk/; revision=8196
2007-03-05 19:54:37 +00:00
Martin Bravenboer 3b1d307518 More deps on xlibs
svn path=/nixpkgs/trunk/; revision=8188
2007-03-05 17:55:17 +00:00
Martin Bravenboer 25e0bf0f49 oops.
svn path=/nixpkgs/trunk/; revision=8187
2007-03-05 17:29:21 +00:00
Martin Bravenboer 6892b99bf6 Update of jdk and jre to jdk-distros, based on Distributor License for Java.
D    pkgs/development/interpreters/jre

Obsolete. jdk and jre are now build by the same expression.

D    pkgs/development/compilers/blackdown

Obsolete. jdk is now downloadable.

D    pkgs/development/compilers/jdk/jdk5-sun-linux.nix

Obsolete

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Build for DLJ bundles.

M    pkgs/top-level/all-packages.nix

Dropped blackdown and ant based on blackdown.

A    pkgs/development/compilers/jdk/jdk6-construct.sh

Copy of DLJ construct script to fix problem with jdk6 bundles.

A    pkgs/development/compilers/jdk/jdk6-linux.nix

New main Nix expression for jdk and jre. Supports mozillaPlugin.

A    pkgs/development/compilers/jdk/dlj-bundle-builder.sh

Include path to libjli in rpath.


svn path=/nixpkgs/trunk/; revision=8186
2007-03-05 17:13:53 +00:00
Eelco Dolstra 279c1e343e * ghc-pkg wrapper: remove --global; it's not needed and it causes
problems (e.g., with ghc-pkg -s PKGNAME).

svn path=/nixpkgs/trunk/; revision=7790
2007-01-24 14:26:50 +00:00
Eelco Dolstra f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Arie Middelkoop afde8e6270 Added GHC 6.6.
note: the old GHC 6.4(.2?) version is still there. I reused the bootstrap-version to bootstrap GHC-6.6. And some other packages depend on the old GHC 
version as well.

note: only use this package for building other packages. If you install it as an end-user, you'll only be able to use the default GHC libraries, 
because other libraries are only privately registered to this GHC version during a nix-build by hooks (which are not executed when you run GHC 
yourself as an end-user).

Consequently, also added a newer version of uulib and uuagc.

svn path=/nixpkgs/trunk/; revision=7346
2006-12-15 13:32:55 +00:00
Eelco Dolstra 711bb9b56a * Fix GCC 3.3.
svn path=/nixpkgs/trunk/; revision=6904
2006-10-30 11:58:24 +00:00
Eelco Dolstra 0b78c04601 * Fix gcc 3.3.
svn path=/nixpkgs/trunk/; revision=6898
2006-10-28 23:41:45 +00:00