Commit graph

22,930 commits

Author SHA1 Message Date
Peter Simons
a356a2e59f haskell-threads: update to version 0.5.0.2 2013-03-13 13:59:33 +01:00
Peter Simons
a487304397 haskell-smallcheck: update to version 1.0.2 2013-03-13 13:59:33 +01:00
Peter Simons
67e72eea76 haskell-persistent-template: update to version 1.1.2.5 2013-03-13 13:59:33 +01:00
Peter Simons
9d52ffce02 haskell-numbers: update to version 3000.1.0.3 2013-03-13 13:59:33 +01:00
Peter Simons
865a59815b haskell-monad-logger: update to version 0.3.1.1 2013-03-13 13:59:33 +01:00
Peter Simons
79d3d6e698 haskell-liblastfm: update to version 0.1.1.0 2013-03-13 13:59:32 +01:00
Peter Simons
72d80f0419 haskell-http-conduit: update to version 1.9.2.1 2013-03-13 13:59:32 +01:00
Peter Simons
2533c32595 haskell-hint: update to version 0.3.3.6 2013-03-13 13:59:32 +01:00
Peter Simons
b8550949a8 haskell-ghc-mod: update to version 1.12.2 2013-03-13 13:59:32 +01:00
Peter Simons
2ead0aa4c6 haskell-conduit: update to version 1.0.3 2013-03-13 13:59:32 +01:00
Peter Simons
ccb850fda6 haskell-NumInstances: update to version 1.2 2013-03-13 13:59:32 +01:00
Lluís Batlle i Rossell
4684a47989 glibcInfo: fixing build
The manual is built into 'build', not sourceRoot.
2013-03-12 11:46:09 +01:00
Florian Friesdorf
36c6b4260b cyrus-sasl-2.1.26 2013-03-12 10:05:49 +01:00
Shea Levy
2d4d0cbef7 tinyxml: fix whitespace
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 21:22:59 -04:00
Domen Kozar
acf4697a5f upgrade xbmc to 12.0 2013-03-12 01:35:16 +01:00
Shea Levy
897840f76f Add cairo-1.12.2
Needed for an upcoming fix to eclipse.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 19:19:48 -04:00
Lluís Batlle i Rossell
7868a3e6b2 Revert "Fixing tarball build (failure evaluating glibcInfo in powerpc-linux)"
This reverts commit c94595f13b.

This was fixed by shlevy in 1c86181857, and I
didn't notice it.
2013-03-11 14:02:16 +01:00
Andres Loeh
db104a8c3f haskell-constraints: add package 2013-03-11 12:47:01 +01:00
Peter Simons
c3dc9fbe61 haskell-yesod-json: update to version 1.1.2.2 2013-03-11 11:26:14 +01:00
Peter Simons
b749ce135d haskell-monad-logger: update to version 0.3.1 2013-03-11 11:26:14 +01:00
Peter Simons
0f18c143e5 haskell-hakyll: update to version 4.2.1.2 2013-03-11 11:26:14 +01:00
Lluís Batlle i Rossell
c94595f13b Fixing tarball build (failure evaluating glibcInfo in powerpc-linux) 2013-03-11 09:41:55 +01:00
Shea Levy
1c86181857 glibc-2.17: Don't link to stdenv.lib.gcc if it's null.
This fixes the tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-10 19:47:59 -04:00
Carles Pagès
8f77bc2024 mesa: revert to using gallium drivers.
I had copied the config flags for mesa from the building wayland page, but
after asking in the channel it turns out there is no technical reason for not
using the gallium drivers.
2013-03-10 23:04:24 +01:00
Carles Pagès
6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
2013-03-10 18:19:49 +01:00
Peter Simons
8cc8359351 haskell-doctest: re-generate expression with recent version of cabal2nix 2013-03-10 00:32:32 +01:00
Peter Simons
83bd0eec47 haskell-yst: update to version 0.3.1.1 2013-03-10 00:32:04 +01:00
Peter Simons
4e494d0722 haskell-wl-pprint-terminfo: update to version 3.6 2013-03-10 00:32:04 +01:00
Peter Simons
7a36e6fa03 haskell-wl-pprint-extras: update to version 3.4 2013-03-10 00:32:04 +01:00
Peter Simons
3dcc961cff haskell-void: update to version 0.5.12 2013-03-10 00:32:03 +01:00
Peter Simons
29dac4ea39 haskell-stylish-haskell: update to version 0.5.6.1 2013-03-10 00:32:03 +01:00
Peter Simons
87eaefbe6f haskell-publicsuffixlist: update to version 0.0.4 2013-03-10 00:32:03 +01:00
Peter Simons
5cd47b2c18 haskell-pandoc: update to version 1.11 2013-03-10 00:32:03 +01:00
Peter Simons
dd230dee80 haskell-haskell-src-meta: update to version 0.6.0.2 2013-03-10 00:32:03 +01:00
Peter Simons
9f90185d42 haskell-hakyll: update to version 4.2.1.1 2013-03-10 00:32:03 +01:00
Peter Simons
126100e7a9 haskell-gitit: update to version 0.10.3 2013-03-10 00:32:03 +01:00
Peter Simons
6042de5fae haskell-distributive: update to version 0.3.1 2013-03-10 00:26:26 +01:00
Peter Simons
119bf8ef28 haskell-citeproc-hs: update to version 0.3.8 2013-03-10 00:26:26 +01:00
Peter Simons
a71fff4364 haskell-blaze-markup: update to version 0.5.1.5 2013-03-10 00:26:26 +01:00
Peter Simons
35f59257db haskell-blaze-html: update to version 0.6.1.1 2013-03-10 00:26:26 +01:00
Vladimír Čunát
2c13f0fd20 libnotify: major update, no dependency on gtk+ now
As a result it can be easily used with both gtk2 and gtk3.
2013-03-09 22:50:24 +01:00
Vladimír Čunát
29442fd614 jbig2dec: fix download URI 2013-03-09 18:45:23 +01:00
Vladimír Čunát
75ebcbc9a7 jbig2dec: fix download URI 2013-03-09 18:44:41 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Vladimír Čunát
03ba2960a4 vdrift: update and fix
Tested on two laps :-)
2013-03-09 14:59:39 +01:00
Lluís Batlle i Rossell
2f39e18b7f ffmpeg: update 1.1 to 1.1.3 2013-03-09 13:56:46 +01:00
Peter Simons
acd06b6ea0 haskell-shake: add version 0.9.1 2013-03-09 13:11:48 +01:00
Vladimír Čunát
637e799ead Merge stdenv-updates-gcc47 into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/gmp/5.0.5.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/top-level/all-packages.nix
2013-03-09 12:01:39 +01:00
Shea Levy
5e434ef318 Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -05:00
Shea Levy
1670244f80 Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
2013-03-08 17:03:22 -05:00