Commit graph

47120 commits

Author SHA1 Message Date
Joachim Schiele 6c2763c3bf Merge pull request #3568 from qknight/pdfgrep
pdfgrep: added a nice util to search in pdf files
2014-08-13 20:03:53 +02:00
Joachim Schiele 79617c03eb pdfgrep: added a nice util to search in pdf files 2014-08-13 20:03:04 +02:00
Peter Simons a38ae3c936 Merge pull request #3567 from phunehehe/haskellnet
add HaskellNet
2014-08-13 16:58:21 +02:00
Hoang Xuan Phu f7a460af14 add HaskellNet 2014-08-13 21:55:11 +08:00
Peter Simons cdabab5b28 Merge pull request #3555 from tomberek/haskell_hplayground
Haskell hplayground
2014-08-13 15:39:07 +02:00
Aycan iRiCAN 241bb984b1 Merge pull request #3564 from ttuegel/haskell
Add haskell-formatting-5.2
2014-08-13 15:18:11 +03:00
Thomas Tuegel 631f8cacb0 Add haskell-formatting-5.2 2014-08-13 06:58:37 -05:00
Aycan iRiCAN a2cc5f7cbb Merge pull request #3561 from Fuuzetsu/haskell-updates
Jailbreak some rest packages
2014-08-13 14:56:33 +03:00
Mateusz Kowalczyk fc5c0ffc54 haskell-rest-gen: jailbreak 2014-08-13 12:43:12 +01:00
Mateusz Kowalczyk 7794ad39b7 haskell-rest-core: jailbreak 2014-08-13 12:33:51 +01:00
Mateusz Kowalczyk 408473b406 Regenerate few packages with cabal2nix 2014-08-13 12:32:56 +01:00
Rickard Nilsson c00ab086d5 remarkjs: Update from 0.6.4 to 0.6.5 2014-08-13 12:03:51 +02:00
Rickard Nilsson baafb5b8cd vimb: Update from 2.4 to 2.6 2014-08-13 12:03:24 +02:00
Rickard Nilsson 4ddc38f50a mopdiy-moped: Update from 0.3.1 to 0.3.3 2014-08-13 12:03:03 +02:00
Rickard Nilsson 3553798cfb mopdiy: Update from 0.19.0 to 0.19.3 2014-08-13 12:02:34 +02:00
Vladimír Čunát f5d6c9f252 tboot: restrict to one platform 2014-08-13 09:52:34 +02:00
Domen Kožar b1b5eb8bed Merge pull request #3557 from abhinav/master
pythonPackages.httpbin: Add version 0.2.0
2014-08-13 09:25:33 +02:00
Austin Seipp 6bd1b35509 arcanist: 20140717 -> 20140812
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-12 21:52:35 -05:00
Abhinav Gupta 6e886678d1 pythonPackages.httpbin: Add version 0.2.0 2014-08-12 19:31:24 -07:00
tomberek 0e24703c5b Add haste-perch for hplayground 2014-08-12 20:45:22 -04:00
tomberek e3ad8ba4be Adds hplayground, needs hastePerch 2014-08-12 20:37:22 -04:00
Vladimír Čunát 48c5574f5a webkitgtk: minor update 2014-08-13 00:20:46 +02:00
Vladimír Čunát 0cf57c0ed0 gstreamer: update to 1.4.0, along with other bumps 2014-08-13 00:19:43 +02:00
Vladimír Čunát b07f646613 gst-1 gnonlin and editing-services: maintenance update 2014-08-12 22:35:49 +02:00
Vladimír Čunát 3f6d1d08f2 gst_1 python: bugfix update 2014-08-12 22:18:25 +02:00
Vladimír Čunát 6a164e24ae gst_1 base plugins: enableParallelBuilding
This package seems to be quite a bottleneck otherwise.
2014-08-12 22:17:38 +02:00
Vladimír Čunát d66c0a55da merge #3342: update gstreamer to 1.4.0 2014-08-12 22:15:42 +02:00
Vladimír Čunát 9e31a33a44 merge #3330: ocaml: optionalize useX11, update -pcre 2014-08-12 21:55:12 +02:00
Vladimír Čunát 08f5932729 ocaml: refactor the useX11 check to actually work 2014-08-12 21:53:02 +02:00
Vladimír Čunát 141b5d961f Merge master into PR
Conflicts:
	pkgs/development/compilers/ocaml/4.01.0.nix
2014-08-12 21:52:20 +02:00
drozv 33fec9d04d ocaml: fix x11 include and lib parameters for configure script
Close #2923, fixes #2922.
2014-08-12 21:41:37 +02:00
Domen Kožar 8c50807c4d dunst: git -> 1.1.0 2014-08-12 21:23:44 +02:00
Jascha Geerds bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Vladimír Čunát c78e6df8e0 Merge #3251: fix hugin and enblend-enfuse by updating
A few fixups included.
2014-08-12 21:19:41 +02:00
Vladimír Čunát df76cbaa21 hugin, enblend-enfuse: enbaleParallelBuilding, default boost
Also unset meta.broken.
2014-08-12 21:17:53 +02:00
Vladimír Čunát 54c18db1ca Merge master into this PR 2014-08-12 21:16:47 +02:00
Harald van Dijk 67a5ec4efb nixos/lighttpd: fix modules for gitweb
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.

[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Vladimír Čunát 56f409a446 glmark2: style fixups 2014-08-12 20:58:36 +02:00
Vladimír Čunát a3d33de16a Merge #3248: add glmark2-2014.03 2014-08-12 20:53:11 +02:00
Vladimír Čunát 566058b477 Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
Vladimír Čunát e80f41f35e Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval
More helpful message when refusing to evaluate "broken" package
2014-08-12 20:18:10 +02:00
Vladimír Čunát bcdbbf3ea1 Merge #2129: add trusted computing components 2014-08-12 19:43:34 +02:00
AndersonTorres 526edcaf15 Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
Vladimír Čunát abd361173a PR fixups: use mirror://, drop unused params, etc.
Note: hash of trousers tarball didn't match (anymore),
so I updated it to the one from sourceforge.
It's probably some safe and tiny retrospective update.
2014-08-12 19:42:23 +02:00
Vladimír Čunát 87c3c0e885 Merge master into #2129
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Oliver Charles 4e2adbeb4d haskellPackages.bound: New expression 2014-08-12 18:11:33 +01:00
Vladimír Čunát 665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
2014-08-12 19:08:53 +02:00
Vladimír Čunát 905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName"
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
2014-08-12 19:05:54 +02:00
John Wiegley 01ecaf98a5 haskell-lambdabot: only mark as broken for GHC 7.8.3 2014-08-12 11:53:01 -05:00
John Wiegley 62ceaca0b9 haskell-djinn: only mark as broken for GHC 7.8.3 2014-08-12 11:52:38 -05:00