Vladimír Čunát
516133a4fd
Merge pull request #378 from cpages/wayland
...
wayland: add weston and dependencies
2013-03-16 11:38:34 -07: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
Vladimír Čunát
dc5c4917a5
vala: update to 0.19
2013-03-10 19:53:43 +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
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
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
Florian Friesdorf
de36ddf7e7
add older pycrypto25
2013-03-09 10:24:38 +01:00
Shea Levy
7410a36dec
Merge remote-tracking branch 'upstream/pygobject-2.28.6'
...
This branch updates pygobject (the diff itself is trivial), which
affects a lot of packages but due to the recent stdenv merge this seems
like a good time for this.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:05:25 -05: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
b634efe63c
ocamlPackages.opam: Fix indentation
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:12:56 -05:00
Shea Levy
66ad165829
Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
...
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -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
orbitz
55be059467
Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me
2013-03-08 22:59:54 +01:00
orbitz
98a6759bc7
Delete 0.9.4
2013-03-08 22:48:58 +01:00
orbitz
fd48192018
Add opam 0.9.5
2013-03-08 22:42:22 +01:00
Michael Raskin
f80dfee0c5
SBCL: patch for new Glibc no longer needed
2013-03-08 17:55:11 +04:00
Peter Simons
c8ff45b5c7
haskell-doctest: jailbreak to support QuickCheck version 2.6
2013-03-08 13:56:12 +01:00
Peter Simons
7ac086aab7
haskell-test-framework-quickcheck2: jailbreak to support QuickCheck version 2.6
2013-03-08 13:56:00 +01:00
Peter Simons
1f38a4ca66
haskell-cabal2nix: update to version 1.47
2013-03-08 13:44:59 +01:00
Peter Simons
f805ec1e0a
happstack-server: disable test suite to fix build error
2013-03-08 13:37:59 +01:00
Peter Simons
7db1b1e085
haskell-zip-archive: disable test suite
...
The test suite fails because it expects to find /usr/bin/zip.
2013-03-08 13:37:59 +01:00
Peter Simons
8dc669a726
haskell-uulib: update to version 0.9.15
2013-03-08 13:37:58 +01:00
Peter Simons
610f063554
haskell-http-conduit: update to version 1.9.1
2013-03-08 13:37:58 +01:00
Peter Simons
9ff74626f9
haskell-ghc-mod: update to version 1.12.1
2013-03-08 13:37:58 +01:00
Peter Simons
a675c7f245
haskell-data-default: update to version 0.5.1
2013-03-08 13:37:58 +01:00
Peter Simons
e447fcc8dd
haskell-cuda: re-generate the expression with recent cabal2nix
2013-03-08 13:37:58 +01:00
Peter Simons
b31be07af0
haskell-multiarg: update to version 0.10.0.0
2013-03-08 13:37:58 +01:00
Peter Simons
1090f928c4
haskell-monad-control: update to version 0.3.2
2013-03-08 13:37:58 +01:00
Peter Simons
525342632f
haskell-hakyll: disable test suite to fix build error
2013-03-08 13:37:58 +01:00
Peter Simons
1d0e0fd167
haskell-hakyll: update to version 4.2.1.0
2013-03-08 13:37:57 +01:00
orbitz
6da29419e4
Add opam 0.9.4
2013-03-08 11:56:50 +01:00
Eelco Dolstra
234c6b74c6
Merge remote-tracking branch 'origin/stdenv-updates'
2013-03-07 23:09:05 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00
Jack Cummings
96f662f746
lsof-4.87
2013-03-07 10:23:43 -08:00
Peter Simons
d742d26b0d
haskell-uulib: update to version 0.9.15
2013-03-07 17:07:47 +01:00
Peter Simons
0fd867192d
haskell-http-conduit: update to version 1.9.1
2013-03-07 17:07:47 +01:00
Peter Simons
02ed0e6867
haskell-hakyll: update to version 4.2.0.0
2013-03-07 17:07:47 +01:00
Peter Simons
213dcd5843
haskell-ghc-mod: update to version 1.12.1
2013-03-07 17:07:47 +01:00
Peter Simons
2965fb2cb0
haskell-data-default: update to version 0.5.1
2013-03-07 17:07:46 +01:00
Peter Simons
6ff4538b5a
haskell-pandoc: jailbreak to support syb 0.4.0
2013-03-07 17:07:33 +01:00
Peter Simons
e459a7514e
haskell-doctest: jailbreak to support syb 0.4.0
2013-03-07 17:03:00 +01:00
Peter Simons
4fd407bab5
haskell-QuickCheck: add version 2.6
2013-03-07 16:57:52 +01:00
Peter Simons
95ff746654
haskell-syb: add version 0.4.0
2013-03-07 16:57:33 +01:00
Sander van der Burg
f00dc945d2
The iOS test target can/should only be executed on x86_64-darwin, this change enforces that
2013-03-07 10:44:19 +01:00
Michael Raskin
536db80abf
Add Sodium cryptography library
2013-03-07 10:59:03 +04:00
Cillian de Róiste
e42e498e60
pygobject: update to 2.28.6
...
This fixes an issue with MyPaint: https://gna.org/bugs/?20400
2013-03-06 23:25:46 +01:00