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

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
This commit is contained in:
Domen Kožar
2014-12-07 14:02:48 +01:00
parent 43c4d78bc6 ad4ad11fbc
commit 4aa3eec330
299 changed files with 22706 additions and 13278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
View File

@@ -2,11 +2,11 @@
, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
stdenv.mkDerivation rec {
name = "goffice-0.10.12";
name = "goffice-0.10.18";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64";
};
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, kde, kdelibs, htmlTidy, kactivities
{ stdenv, kde, kdelibs, html-tidy, kactivities
, nepomuk_core, nepomuk_widgets, libXt }:
kde {
buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";

4
pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
View File

@@ -1,10 +1,10 @@
{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }:
kde {
# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
buildInputs = [ kdelibs kdepimlibs html-tidy boost ];
meta = {
description = "A KDE link checker";