Commit graph

45546 commits

Author SHA1 Message Date
Vincent Laporte
f16124d521 Adds merlin
Merlin is an editor-independant tool to ease the developpement of
programs in OCaml. It aims to provide features available in modern IDEs.

Homepage: http://the-lambda-church.github.io/merlin/
2014-07-05 17:33:55 +02:00
Bjørn Forsman
e658ae9694 Revert "haskell-gtkglext: update to version 0.12.5.0"
Because it breaks nixpkgs evaluation:

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0':
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13:
infinite recursion encountered

This reverts commit 6ba32aa8bd.
2014-07-05 16:12:06 +02:00
Rok Garbas
f3439fcfd4 Revert "nodePackages.couchapp: added & and node packages updated"
This reverts commit 8cf2cd5d11.
2014-07-05 14:30:53 +01:00
cillianderoiste
dd826b86a8 Merge pull request #3186 from geerds/plasma-nm
Packaging plasma-nm and its dependencies
2014-07-05 15:24:37 +02:00
Bjørn Forsman
ae5501f44e Fix nixpkgs evaluation
'banshee' doesn't exist (yet) in nixpkgs. I think it was accidentally
added in commit 5dc9730a63 (gnome-music
3.12: add totem-pl-parser to dependencies).
2014-07-05 15:00:01 +02:00
Bjørn Forsman
3950f2582d openocd: fix symlink to udev rules file
I made an error last time I touched this line. Fix it (.udev => .rules).
2014-07-05 14:56:10 +02:00
Jascha Geerds
28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Luca Bruno
5dc9730a63 gnome-music 3.12: add totem-pl-parser to dependencies 2014-07-05 13:52:29 +02:00
Luca Bruno
ac711a705e dfeet: fix icons 2014-07-05 12:18:17 +02:00
Oliver Charles
6365987e53 Merge pull request #3178 from tomberek/haskell_hastePerch
Haskell haste perch
2014-07-05 10:59:22 +01:00
Oliver Charles
2fc5d3c243 Merge pull request #3181 from vbgl/yojson
Adds yojson.
2014-07-05 10:58:47 +01:00
Rok Garbas
fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Vincent Laporte
9256136635 Adds yojson.
Yojson is an optimized parsing and printing OCaml library for the JSON
format, contributed by Martin Jambon.

Webpage: http://mjambon.com/yojson.html
2014-07-05 09:00:12 +02:00
John Wiegley
67e4df75dd Revert "mutt: update to 1.5.23"
This reverts commit 6a7d60c01a.
2014-07-04 15:48:14 -05:00
Michael Raskin
01d9778625 Update boinc 2014-07-04 22:18:49 +04:00
Michael Raskin
94e11b2f91 Update autocutsel 2014-07-04 21:51:43 +04:00
Michael Raskin
b243ef6bef maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
Michael Raskin
cb84c4d6a4 babeld: update from 1.4.3 to 1.5.0 2014-07-04 21:45:07 +04:00
Michael Raskin
5aef461e72 asio: update from 1.10.1 to 1.10.2 2014-07-04 21:42:48 +04:00
Michael Raskin
3329d68199 aria2: update from 1.18.1 to 1.18.5 2014-07-04 21:42:31 +04:00
Michael Raskin
0b9a382fc8 Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions 2014-07-04 21:42:14 +04:00
Michael Raskin
db88d93335 accountsservice: update from 0.6.35 to 0.6.37 2014-07-04 21:36:12 +04:00
Michael Raskin
57890e2921 Mark allegro as allegro-4.* 2014-07-04 21:33:59 +04:00
Michael Raskin
5e066f9741 Update acpi_call 2014-07-04 21:30:11 +04:00
Michael Raskin
ca6dba33ad Add Botan unstable branch - 1.11.9 release 2014-07-04 21:23:09 +04:00
tomberek
ce5c883ecf jailbreak haste-perch for base==4.6 req 2014-07-04 12:16:12 -04:00
Rickard Nilsson
03a3246bc1 Merge pull request #3177 from ip1981/master
Updated Mediawiki to 1.23.1
2014-07-04 18:11:32 +02:00
Igor Pashev
d4a320cd12 Updated Mediawiki to 1.23.1 2014-07-04 17:34:37 +02:00
lethalman
fa825c32da Merge pull request #3170 from vbgl/biniou
Adds biniou
2014-07-04 15:40:41 +02:00
Pascal Wittmann
a628da8b64 Update dwb to latest revision 2014-07-04 15:20:08 +02:00
tomberek
36426f2b49 Initial additions 2014-07-04 09:10:57 -04:00
Peter Simons
f5a5f46b57 haskell-hlint: update to version 1.9 2014-07-04 12:04:22 +02:00
Peter Simons
576d0c5210 haskell-websockets: update to version 0.8.2.5 2014-07-04 12:04:22 +02:00
Peter Simons
25e16e9f20 haskell-webdriver: update to version 0.5.5 2014-07-04 12:04:22 +02:00
Peter Simons
e1811c9e3b haskell-web-routes: update to version 0.27.6 2014-07-04 12:04:22 +02:00
Peter Simons
a841fef097 haskell-vty-ui: update to version 1.7.1 2014-07-04 12:04:22 +02:00
Peter Simons
975696ea3d haskell-twitter-conduit: update to version 0.0.5.1 2014-07-04 12:04:22 +02:00
Peter Simons
a4a2aafcee haskell-th-desugar: update to version 1.4.1 2014-07-04 12:04:21 +02:00
Peter Simons
9c67107c4f haskell-tasty: update to version 0.8.1.2 2014-07-04 12:04:21 +02:00
Peter Simons
efd0fa6e5a haskell-tasty-th: update to version 0.1.2 2014-07-04 12:04:21 +02:00
Peter Simons
1f239b2a10 haskell-tasty-golden: update to version 2.2.2.3 2014-07-04 12:04:21 +02:00
Peter Simons
3e8934f801 haskell-syntactic: update to version 2.0 2014-07-04 12:04:21 +02:00
Peter Simons
3be3743e3c haskell-storable-record: update to version 0.0.3 2014-07-04 12:04:21 +02:00
Peter Simons
d0c41893b6 haskell-shakespeare: update to version 2.0.1 2014-07-04 12:04:21 +02:00
Peter Simons
7bb9fbb2f0 haskell-semigroups: update to version 0.15.1 2014-07-04 12:04:21 +02:00
Peter Simons
75b9298e54 haskell-safe: update to version 0.3.5 2014-07-04 12:04:20 +02:00
Peter Simons
6da8c3ab74 haskell-random-fu: update to version 0.2.6.0 2014-07-04 12:04:20 +02:00
Peter Simons
39573f8ad1 haskell-purescript: update to version 0.5.2.5 2014-07-04 12:04:20 +02:00
Peter Simons
9f9dcadb64 haskell-pipes-text: update to version 0.0.0.12 2014-07-04 12:04:20 +02:00
Peter Simons
2c5e3a9b42 haskell-monad-loops: update to version 0.4.2.1 2014-07-04 12:04:20 +02:00