Commit graph

57036 commits

Author SHA1 Message Date
Pascal Wittmann
40d7ec4170 Merge pull request #5906 from aaronlevin/patch-2
Bump jwt version to 0.5.3
2015-01-23 20:23:03 +01:00
Peter Simons
5f4e8dc810 haskell-hxt: fix the build by disabling the Haddock phase 2015-01-23 18:55:16 +01:00
Peter Simons
5776d0819d haskell-boundingboxes: disable failing test suite 2015-01-23 18:55:16 +01:00
Peter Simons
9a2f2e713c haskell-network-transport-zeromq: disable failing test suite 2015-01-23 18:55:16 +01:00
Peter Simons
0a2c7b4f9f haskell-paypal-adaptive-hoops: the test suite has been fixed in the latest version
Fixes https://github.com/fanjam/paypal-adaptive-hoops/issues/5.
2015-01-23 18:55:16 +01:00
Peter Simons
163a51dc67 haskell-lss: the package is deprecated (and won't build either) 2015-01-23 18:55:16 +01:00
Peter Simons
37c8cbd92f hackage-packages.nix: re-generate from Hackage 2015-01-23T17:16:39+0100
Fixes https://github.com/NixOS/nixpkgs/issues/5920.
2015-01-23 18:55:16 +01:00
Austin Seipp
d1b06927bc nixpkgs: z3 4.3.1 -> 4.3.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-23 11:00:55 -06:00
Austin Seipp
7581c422d4 nixpkgs: afl 1.06b -> 1.21b
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-23 10:46:10 -06:00
Austin Seipp
12934d44be nixpkgs: arcanist 20140924 -> 20150118
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-01-23 10:42:23 -06:00
Wout Mertens
ac9c450a62 Merge pull request #5921 from matejc/fixfixnixui
nixui: do not use pkgs.path
2015-01-23 17:32:09 +01:00
Matej Cotman
4212dcabd9 nixui: do not use pkgs.path 2015-01-23 17:28:04 +01:00
Sander van der Burg
6df95597ed titaniumenv: Fix unpack step and change default iOS SDK to 8.1 2015-01-23 15:57:34 +00:00
Eelco Dolstra
11a0344e13 Merge pull request #5918 from robberer/openntpd
openntpd: add extraConfig and extraOptions
2015-01-23 16:43:15 +01:00
Longrin Wischnewski
4fa5d1f626 openntpd: add extraConfig and extraOptions 2015-01-23 16:15:20 +01:00
Lluís Batlle i Rossell
84e9a2e636 Adding a pgf command line tool.
(cherry picked from commit 442148e20a031714b03a41eb44f343f6ad088fc6)
2015-01-23 16:09:33 +01:00
Lluís Batlle i Rossell
031af8f0cf Making freeimage build and install freeimageplus too.
I need it for the pgf command line tool (next commit)

(cherry picked from commit f6856be9eefc5785b7c38e7398106d9a220f2a37)
2015-01-23 16:09:31 +01:00
Wout Mertens
e7765fbc7d Merge branch 'matejc-fixnixui'
closes #5917
2015-01-23 16:00:06 +01:00
Wout Mertens
70ac34b8c0 nixui: include build files 2015-01-23 15:59:10 +01:00
Wout Mertens
4c2554ebf4 Remove nixui to fix travis failures 2015-01-23 15:49:57 +01:00
Wout Mertens
71e107acac Set nixui to broken
See 264ed82eda (commitcomment-9416066)
2015-01-23 15:37:54 +01:00
Peter Simons
3b35ae7a73 cryptol: update 2.x branch to version 2.1.0 and remove broken 1.x build 2015-01-23 13:24:40 +01:00
Peter Simons
48a20a63ce haskell-alex: fix build with GHC 7.10.1-rc1 (by disabling the failing test suite) 2015-01-23 13:24:40 +01:00
Edward Tjörnhammar
770e73ee6e Merge pull request #5893 from qknight/meld_upgrade
meld: bump to 3.12.3 (latest) version
2015-01-23 13:06:54 +01:00
Edward Tjörnhammar
54908bc9c2 Merge pull request #5898 from DamienCassou/asynk-1.1.0
Add asynk
2015-01-23 12:47:57 +01:00
Damien Cassou
3886e1c93d Add asynk 2015-01-23 12:44:10 +01:00
Eelco Dolstra
480602bea1 blender: Update to 2.73a 2015-01-23 12:20:17 +01:00
Peter Simons
d3296a4542 haskell-configuration-common: clean up 2015-01-23 11:32:49 +01:00
Peter Simons
d49671c924 haskell-ng.lib: add markBrokenVersion and appendPatch helper functions 2015-01-23 11:32:48 +01:00
Peter Simons
80518eab94 haskell-configuration-ghc-7.8.x: clean up amazonkaEnv 2015-01-23 11:32:48 +01:00
Peter Simons
3318c403f1 pandoc: switch to haskell-ng package set, which is more up-to-date 2015-01-23 11:32:42 +01:00
lethalman
9fda93cc5d Merge pull request #5909 from echo-oddly/fresc
frescobaldi: add pygame dependency for midi support
2015-01-23 11:17:22 +01:00
Lluís Batlle i Rossell
205e338a83 Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1cd28801c69c4c28a0e320de0500787)
2015-01-23 10:30:16 +01:00
Lluís Batlle i Rossell
8dd230aa09 Updating cjdns to protocol version 14 2015-01-23 09:35:13 +01:00
Vincent Laporte
78f93c3de2 Adds ocaml-hex
Mininal OCaml library providing hexadecimal converters.

