public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2013-03-09 17:55:37 +01:00
parent c3203cfc3b f0c683faec
commit 86639d9bb9
607 changed files with 8977 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/emulators/wine/default.nix
+3 -2
View File
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
version = "1.5.23";
version = "1.5.25";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr";
sha256 = "0812ryv1v0gqr13vmvjci09k89qhcr1qs0n052z4zw0vpipjd4rx";
};
gecko = fetchurl {
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.winehq.org/";
license = "LGPL";
inherit version;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons];
platforms = stdenv.lib.platforms.linux;
pkgs/misc/my-env/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@
}
# Then you can install it by:
# $ nix-env -i sdl-env
# $ nix-env -i env-sdl
# And you can load it simply calling:
# $ load-env-sdl
# and this will update your env vars to have 'make' and 'gcc' finding the SDL
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+4 -4
View File
@@ -2,12 +2,12 @@
cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }:
stdenv.mkDerivation rec {
version = "1.1.1";
name = "oxygen-gtk-${version}";
version = "1.3.2.1";
name = "oxygen-gtk2-${version}";
src = fetchurl {
url = "mirror://kde/stable/oxygen-gtk/${version}/src/${name}.tar.bz2";
sha256 = "66d571f08ec999f56de412f42a0395c9dc60b73adaaece96c6da6e98353fe379";
url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi";
};
buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf