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

Merge recent master into staging

Browse Source 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
This commit is contained in:
Vladimír Čunát
2014-08-30 10:04:02 +02:00
parent a283bec71c 4e0d2706f1
commit e51f73652d
756 changed files with 18877 additions and 13683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/e17/enlightenment/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
--disable-illume2
'';
meta = {
description = "Enlightenment, the window manager";
description = "A window manager";
longDescription = ''
The Enlightenment Desktop shell provides an efficient yet
breathtaking window manager based on the Enlightenment

10
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View File

@@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
# `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
CPPFLAGS = "-UGTK_DISABLE_DEPRECATED";
meta = {
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/gtkglext/;
description = "GtkGLExt, an OpenGL extension to GTK+";
longDescription =
'' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK
objects which support OpenGL rendering in GTK+ and GtkWidget API
@@ -27,9 +25,7 @@ stdenv.mkDerivation rec {
Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables
OpenGL drawing for standard and custom GTK+ widgets.
'';
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ ];
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
}

2
pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Yelp;
description = "Yelp is the help viewer in Gnome.";
description = "The Gnome help viewer";
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
platforms = platforms.linux;

6
pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
View File

@@ -6,11 +6,11 @@
# use packaged gnome3.gnome_icon_theme_symbolic
stdenv.mkDerivation rec {
name = "gitg-0.3.2";
name = "gitg-3.13.91";
src = fetchurl {
url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
};
preCheck = ''

10
pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
View File

@@ -1,18 +1,20 @@
{ stdenv, fetchurl, gnome3, libtool, pkgconfig
{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
version = "0.0.10";
version = "0.0.20";
src = fetchurl {
url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
};
cmakeFlags = "-DTHREADSAFE=ON";
configureScript = "sh ./autogen.sh";
buildInputs = [ gnome3.gnome_common libtool pkgconfig
buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {

6
pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
View File

@@ -6,11 +6,11 @@
# use packaged gnome3.gnome_icon_theme_symbolic
stdenv.mkDerivation rec {
name = "gitg-0.3.2";
name = "gitg-3.13.91";
src = fetchurl {
url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
};
preCheck = ''

8
pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
View File

@@ -1,18 +1,18 @@
{ stdenv, fetchurl, gnome3, libtool, pkgconfig
{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
version = "0.0.10";
version = "0.0.20";
src = fetchurl {
url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
};
configureScript = "sh ./autogen.sh";
buildInputs = [ gnome3.gnome_common libtool pkgconfig
buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {