3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

15098 commits

Author SHA1 Message Date
Andres Löh 88feca4ee8 Fixed priority settings for GHCs; some minor fixes.
svn path=/nixpkgs/trunk/; revision=28450
2011-08-10 07:27:23 +00:00
Peter Simons b1ef3e6e36 Last batch of Haskell expression updates.
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +00:00
Peter Simons a34580133a doxygen: qt depends on udev(!), so we cannot build the doxygen GUI on other Unix variants
svn path=/nixpkgs/trunk/; revision=28448
2011-08-09 23:35:21 +00:00
Peter Simons 0d032ba736 Added Haskell packages css-text, http-date, and pwstore-fast.
svn path=/nixpkgs/trunk/; revision=28447
2011-08-09 23:20:28 +00:00
Peter Simons 3685cea8e9 Updated (almost) all Haskell package expressions with cabal2nix.
The new files ...

 * conform to the coding guidelines,

 * consistently specify meta.maintainers and meta.platforms,

 * have proper descriptions and licenses as specified in their Cabal file, and

 * take advantage of the new cabal.nix extensions, i.e. proper
   distinction between buildInputs and propagatedBuildInputs.

Furthermore, the following updates were performed:

 * haskell-Ranged-sets: updated to version 0.3.0
 * haskell-Shellac-haskeline: updated to version 0.2.0.1
 * haskell-cpphs: updated to version 1.12
 * haskell-hslogger: updated to version 1.1.5
 * haskell-xml: updated to version 1.3.9
 * haskell-HDBC-postgresql: updated to version 2.3.2.0
 * haskell-HDBC-sqlite3: updated to version 2.3.3.0
 * haskell-HDBC: updated to version 2.3.1.0
 * haskell-base-unicode-symbols: updated to version 0.2.2.1
 * haskell-convertible: updated to version 1.0.11.0
 * haskell-monad-control: updated to version 0.2.0.2
 * haskell-murmur-hash: updated to version 0.1.0.4
 * haskell-repa: updated to version 2.1.1.3
 * haskell-statistics: updated to version 0.9.0.0
 * haskell-ansi-terminal: updated to version 0.5.5

haskell-maybench was dropped, because it cannot be built with recent
versions of Cabal:

   Configuring maybench-0.2.4.1...
   Setup: At least the following dependencies are missing:
   Cabal >=1.2 && <1.5

svn path=/nixpkgs/trunk/; revision=28446
2011-08-09 23:00:20 +00:00
David Guibert 065c0213cf gnome-mplayer, gnome-mediamplayer updated to 1.0.4
svn path=/nixpkgs/trunk/; revision=28445
2011-08-09 20:39:43 +00:00
David Guibert f58ae30dfd update python modules: sip and pyqt
svn path=/nixpkgs/trunk/; revision=28444
2011-08-09 20:39:19 +00:00
David Guibert 1e4cb4f0eb sshfs: link sshfs to mount.sshfs
mount.fuse is not able to find sshfs.
So calling
  $ mount -t sshfs user@host:path mount/point
will search for mount.sshfs to do the mount.

svn path=/nixpkgs/trunk/; revision=28443
2011-08-09 20:38:55 +00:00
David Guibert 094c52f66d add perl-lockfile-simple
svn path=/nixpkgs/trunk/; revision=28442
2011-08-09 20:38:34 +00:00
Yury G. Kudryashov a9daa0c0cb mutt-1.5.21; enable pop, imap and gpgme
openssl.patch is already merged in this version

svn path=/nixpkgs/trunk/; revision=28441
2011-08-09 20:21:05 +00:00
Yury G. Kudryashov 48f1cd549f pari-gp-2.5.0
svn path=/nixpkgs/trunk/; revision=28440
2011-08-09 20:20:58 +00:00
Andres Löh 1eb2c65731 Update yesod-json.
svn path=/nixpkgs/trunk/; revision=28439
2011-08-09 20:13:22 +00:00
David Guibert b97136492e isync: add recursive imap patch
svn path=/nixpkgs/trunk/; revision=28438
2011-08-09 20:09:17 +00:00
David Guibert 5db26b465e update kernels
svn path=/nixpkgs/trunk/; revision=28437
2011-08-09 20:04:03 +00:00
Andres Löh 31654fc153 Filter null elements from dependency lists to keep hashes stable.
svn path=/nixpkgs/trunk/; revision=28434
2011-08-09 14:55:53 +00:00
Peter Simons 369832838b all-packages.nix: register all haskellPackage variants except the default one, 7.0.4, with low priority
Some general purpose tools in haskell-packages.nix have no GHC version string
baked in their name, i.e. alex, haddock, and happy. "nix-env -u" prefers the
first match it finds. Thus, if haskellPackages_ghc6104 et al would have the
same priority as haskellPackages, then nix-env would choose those the old
variants of these tools, because they are listed first.

