3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12311 commits

Author SHA1 Message Date
Vladimír Čunát 97006eb5ed Merge #2638: fix weechat build on darwin
Conflicts (trivial):
	pkgs/development/python-modules/pycrypto/default.nix
2014-06-09 19:37:06 +02:00
Rob Vermaas cf3a2d0475 Add vtop, update some node packages. 2014-06-09 13:38:04 +02:00
Peter Simons 473ab2b362 haskell-vector: add version 0.10.11.0 2014-06-09 13:00:33 +02:00
Peter Simons 164c81be84 haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it 2014-06-09 13:00:33 +02:00
John Wiegley 1986a10d41 cabal-db: new expression 2014-06-09 03:58:52 -05:00
Peter Simons 20da5ecc9c haskell-parsers: update to version 0.11.0.2
Unfortunately, there are still build errors with this package (see
https://github.com/ekmett/parsers/issues/39). We need the latest
version, though, because older ones won't work with the latest
attoparsec.
2014-06-09 10:27:00 +02:00
Mateusz Kowalczyk 3287542c57 haskell-vty: add version 5.1.0 2014-06-09 10:27:00 +02:00
Mateusz Kowalczyk f481b682b6 test-framework-smallcheck: 0.2 2014-06-09 10:27:00 +02:00
Thomas Bereknyei 766d934090 haskell-cabal-cargs: add version 0.6.1 2014-06-09 10:27:00 +02:00
Peter Simons 40eb5a5f73 haskell-system-fileio: require Cabal >= 1.8 2014-06-09 10:27:00 +02:00
Peter Simons b134e2a0fd haskell-defaults.nix: don't provide singletons on pre-7.8.x platforms 2014-06-09 10:27:00 +02:00
Peter Simons c7a18e326f Stick to transformers 0.3.x everywhere; the new versions breaks just about every other package that we have. 2014-06-09 10:26:59 +02:00
Peter Simons 1d50ed522a haskell-system-filepath: require at least Cabal 1.8 to build 2014-06-09 10:26:59 +02:00
Peter Simons 9dd2b3c651 haskell-shelly: move version override to haskell-defaults.nix 2014-06-09 10:26:58 +02:00
Peter Simons 3584bfe0fd haskell-cabal-dev: remove obsolete package
All cabal-dev functionality has been merged into cabal-install.
2014-06-09 10:26:58 +02:00
Peter Simons 4f2992c3fa Switch GHC 6.10.x to network 2.2.x because newer versions give buffering errors (according to the Cabal file from HTTP, which excludes newer versions from building) 2014-06-09 10:26:58 +02:00
Peter Simons c027434f9f haskell-HTTP: don't add a global 'network' override for HTTP 4000.2.5 2014-06-09 10:26:58 +02:00
Peter Simons d07125a0d9 haskell-transformers-compat: provide different versions for GHC 7.8.2 and below
transformers is a core library in GHC 7.8.2, so that compiler is stuck
with an older version of the -compat library.
2014-06-09 10:26:58 +02:00
Peter Simons 035192b813 haskell-alternative-io: drop obsolete package 2014-06-09 10:26:58 +02:00
Peter Simons 1d392a56ae Update the default version of transformers to 0.4.1 on older compilers. 2014-06-09 10:26:56 +02:00
Peter Simons 5190b18caa haskell-attoparsec: update to version 0.12.0.0 2014-06-09 10:26:56 +02:00
Peter Simons 3376d02e31 haskell-text: add version 1.1.1.3 (and delete unused versions 0.11.1.13 and 0.1.1.2) 2014-06-09 10:26:56 +02:00
Peter Simons 6358b15985 haskell-mtl: update to version 2.2.1 (and delete unused versions 1.1.1.1 and 2.1.3.1) 2014-06-09 10:26:56 +02:00
Peter Simons 64f4186735 haskell-vector: update version to 0.10.9.3 2014-06-09 10:26:56 +02:00
Peter Simons 1a29d1bc3c haskell-HTTP: update to version 4000.2.17 2014-06-09 10:26:56 +02:00
Peter Simons 66044974b4 haskell-QuickCheck: update to version 2.7.5 2014-06-09 10:26:56 +02:00
Peter Simons c9672d767f haskell-Cabal: update to version 1.20.0.1 2014-06-09 10:26:56 +02:00
Michael Raskin 4b68be6d90 Merge pull request #2876 from auntieNeo/typespeed
Add package for Typespeed game
2014-06-09 12:11:23 +04:00
Michael Raskin 2884f2c273 Merge pull request #2507 from lovek323/sup
sup: update to 0.18.0
2014-06-09 11:25:48 +04:00
Oliver Charles 24cb0fd3a8 Merge pull request #2874 from tomberek/haskell_add_MFlow
Add MFlow and dependencies
2014-06-09 08:25:26 +01:00
Michael Raskin ba0cc81737 Merge pull request #2858 from offlinehacker/nixos/atom/add
Add github atom, a hackable text editor for the 21st Century
2014-06-09 09:47:09 +04:00
Michael Raskin 32b5e72501 Merge pull request #2866 from scubed2/fceux
fceux: Add package for a NES emulator.
2014-06-09 09:44:53 +04:00
Michael Raskin c3721774cf Merge pull request #2872 from wkennington/master.kernel
Kernel 3.15 Update
2014-06-09 09:40:37 +04:00
Thomas Bereknyei cd4041b905 Add MFlow and dependencies 2014-06-08 23:49:02 -04:00
Jonathan Glines 5a8457d25e Oops, got nitrogen and typespeed branches mixed up. 2014-06-08 17:37:28 -06:00
Jonathan Glines 7386e9f171 Merge branch 'master' into typespeed 2014-06-08 17:32:27 -06:00
William A. Kennington III 8bb2313915 kernel: Add 3.15 2014-06-08 16:39:47 -05:00
Michael Raskin c2fb8b1364 Addnig a package to copy nix-prefetch-* to bin/. Hopefully fixes #1130 2014-06-09 01:11:03 +04:00
John Wiegley e18b59540c haskell-bytes: new expression 2014-06-08 04:18:46 -05:00
cillianderoiste fc91b87dd3 Merge pull request #2762 from pSub/llpp
Added llpp, a mupdf based pdf pager written in ocaml.
2014-06-08 11:17:15 +02:00
Michael Raskin 25351ddf70 Use the libav version compatible with our gstreamer version 2014-06-08 12:20:47 +04:00
John Wiegley c6261157f8 prooftree: new expression 0.12 2014-06-08 05:35:49 +00:00
Sterling Stein a0efad6861 fceux: Add package for a NES emulator. 2014-06-07 15:08:57 -07:00
John Wiegley 34495b67ce haskell-data-checked: new expression 2014-06-07 16:38:55 -05:00
John Wiegley 10d1fd0457 crafty: simplify expression 2014-06-07 20:17:47 +00:00
John Wiegley 0fcd4f98ff haskell-fuzzcheck: new expression 2014-06-07 20:17:46 +00:00
John Wiegley 03bd5f9f44 Merge pull request #2856 from cstrahan/macvim
add MacVim
2014-06-07 15:16:48 -05:00
Charles Strahan 72cd8ce56c add MacVim 2014-06-07 15:26:01 -04:00
Jussi Maki 393923a869 graphite-web: Fix webapp content path 2014-06-07 16:47:00 +02:00
Jaka Hudoklin 905081c029 Add github atom, a hackable text editor for the 21st Century 2014-06-07 12:46:51 +02:00