Homepage: https://github.com/mirage/ocaml-hex
2015-01-23 09:22:14 +01:00
Peter Simons
69cda1a7c0 haskell-generic-builder: set locale to "UTF-8" in nix-shell environments
The package builder did this already, but I forgot to add the setting in
the interactive environment.

Fixes https://github.com/NixOS/nixpkgs/issues/5904.
2015-01-23 08:19:46 +01:00
taku0
267ea498b6 oraclejdk: bump to 8u31, 7u75, and 7u76 2015-01-23 15:44:22 +09:00
David Virgilio
0075e6bd3a frescobaldi: add pygame dependency for midi support 2015-01-22 23:34:10 -06:00
Brendan Long
51902ba32d go: Update to version 1.4.1.
Also had to fix the code that was trying to make sure the go-* folders get renamed to just "go".

Resolves #5797
2015-01-22 21:49:41 -05:00
Charles Strahan
b6f9975b6a nix-prefetch-zip: unset $name
nix-shell leaks $name, breaking nix-prefetch-zip.
2015-01-22 21:18:16 -05:00
Peter Simons
7149878010 git-annex: switch attribute over to haskell-ng package set some more 2015-01-22 23:29:09 +01:00
Peter Simons
5adc98cc50 git-annex: switch attribute over to haskell-ng package set, which is more up-to-date 2015-01-22 23:25:40 +01:00
Peter Simons
1e9753c613 haskell-control-monad-free: revert to version 0.5.x to fix the build
The 0.6.x version doesn't compile with anything but GHC 7.8.4.
2015-01-22 23:25:39 +01:00
Peter Simons
843aee694d haskell-utf8-string: fix build with ghc 6.12.x
The "sed" command stopped working recently. I have no idea why, but the
new patch is simpler anyway.
2015-01-22 23:25:39 +01:00
Peter Simons
b96edd41a5 Merge pull request #5844 from krisajenkins/elm
Updating Elm packages.
2015-01-22 22:49:27 +01:00
Peter Simons
d975c1ef93 Merge pull request #5843 from krisajenkins/shake
Fixing and updating shake, the haskell make-alike.
2015-01-22 22:49:07 +01:00
Peter Simons
d1dc080f7c Merge pull request #5790 from k0ral/lifted-async
monad-control: 0.3.3.0 -> 1.0.0.1 + reverse dependency upgrades.

Feel free to revert if this patch turns out to be a bad idea!
2015-01-22 22:47:25 +01:00
Peter Simons
267361434b haskell-ng: fix some builds (mostly by disabling their failing test suites) 2015-01-22 22:40:21 +01:00
Peter Simons
82d814d1e9 haskell-vty: disable test suite to avoid ICE in GHC 7.8.4
Fixes https://github.com/NixOS/nixpkgs/issues/5900.
2015-01-22 22:40:21 +01:00
Peter Simons
56616ec099 haskell-ng: move configuration know-how out of cabal2nix and into Nixpkgs 2015-01-22 22:40:21 +01:00