svn path=/nixpkgs/trunk/; revision=28433
2011-08-09 14:32:20 +00:00
Peter Simons d233892f0d all-packages.nix: configure haskellPackages_ghc704_profiling with lowPrio
svn path=/nixpkgs/trunk/; revision=28432
2011-08-09 14:15:16 +00:00
Peter Simons 08f1808a37 all-packages.nix: fixed typo in haskellPackages_ghc704_no_profiling
svn path=/nixpkgs/trunk/; revision=28431
2011-08-09 14:15:13 +00:00
Eelco Dolstra eb9a0145ea * Don't mount the entire host filesystem, but just /nix/store and a
temporary directory.  This is necessary to isolate NixOS VMs from
  the host filesystem for security.

svn path=/nixpkgs/trunk/; revision=28427
2011-08-09 14:05:40 +00:00
Peter Simons 2a13966047 cabal2nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=28426
2011-08-09 12:40:29 +00:00
David Guibert 7de614fdf3 pidgin 2.9.0
svn path=/nixpkgs/trunk/; revision=28425
2011-08-09 12:35:55 +00:00
Ludovic Stordeur cd3fda3def Fixed error in build-support/fetchfile
Replaced undefined variable 'url' by the correct one 'pathname'

svn path=/nixpkgs/trunk/; revision=28424
2011-08-09 12:28:49 +00:00
Andres Löh 01be205d66 Experimental: comment all Haskell stuff in release.nix.
svn path=/nixpkgs/trunk/; revision=28423
2011-08-09 11:21:41 +00:00
Andres Löh a14d260103 Build profiling versions of ghc-7.0.4 libraries.
svn path=/nixpkgs/trunk/; revision=28422
2011-08-09 11:18:31 +00:00
Andres Löh ec5a87c11d Disable recurseIntoAttrs for some GHC versions.
svn path=/nixpkgs/trunk/; revision=28421
2011-08-09 11:10:24 +00:00
Andres Löh f5cb16f7b2 Added an alias.
svn path=/nixpkgs/trunk/; revision=28420
2011-08-09 11:10:22 +00:00
Peter Simons d12e88df66 cabal2nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=28419
2011-08-09 11:05:30 +00:00
Peter Simons c13f967ed5 Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
Peter Simons c4b18a282f pkgs/development/libraries/haskell/cabal2nix: added missing regexPosix dependency
Also, it's not necessary to propagate our build inputs; we build just executables.

svn path=/nixpkgs/trunk/; revision=28417
2011-08-09 09:47:46 +00:00
Peter Simons 20d78ba0a9 pkgs/development/libraries/haskell/cabal2nix: updated to the latest version
svn path=/nixpkgs/trunk/; revision=28416
2011-08-09 09:44:04 +00:00
David Guibert 0ce8c08099 fix the compilation of virtualboxGuestaddition
svn path=/nixpkgs/trunk/; revision=28415
2011-08-09 09:07:29 +00:00
Peter Simons 9502aedde3 pkgs/development/compilers/ghc/6.10.2-binary.nix: we have no binary for Darwin
svn path=/nixpkgs/trunk/; revision=28414
2011-08-09 08:17:39 +00:00
Peter Simons ff510a0516 pkgs/development/libraries/haskell/cabal2nix: updated to latest version
svn path=/nixpkgs/trunk/; revision=28413
2011-08-09 08:17:35 +00:00
Peter Simons d0e60c7130 leksah: disable Darwin builds
The expression needs more attention before it can be built on platforms
other than Linux:

  at `haskellPackages.leksahServer' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

  at `haskellPackages.leksah' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

