Eelco Dolstra
922af7f158
libsndfile: Fix build on Darwin
...
Fixes #3347 .
2014-07-23 11:00:41 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
adc2edd5cf
thunderbird: major update 17.* -> 31.0
...
- To fix build problems, I refactored the build process
according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).
CC @nbp @edolstra
2014-07-22 22:18:24 +02:00
Vladimír Čunát
644c9eb6f7
Revert "Merge #3054 : add kde 4.13.2"
...
This is due to breaking evaluation; see the PR discussion.
This reverts commit 6a77d5fd3e
, reversing
changes made to 07a09fbe63
.
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Sven Keidel
ee9ffde1cb
added metainformation for gpodder and mygpoclient
2014-07-21 21:41:27 +02:00
Pascal Wittmann
5156b5d11d
Merge pull request #3260 from linquize/gbdfed
...
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c
openopc: new package
...
"OPC (OLE for Process Control) toolkit designed for use with Python"
This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.
It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.
Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).
http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
lethalman
5cde295b1d
Merge pull request #3327 from svenkeidel/gpodder
...
added gpodder package
2014-07-21 18:37:28 +02:00
Shea Levy
430bf4719e
Add plugins haskell package
2014-07-21 09:44:39 -04:00
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
34cade2c9c
mplayer2: switch to libav to fix build
...
CC @viric . If someone has a better suggestion, do it.
IMHO the main problem is the lack of maintenance
from the side of mplayer2, e.g. latest release >3 years ago.
2014-07-21 09:57:48 +02:00
Sven Keidel
eeeed00950
added gpodder package
2014-07-20 21:14:00 +02:00
Pascal Wittmann
52cf78ef22
added cv: Tool that shows the progress of coreutils programs
2014-07-20 15:45:19 +02:00
Pascal Wittmann
c7add6c270
Merge pull request #3317 from Mathnerd314/prelink
...
Add prelink package
2014-07-20 14:03:12 +02:00
Aycan iRiCAN
de155d13da
Merge pull request #3227 from hrdinka/haskell-stm-containers
...
haskell-stm-containers: add package version 0.1.2 and its dependencies
2014-07-19 11:47:42 +03:00
Aycan iRiCAN
bfe2e05925
Merge pull request #3319 from luke-clifton/master
...
Added cgrep utility.
2014-07-19 11:43:06 +03:00
Aycan iRiCAN
f057f06136
resolved conflicts
2014-07-19 11:25:30 +03:00
Aycan iRiCAN
9489105aca
Merge branch 'haskellPackages.rest'
2014-07-19 11:18:18 +03:00
Luke Clifton
2fbd9e07f2
Added cgrep utility.
2014-07-19 12:21:15 +08:00
Mathnerd314
dd325fa30c
Add prelink package
2014-07-19 02:16:41 +02:00
John Wiegley
ad31933ec4
haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically
2014-07-18 18:02:09 -05:00
Eelco Dolstra
3282de17fd
Revert "titanium: Bump to 3.3.0"
...
This reverts commit 4426b8a3a1
. It
causes an infinite recursion during Nixpkgs evaluation:
http://hydra.nixos.org/build/12608698
(@svanderburg)
2014-07-18 23:49:33 +02:00
Peter Simons
489923be2a
parsers-0.12: don't use this version yet because it breaks trifecta
2014-07-18 17:30:49 +02:00
Peter Simons
ebed71f440
aeson: don't use version 0.8 yet because it breaks too many packages at the moment
2014-07-18 17:30:49 +02:00
Peter Simons
8a2aa3ccac
haskell-parsers: add version 0.12
2014-07-18 17:30:49 +02:00
Peter Simons
2603db86d3
haskell-aeson: add version 0.8.0.0
2014-07-18 17:30:48 +02:00
Peter Simons
91c17543f2
haskell-QuickCheck: add version 2.7.6
2014-07-18 17:30:48 +02:00
Peter Simons
125aeed5a0
haddock: update to version 2.14.3
2014-07-18 17:30:48 +02:00
Sander van der Burg
4426b8a3a1
titanium: Bump to 3.3.0
2014-07-18 16:48:38 +02:00
lethalman
5ef6745be3
Merge pull request #3278 from sztupi/vagrant
...
vagrant: upgrade to 1.6.3
2014-07-18 14:35:55 +02:00
Peter Simons
33b3afca91
Merge pull request #3312 from bennofs/haskell-applicative-quoters
...
haskell-applicative-quoters: new expression
2014-07-18 11:40:22 +02:00
Matej Cotman
1afb26fb17
e18: enlightenment desktop manager version 18
2014-07-17 23:00:38 +02:00
Benno Fünfstück
5fa3754813
haskell-applicative-quoters: new expression
2014-07-17 21:48:06 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00
Eugene Akentyev
08ca4e2d59
Add Light Table editor.
2014-07-17 12:25:22 +02:00
William A. Kennington III
830f3b6b55
efivar: Add derivation
2014-07-17 11:40:37 +02:00
Daniel Austin
62f01119f3
Enable expressions for 'important' parts of the rest framework from Silk.co
2014-07-17 07:36:46 +02:00
Shea Levy
b969e9340b
Separate fetchgitPrivate into a separate file
2014-07-16 18:05:56 -04:00
Eelco Dolstra
94db68d283
Move jdk -> oraclejdk
2014-07-16 18:35:35 +02:00
Peter Simons
9d457ec228
Merge pull request #3282 from aycanirican/jmacro
...
Added haskelPackages.jmacro-*
2014-07-16 12:10:51 +02:00
Peter Simons
93464d88b0
Merge pull request #3293 from codygman/blaze-from-html
...
blaze-from-html: add version 0.3.2.1
2014-07-16 12:07:42 +02:00
Peter Simons
06e38776d4
Merge pull request #3298 from MP2E/hi_import
...
Import the cabal new project template creator, "hi"
2014-07-16 12:03:07 +02:00
Rok Garbas
dd6f29f88c
Revert "Update titanium node package and others"
...
This reverts commit 7dce55d0fd
.
2014-07-16 10:46:04 +01:00
Cray Elliott
90392f6233
Import the haskell cabal template creator, "hi" from Hackage
...
note: depends on template
2014-07-16 01:13:09 -07:00
Cray Elliott
0e3f66d051
import Haskell template library from Hackage
2014-07-16 01:12:58 -07:00
Oliver Charles
952f3f6e8b
haskellPackages.ekgCarbon: New expression
2014-07-16 08:20:27 +01:00
Cody Goodman
5ba2e544d2
blaze-from-html: add version 0.3.2.1
2014-07-15 20:16:31 -05:00
Shea Levy
9087d03190
Add haskell-simple-conduit
2014-07-15 20:41:58 -04:00
Eelco Dolstra
2d8e880c82
blender: Update to 2.71
2014-07-15 23:31:55 +02:00