Peter Simons
9b302e1518
Merge branch 'master' into x-updates
2012-10-16 19:10:46 +02:00
Peter Simons
347b5800b2
grub-2.0: strip trailing whitespace
2012-10-16 19:10:16 +02:00
Peter Simons
06bdd77d3d
grub-2.0: fix bash completion script
2012-10-16 19:10:11 +02:00
Eduard Carreras
d22e3a02fd
Put eclipse icon into share/pixmaps
2012-10-16 18:38:53 +02:00
Peter Simons
82e94ccbeb
Merge branch 'master' into x-updates
2012-10-16 18:27:27 +02:00
Peter Simons
31b7510e22
bash-completion: remove NixOS-specific patch
...
The new bash-completion support in NixOS doesn't require this patch anymore.
Besides, the patch was insufficient for most purposes anyway: Bash completion
modules are spread out over all user profiles listed in $NIX_PROFILES (plus the
current-system profile), so getting full support for all installed modules
requires support for more than one "bash_completion.d" directory anyway.
2012-10-16 18:26:02 +02:00
Eelco Dolstra
dbfcc9336c
cairo: Update to 1.12.4
2012-10-16 12:00:41 -04:00
Eelco Dolstra
fae22cb3e9
libpng: Update to 1.5.13
2012-10-16 11:56:31 -04:00
Eelco Dolstra
36b4ab4163
Fix building libxml2 on non-Linux platforms
2012-10-16 11:50:35 -04:00
Peter Simons
5679ad6964
haskell-language-javascript: update to version 0.5.6
2012-10-16 12:18:33 +02:00
Peter Simons
5984182d03
haskell-language-c-quote: update to version 0.4.3
2012-10-16 12:18:33 +02:00
Peter Simons
4fd9c94e0a
haskell-hxt: update to version 9.3.1.1
2012-10-16 12:18:33 +02:00
Peter Simons
41d4bf099c
haskell-digestive-functors: update to version 0.5.0.3
2012-10-16 12:18:32 +02:00
Peter Simons
eb89801acf
haskell-digestive-functors-snap: update to version 0.5.0.1
2012-10-16 12:18:32 +02:00
Eelco Dolstra
dee64b4c2c
Work around timeouts after creating a LUKS device
2012-10-15 15:36:52 -04:00
Eelco Dolstra
3aae32372a
Work around some crazy race condition in devicemapper device creation
2012-10-15 14:46:15 -04:00
Peter Simons
a13346961f
haskell-cabal2nix: update to version 1.40
2012-10-15 20:23:43 +02:00
Peter Simons
c90a15a604
git-annex: update to version 3.20121010
2012-10-15 20:17:33 +02:00
Peter Simons
c8851cefbc
haskell-dbus: add version 0.10.1
2012-10-15 20:17:33 +02:00
Peter Simons
e7121b6f27
haskell-libxml-sax: add version 0.7.3
2012-10-15 20:17:33 +02:00
Peter Simons
34380b91a6
haskell-network-info: add version 0.2.0.2
2012-10-15 20:17:33 +02:00
Eelco Dolstra
87399d57d6
Doh! Forgot to add file
2012-10-15 14:02:15 -04:00
Eduard Carreras
9962055627
Remove pwd to know where I am
2012-10-15 20:01:45 +02:00
Eduard Carreras
1bf9b9bc7b
fix align
2012-10-15 20:00:20 +02:00
Eelco Dolstra
ba2911fe1e
lvm2: Update to 2.02.98
2012-10-15 13:14:12 -04:00
Eelco Dolstra
31212a0a95
Fix font-cursor-misc build
2012-10-15 13:14:12 -04:00
Peter Simons
87c5696996
pkgs/servers/x11/xorg/overrides.nix: correctly patch path to mkfontscale into mkfontdir wrapper script
2012-10-15 19:06:59 +02:00
Eelco Dolstra
5af277bbd1
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-15 12:16:58 -04:00
Eelco Dolstra
3c2f28c67e
firefox: Disable profiling since it adds 12 MB to the build
2012-10-15 12:16:01 -04:00
Eelco Dolstra
1d8e80f1b9
Fix gvfs build
...
http://hydra.nixos.org/build/3156351
2012-10-15 12:13:39 -04:00
Eelco Dolstra
80fa05f1f5
xf86-video-intel: Update to 2.20.10
2012-10-15 12:09:28 -04:00
Eelco Dolstra
3b968053d4
Fix font-schumacher-misc build
...
http://hydra.nixos.org/build/3157818
2012-10-15 11:52:11 -04:00
Eelco Dolstra
55aa7f0d6f
sylpheed: Update to 3.2
...
http://hydra.nixos.org/build/3156892
2012-10-15 11:27:37 -04:00
Eelco Dolstra
873595ee6d
php: Update to 5.3.17
...
Also remove unsupported PHP 5.2 (which doesn't build anymore).
http://hydra.nixos.org/build/3131326
2012-10-15 11:14:26 -04:00
Eelco Dolstra
9663c37534
Cleanup
2012-10-15 10:52:53 -04:00
Joachim Schiele
789adef3a4
fixes the build error for 4.7 and 4.8 with both don't work with boost 1.50
2012-10-15 10:52:53 -04:00
Eelco Dolstra
b377586b7a
Fix psi build
...
hydra.nixos.org/build/3154247
2012-10-15 10:52:53 -04:00
Eduard Carreras
94471a459f
Updated synergy to 1.4.10-foss
2012-10-15 14:26:44 +02:00
Peter Simons
5c9b7e3f15
haskell-packages: update haskellPlatformArgs_future
2012-10-15 11:59:29 +02:00
Peter Simons
b1701fc609
haskell-alex-meta: update to version 0.3.0.5
2012-10-15 11:52:34 +02:00
Peter Simons
cbc3cb7bd8
haskell-BNFC-meta: update to version 0.4
2012-10-15 11:52:34 +02:00
Peter Simons
e87df1fd83
haskell-yesod: update to version 1.1.2
2012-10-15 11:52:34 +02:00
Peter Simons
35c7887d87
haskell-yesod-routes: update to version 1.1.0.2
2012-10-15 11:52:34 +02:00
Peter Simons
0fdc576cc0
haskell-yesod-core: update to version 1.1.3.1
2012-10-15 11:52:34 +02:00
Peter Simons
b82db1ce31
haskell-warp: update to version 1.3.4.1
2012-10-15 11:52:33 +02:00
Peter Simons
9e617aaf96
haskell-symbol: update to version 0.1.4
2012-10-15 11:52:33 +02:00
Peter Simons
b55333241e
haskell-srcloc: update to version 0.3.0
2012-10-15 11:52:33 +02:00
Peter Simons
e07de73dbe
haskell-repa: update to version 3.2.2.2
2012-10-15 11:52:33 +02:00
Peter Simons
c701ed4e83
haskell-numbers: update to version 3000.1.0.1
2012-10-15 11:52:33 +02:00
Peter Simons
367eae2bb8
haskell-mainland-pretty: update to version 0.2.4
2012-10-15 11:52:33 +02:00