Vladimír Čunát
5979d428b4
Merge recent master into x-updates
...
Hydra: ?compare=1134869
Conflicts (just meta):
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Vladimír Čunát
73ad32e1d9
freetype: flatten include to fix several builds
...
I just wonder why freetype-2.5 needed to move headers around.
2014-07-09 22:03:31 +02:00
Vladimír Čunát
4b263946dd
qt3, graphicsmagick137, fox, neverball: fix build
...
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Vladimír Čunát
9a00938334
mesa: bugfix update
2014-07-09 20:47:47 +02:00
Vladimír Čunát
10fe63c05a
pixman: bugfix update, remove withPNG option
...
The option seemed useless.
2014-07-09 20:46:53 +02:00
Peter Simons
1ecae5c2c1
Merge pull request #3189 from aherrmann/pr_licenses
...
License meta-data for numexpr, tables, and szip
2014-07-07 11:33:47 +02:00
Peter Simons
27ff2eeb77
haskell-gtkglext: re-generate with cabal2nix
2014-07-07 11:15:16 +02:00
Peter Simons
357429247f
haskell-hlibgit2: re-generate with cabal2nix
2014-07-07 11:08:41 +02:00
John Wiegley
74d51f0b4e
Merge pull request #3197 from wavewave/gitlib
...
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2
2014-07-06 15:19:19 -05:00
Ian-Woo Kim
90dacd685d
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. Low/High-level API for git
2014-07-06 22:03:38 +02:00
Andreas Herrmann
af8ec93e6a
szip: Provide meta-data
...
The license is set to "unfree" as commercial use is not permitted by the
license [1].
[1]: http://www.hdfgroup.org/doc_resource/SZIP/Commercial_szip.html
2014-07-05 21:41:04 +02:00
Andreas Herrmann
0e1eac04bb
szip: Indentation
2014-07-05 21:41:04 +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
Jascha Geerds
28322c8d58
Packaging plasma-nm and its dependencies
2014-07-05 13:54:01 +02:00
Oliver Charles
6365987e53
Merge pull request #3178 from tomberek/haskell_hastePerch
...
Haskell haste perch
2014-07-05 10:59:22 +01:00
Michael Raskin
5aef461e72
asio: update from 1.10.1 to 1.10.2
2014-07-04 21:42:48 +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
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
tomberek
36426f2b49
Initial additions
2014-07-04 09:10:57 -04: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
Peter Simons
7df262edda
haskell-midi: update to version 0.2.1.3
2014-07-04 12:04:20 +02:00
Peter Simons
03cb18157b
haskell-lifted-base: update to version 0.2.3.0
2014-07-04 12:04:20 +02:00
Peter Simons
63f8f5ffc6
haskell-lens-family-core: update to version 1.1.0
2014-07-04 12:04:20 +02:00
Peter Simons
cdfb5207e1
haskell-jack: update to version 0.7.0.3
2014-07-04 12:04:19 +02:00
Peter Simons
a7fb91bd9d
haskell-http-streams: update to version 0.7.2.0
2014-07-04 12:04:19 +02:00
Peter Simons
5900e9bef0
haskell-http-client: update to version 0.3.4
2014-07-04 12:04:19 +02:00
Peter Simons
abe293fda1
haskell-hoauth2: update to version 0.4.1
2014-07-04 12:04:19 +02:00
Peter Simons
7959a4343b
haskell-happstack-server: update to version 7.3.7
2014-07-04 12:04:19 +02:00
Peter Simons
ca4c1edc1d
haskell-happstack-lite: update to version 7.3.4
2014-07-04 12:04:19 +02:00
Peter Simons
6ba32aa8bd
haskell-gtkglext: update to version 0.12.5.0
2014-07-04 12:04:19 +02:00
Peter Simons
b63dbe46d4
haskell-gitit: update to version 0.10.4
2014-07-04 12:04:19 +02:00
