Commit graph

25007 commits

Author SHA1 Message Date
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
96a0d0cc6f xfce4-power-manager: update this forgotten package 2013-03-09 22:30:06 +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
f0c683faec xfdesktop: minor update 2013-03-09 17:07:50 +01:00
Vladimír Čunát
56b4a71c21 netpbm: update and attempt to fix i686 build 2013-03-09 14:59:39 +01:00
Vladimír Čunát
03ba2960a4 vdrift: update and fix
Tested on two laps :-)
2013-03-09 14:59:39 +01:00
Александр Цамутали
241f94f59f applications/audio/caps: New nixpkg. 2013-03-09 17:54:59 +04:00
Michael Raskin
f5195531ae Adding reference to ZPAQ in all-packages 2013-03-09 17:31:01 +04:00
Lluís Batlle i Rossell
2f39e18b7f ffmpeg: update 1.1 to 1.1.3 2013-03-09 13:56:46 +01:00
Vladimír Čunát
2e1dd8e076 recutils: supply the forgotten patch 2013-03-09 13:54:55 +01:00
Michael Raskin
5ec1806564 Adding ZPAQ archiver 2013-03-09 16:33:14 +04:00
Michael Raskin
b494b3b468 Update lrzip 2013-03-09 16:33:14 +04:00
Vladimír Čunát
87ec597ce7 recutils: fix build with new glibc 2013-03-09 13:24:31 +01:00
Vladimír Čunát
cf3ff172cd panotools: disabling tests due to strange failures 2013-03-09 13:16:41 +01:00
Peter Simons
acd06b6ea0 haskell-shake: add version 0.9.1 2013-03-09 13:11:48 +01:00
Peter Simons
edfcb485a8 jailbreak-cabal: build jailbreak-cabal with a version of Cabal that has its unit tests disabled
Cabal's unit test suite depends on testFrameworkQuickcheck2, which
depends on jailbreakCabal, which depends on Cabal: *BOOM*
2013-03-09 13:04:19 +01:00
Peter Simons
63cd00856e haskell-defaults.nix: don't pass inconsistent Cabal versions to cabal2nix 2013-03-09 13:04:19 +01:00
Peter Simons
78140c3acd haskell-packages.nix: add 'disableTests' convenience function 2013-03-09 13:04:19 +01:00
Peter Simons
3704855f78 pkgs/top-level/haskell-defaults.nix: cosmetic 2013-03-09 13:04:19 +01:00
Vladimír Čunát
e218c79b85 grive: fix build with new binutils headers 2013-03-09 12:27:38 +01:00
Vladimír Čunát
f0f34067e7 recode: fix build after stdenv merge + #354
ToDo: tests don't pass yet.
2013-03-09 11:32:22 +01:00
Michael Raskin
d5288c7e3a TPTP had a bugfix without version change 2013-03-09 14:24:45 +04:00
Vladimír Čunát
c3511c115d xfce: fix NixOS support
Sorry for this forgotten commit.
2013-03-09 10:51:34 +01:00
Florian Friesdorf
a49bd047c0 add older buildout152 2013-03-09 10:41:27 +01:00
Florian Friesdorf
de36ddf7e7 add older pycrypto25 2013-03-09 10:24:38 +01:00
Michael Raskin
dcf04b6063 zbar requires v4l1; disabe video 2013-03-09 12:59:45 +04:00
Michael Raskin
b26c770651 Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all. 2013-03-09 12:20:19 +04:00
Shea Levy
23cbda5b3c man-pages: Update to 3.48 2013-03-08 19:49:53 -05:00
Shea Levy
08d076d6fc Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs
Trivial update to XML-LibXML perlPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:17:40 -05:00
Shea Levy
8934644d20 tor: minor cleanups
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do 2013-03-08 19:14:43 -05:00
Shea Levy
35d957b8f9 Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs
This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:13:17 -05:00
Shea Levy
9158ad45f1 Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs
This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:08:56 -05: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
e07a7e6156 Merge branch 'master' of git://github.com/fignuts/nixpkgs
This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:01:04 -05:00
Shea Levy
064155ad38 Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs
Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:22:13 -05:00
Shea Levy
fc3994074e Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs
The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:19:02 -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
e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -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
Shea Levy
1de517844b Whoops, buildNativeInputs is now nativeBuildInputs 2013-03-08 16:39:09 -05:00
Shea Levy
f2c79c4542 Remove some references to non-existent packages 2013-03-08 16:36:59 -05:00
Shea Levy
b938cacbe1 tmux: Update to 1.7 2013-03-08 15:49:22 -05:00