diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
| commit | 4aa3eec330f64afd9db78b9bb26db32bdbabe2c4 (patch) | |
| tree | 90cb19f6cfb8498dff0597a7ae2968b240b1e559 /pkgs/desktops | |
| parent | 43c4d78bc6e19476c122efc82316122722e988aa (diff) | |
| parent | ad4ad11fbc8871811d65d0b2427fd4bc38e54a14 (diff) | |
| download | nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.gz nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.bz2 nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.lz nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.xz nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.zst nixpkgs-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/development/libraries/fontconfig/default.nix
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index fd16d2d4985..f116f5b53cd 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -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 ]; diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix index a65f33e13de..31245413f15 100644 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix @@ -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"; diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix index 918512e2b2d..b0138ecb48b 100644 --- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix @@ -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"; |