svn path=/nixpkgs/trunk/; revision=28412
2011-08-09 07:49:41 +00:00
Peter Simons 8c77cb5634 pkgs/development/libraries/haskell/ltk: disable Darwin builds
The expression needs more attention before it can be built on platforms
other than Linux:

  at `haskellPackages_ghc703.ltk' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

svn path=/nixpkgs/trunk/; revision=28411
2011-08-09 07:49:36 +00:00
Peter Simons a13e1f6963 pkgs/development/libraries/haskell/hsdns: re-use meta.platforms attribute of the compiler that's building this expression
This change is hopefully going to remedy evaluation errors like

   at `haskellPackages_ghc721.hsdns' [system = "i686-darwin"]:
   user-thrown exception: cannot bootstrap GHC on this platform

on Hydra. These errors occur because we build all packages with (almost)
all compilers an all "Haskell platforms". Some compilers, however,
cannot be bootstrapped on Darwin, so we ended up requesting builds that
cannot be performed.

svn path=/nixpkgs/trunk/; revision=28410
2011-08-09 07:44:28 +00:00
Peter Simons d3df8772c1 pkgs/development/compilers/ghc: changed all GHC versions to use re-use the meta.platforms attribute of their bootstrap compiler
svn path=/nixpkgs/trunk/; revision=28409
2011-08-09 07:42:05 +00:00
Peter Simons 0be3dae42f pkgs/development/compilers/ghc/*-binary.nix: added a meta.platforms attribute to all ghc bootstrap versions
svn path=/nixpkgs/trunk/; revision=28408
2011-08-09 07:41:10 +00:00
Peter Simons 275c99ce85 haskell-cabal2nix: updated to the latest version
svn path=/nixpkgs/trunk/; revision=28407
2011-08-08 23:24:35 +00:00
Shea Levy 532511e7f5 linux-3.1.nix: Set modDirVersion
broadcom-sta: use kernel.modDirVersion in place of kernel.version

svn path=/nixpkgs/trunk/; revision=28406
2011-08-08 20:49:59 +00:00
Shea Levy ffdc37215a kernel/generic.nix: Add a passed-thru modDirVersion attribute
With the new kernel versioning scheme, the first release in a series only has a version number and
a major revision number (e.g. linux 3.0, linux 3.1-rc1, etc.). Unfortunately, the module
directory for these kernels still has a minor revision number (e.g. lib/modules/3.0.0, lib/modules/3.0.1-rc1, etc.).
This causes problems for packages such as broadcom_sta that need to know the module directory, so
this attribute will allow setting the module directory version number separate from the
kernel version number when necessary.

svn path=/nixpkgs/trunk/; revision=28405
2011-08-08 20:49:49 +00:00
Michael Raskin 56cf7dfe4a Two options allegedely required for ath9k detection in Linux 3.0+. Without them nothing works, checked.
svn path=/nixpkgs/trunk/; revision=28404
2011-08-08 20:49:32 +00:00
Eelco Dolstra 9049a3000d * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=28403
2011-08-08 19:55:14 +00:00
Peter Simons 98b321e99b pkgs/development/compilers/ghc: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=28402
2011-08-08 19:47:31 +00:00
Peter Simons e2cfe51f21 pkgs/development/compilers/ghc: move the homepage attribute into the meta section
svn path=/nixpkgs/trunk/; revision=28401
2011-08-08 19:47:21 +00:00
Andres Löh 23e5a11a1d Updated a few Haskell packages.
svn path=/nixpkgs/trunk/; revision=28399
2011-08-08 19:02:17 +00:00
Andres Löh c30ea08c40 Removed unnecessary comment.
svn path=/nixpkgs/trunk/; revision=28398
2011-08-08 18:30:42 +00:00
Andres Löh 3ceaaeb540 Handle extensible-exceptions correctly.
svn path=/nixpkgs/trunk/; revision=28397
2011-08-08 18:29:11 +00:00
Andres Löh e3c96cf984 Updates a few package descriptions.
svn path=/nixpkgs/trunk/; revision=28394
2011-08-08 15:01:41 +00:00
Andres Löh f8880709d7 Added more high-level attributes to cabal.nix.
svn path=/nixpkgs/trunk/; revision=28392
2011-08-08 14:12:07 +00:00