Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Vladimír Čunát
6a29a56c12
qt4: parallel-build impurity fix
...
Modified to avoid unnecessary rebuilds.
2013-04-23 21:45:09 +02:00
Michael Raskin
bc623ee480
Merge pull request #471 from vcunat/p/xorg
...
xorg updates
2013-04-22 22:38:05 -07:00
Lluís Batlle i Rossell
2e8cab953a
libextractor: make gtk support work again
...
It wanted gtk3.
It does not understand gstreamer 0.10, though.
2013-04-22 20:57:14 +04:00
Peter Simons
1cc5307410
haskell-haskeline: drop obsolete version 0.6.4.7
2013-04-22 14:14:39 +02:00
Peter Simons
e4c7930b48
haskell-hashable-1.2.0.6: the test suite doesn't compile
2013-04-22 14:14:39 +02:00
Peter Simons
5a28754957
haskell-hashable: add version 1.2.0.6
2013-04-22 14:14:39 +02:00
Vladimír Čunát
5e4aa51173
poppler: share most things between glib and qt4 versions
...
Most of the stuff was duplicated (headers, the core library).
The new solution makes the _qt4 package use the _glib one,
because it depended on glib through cairo anyway
(and _glib bindings themselves are just ~350kB).
This also fixes a problem that mergeAttrsByFuncDefaultsClean
didn't merge patches, which affected dbus.libs.
2013-04-21 20:15:38 +00:00
Evgeny Egorochkin
7b9f0b27fe
bump Soprano to 2.9.0
2013-04-21 05:30:19 +03:00
Evgeny Egorochkin
6caebee4c0
bump openEXR to 1.7.1
2013-04-21 05:29:53 +03:00
Peter Simons
65b95b159e
haskell-checkers: add version 0.3.1
2013-04-20 20:36:57 +02:00
Peter Simons
7dd399abc1
haskell-wai-handler-launch: add version 1.3.1.4
2013-04-20 20:21:38 +02:00
Peter Simons
916aa90491
haskell-pretty-show: add old version 1.2, which still builds fine with GHC 7.0.4
2013-04-20 20:16:27 +02:00
Peter Simons
0345b1df70
haskell-shakespeare: patch to fix build with GHC 7.0.4
2013-04-20 20:16:27 +02:00
Peter Simons
b6e3a8dd08
haskell-zeromq3-haskell: update to version 0.3.1
2013-04-20 20:16:27 +02:00
Peter Simons
12b94d549f
haskell-fclabels: update to version 1.1.6
2013-04-20 20:16:26 +02:00
Vladimír Čunát
e8823c9e5e
Merge pull request #441 from ierton/udisks2-xfce
...
udisks2 for xfce
2013-04-20 01:37:14 -07:00
Peter Simons
be6457fd2c
haskell-socks: update to version 0.5.1
2013-04-19 18:53:20 +02:00
Peter Simons
ee45b50eb2
haskell-data-inttrie: update to version 0.1.0
2013-04-19 18:53:20 +02:00
Peter Simons
b6c7c4a142
haskell-acid-state, haskell-safecopy: cosmetic updates by hackage4nix
2013-04-19 10:47:36 +02:00
Peter Simons
a012f18820
haskell-optparse-applicative: jailbreak to fix the build with GHC 7.0.4
2013-04-19 10:46:18 +02:00
Rickard Nilsson
6e8404a7cb
New Haskell library: haskell-acid-state
2013-04-19 07:09:12 +02:00
Rickard Nilsson
8a3f6e8e76
New Haskell library: haskell-safecopy
2013-04-19 07:07:44 +02:00
Vladimír Čunát
7716b78fc7
pixman: use pixman_cairo for xorg, flatten its includes
2013-04-18 21:31:56 +02:00
Vladimír Čunát
b37b73a56c
poppler: update, include qt4+cairo patches
...
The patches should provide smoother font rendering, like it's with poppler+gtk+cairo.
The code was taken from @mornfall f4fce48c #470 , thanks.
2013-04-18 20:54:47 +02:00
Vladimír Čunát
808a5bd2d8
openjpeg: flatten includes to make it better detectable
2013-04-18 20:54:23 +02:00
Vladimír Čunát
15ed86c3bd
flattenInclude: a useful utility, moved into glib now
2013-04-18 20:07:38 +02:00
Peter Simons
d17f66b39b
haskell-snap: jailbreak to fix build with 'hashable' and 'tagged'
2013-04-18 17:10:33 +02:00
Peter Simons
5374c7ca31
haskell-haskeline: fix build with GHC 7.0.x
2013-04-18 17:10:33 +02:00
Peter Simons
ca70807262
haskell-skein: jailbreak to support current version of 'tagged'
2013-04-18 17:10:33 +02:00
Peter Simons
907afc0938
haskell-wai-test: update to version 1.3.1
2013-04-18 17:10:33 +02:00
Peter Simons
3c3b5b6199
haskell-statistics: update to version 0.10.3.1
2013-04-18 17:10:33 +02:00
Peter Simons
c1147811f9
haskell-fsnotify: update to version 0.0.8
2013-04-18 17:10:32 +02:00
Peter Simons
2b37a87a57
haskell-snap: update to version 0.11.2.2
2013-04-18 17:10:32 +02:00
Peter Simons
9ab1e2c0ac
haskell-skein: update to version 1.0.1
2013-04-18 17:10:32 +02:00
Peter Simons
6f393fe124
haskell-semigroups: update to version 0.9.1
2013-04-18 17:10:32 +02:00
Peter Simons
2973f64e09
haskell-ghc-vis: update to version 0.6.1.1
2013-04-18 17:10:32 +02:00
Peter Simons
2c69610190
haskell-certificate: jailbreak to support current version of crypto-pubkey-types
2013-04-18 17:10:32 +02:00
Peter Simons
ad878ab15f
haskell-crypto-api: jailbreak to support current version of tagged
2013-04-18 17:10:32 +02:00
Peter Simons
ff032a34e6
haskell-tagged: update to version 0.6
2013-04-18 17:10:32 +02:00
Peter Simons
870e8b29f4
haskell-hamlet: update to version 1.1.7.1
2013-04-18 17:10:32 +02:00
Peter Simons
b4bb955a1a
haskell-digestive-functors-heist: update to version 0.6.2.0
2013-04-18 17:10:32 +02:00
Song Wenwu
3b01d244c3
gtk+: enable xcursor support, fixes #469
...
@vcunat also reorganized the build input lists a bit
2013-04-18 16:14:44 +02:00
Vladimír Čunát
f4c84b3cf9
gmime: fix via updating the ancient version
2013-04-18 09:34:02 +02:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
viric
d2d69902e8
Merge pull request #456 from bjornfor/premake
...
premake: bump to version 4.3
2013-04-15 14:35:46 -07:00
Lluís Batlle i Rossell
c4404fea22
libotr: 4.0 back to default. Git problems.
2013-04-15 20:43:32 +02:00
Lluís Batlle i Rossell
d5e713d2ff
libotr: Missed file for 3.2
2013-04-15 20:20:20 +02:00
Lluís Batlle i Rossell
b628bbda90
libotr: adding back libotr 3.2; bitlbee failed without it
2013-04-15 20:15:19 +02:00
Peter Simons
e2a1c15772
haskell-statistics: patch to fix Haddock build
2013-04-14 23:06:17 +02:00