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
Peter Simons
7154e32f65
Dropped obsolete Haskell packages primitive-0.4.1, vector-0.9.1, and vector-0.10.
2013-06-19 10:42:42 +02:00
Oliver Charles
81b564b52e
haskellPackages: vector-0.9.1 fix 'primitive' dependency
2013-06-19 00:28:30 +01:00
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14:45 +02:00
Gergely Risko
7a602e5f86
Hackage: upgrade Chart to 0.17, timeplot to 1.0.21 and add Chart-gtk
2013-06-17 09:53:28 +02:00
Peter Simons
5a1e9a9cf2
haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4
2013-06-15 13:18:51 +02:00
Peter Simons
9c771de1a8
Agda: drop redundant overrides
2013-06-15 12:39:16 +02:00
Peter Simons
0f25c404bc
haskell-hashable: add version 1.2.0.10
2013-06-15 12:39:15 +02:00
Peter Simons
c0d78bf9a6
Merge pull request #621 from errge/xtest
...
Add haskell/xtest
2013-06-15 03:37:39 -07:00
Peter Simons
c7ee3ca11c
Merge pull request #622 from errge/hit
...
Add hit and (it's dependency,) bytedump
2013-06-15 03:37:12 -07:00
Peter Simons
c9192f5ed5
Merge pull request #624 from errge/template-default
...
Add template-default
2013-06-15 03:36:42 -07:00
Gergely Risko
fab2610bcf
Add vectorThUnbox
2013-06-14 13:09:11 +02:00
Gergely Risko
4d49435cf6
Add template-default
2013-06-14 13:04:40 +02:00
Gergely Risko
89f28c9923
Add hit and (it's dependency,) bytedump
2013-06-14 11:57:24 +02:00
Gergely Risko
efb46727cb
Add haskell/xtest
2013-06-14 11:35:52 +02:00
Peter Simons
7b3ebfe8c5
haskell-haddock: add version 2.13.2.1
2013-06-13 10:43:35 +02:00
Gergely Risko
c51077b222
Add hflags
2013-06-12 21:25:53 +02: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
Mathijs Kwik
02b539ef47
add hsshellscript
2013-06-10 08:36:05 +02:00
Evgeny Egorochkin
228ee94c88
Merge pull request #596 from ocharles/master
...
haskell-pipes: use camelCase to name pipes packages, rather than separating words with hyphens
2013-06-09 19:54:57 -07:00
Peter Simons
c9208b9a23
haskell-bmp: update to version 1.2.5.2
2013-06-07 23:25:28 +02:00
Oliver Charles
7d8b2ea857
haskell-pipes: use camelCase to name pipes packages, rather than separating words with hyphens
2013-06-06 14:39:09 +01:00
Mathijs Kwik
3f9723e02e
add idris wrapper
2013-06-05 23:30:38 +02:00
Peter Simons
0dfe09b6c9
haskell-bmp: update to version 1.2.5.1
...
GHC versions prior to 7.6.x cannot compile this version, so override the 'bmp'
attribute for those compilers to version 1.2.2.1 in haskell-defaults.nix.
2013-06-05 12:17:35 +02:00
Mathijs Kwik
187670c7da
add haskell/idris
2013-06-05 12:17:35 +02:00
Mathijs Kwik
3e0a25508c
add haskell/language-java
2013-06-05 12:17:35 +02:00
Mathijs Kwik
bf310f322e
add haskell/libffi
2013-06-05 12:17:35 +02:00
Oliver Charles
a4d69deca4
haskell-pipes: Add pipes-concurrency, pipes-parse and pipes-safe
2013-06-04 10:57:21 +01:00
Oliver Charles
cdba8df4d5
haskell-pipes: Add pipes 3.3.0
2013-06-04 10:52:25 +01:00
Peter Simons
7b21e19a82
git-annex: generate build instructions with cabal2nix
2013-06-03 22:09:34 +02:00
Peter Simons
081ca56cc9
haskell-yesod-platform: add version 1.2.0.1
2013-06-01 14:53:44 +02:00
Peter Simons
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +02:00
Peter Simons
4f6d1ad646
haskell-packages.nix: fix spelling of type-level-numbers attribute
2013-05-30 12:33:44 +02:00
Peter Simons
ff1dbd50b8
haskell-HFuse: fix capitalization of directory name
2013-05-30 12:33:43 +02:00
Peter Simons
709718a307
haskell-happstack-util: drop obsolete package
2013-05-30 12:33:43 +02:00
Peter Simons
fb45ff9994
haskell-binary: prefer the version from Hackage over that shipped with GHC
...
The binary package shipped with GHC is ancient, and some software (like
statistics and criterion) doesn't compile with it.
2013-05-30 12:33:43 +02:00
Peter Simons
8dbe2decf9
Switch default Haskell implementation to Haskell Platform 2013.2.0.0.
...
This makes GHC 7.6.3 is our default compiler.
2013-05-30 12:33:43 +02:00
Peter Simons
f902fe1f68
haskell-monad-par: drop obsolete version 0.3.4.1
2013-05-30 12:33:43 +02:00
Peter Simons
03b50b3335
haskell-monad-par: add version 0.3.4.2
2013-05-30 12:33:40 +02:00
Vladimír Čunát
43d4e53cd2
haskell: add pop3-client and smtp-mail (by cabal2nix)
2013-05-28 11:08:43 +02:00
Peter Simons
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +02:00
Peter Simons
32a4d191d0
haskell-dice: add version 0.1
2013-05-21 11:00:28 +02:00
Peter Simons
448dc95943
haskell-hstatsd: add version 0.1
2013-05-21 11:00:09 +02:00
Peter Simons
d85cf7e410
haskell-knob: add version 0.1.1
2013-05-21 10:59:57 +02:00
Peter Simons
1f01aa3ab5
haskell-misfortune: add version 0.1.1.1
2013-05-21 10:59:47 +02:00
Peter Simons
21c25b4c58
haskell-mueval: add version 0.9
2013-05-21 10:59:13 +02:00
Peter Simons
4ac14185f5
haskell-packages.nix: strip trailing whitespace
2013-05-21 10:58:57 +02:00
Petr Rockai
52f38ce5d6
haskell: Add alsa-core, alsa-pcm, ix-shapable, carray and sample-frame.
...
Conflicts (trivial):
pkgs/top-level/haskell-packages.nix
2013-05-18 13:35:14 +02:00
Petr Rockai
8151d9594b
Add "arbtt" along with its Haskell dependencies.
2013-05-18 13:35:13 +02:00
Peter Simons
5057310d07
haskell-lenses: add version 0.1.6
2013-05-16 13:40:34 +02:00