diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index f7180097961..d7577987a17 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation { - name = "pcmanfm-1.2.0"; + name = "pcmanfm-1.2.2"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.0.tar.xz"; - sha256 = "1cmskj7dpjgrrn89z7cc1h1nsmd6qq3bakf207ldrhrxxv3fxl2j"; + url = "mirror://sourceforge/pcmanfm/pcmanfm-1.2.2.tar.xz"; + sha256 = "00wmbqrbcrxk1mcdkgdl8ddf3gp28rm5mamqdq72sfr0q2d0287n"; }; buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 7a005c9fda2..9f42a1c8c3e 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala }: - +{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala +, extraOnly ? false }: +let name = "libfm-1.2.2.1"; + inherit (stdenv.lib) optional; +in stdenv.mkDerivation { - name = "libfm-1.2.0"; + name = if extraOnly then "libfm-extra-1.2.2.1" else "libfm-1.2.2.1"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-1.2.0.tar.xz"; - sha256 = "08pwdrmfm9rl41lj2niyjqq2bdvydxk7v2shjxh5gk1xwj238lgh"; + url = "mirror://sourceforge/pcmanfm/libfm-1.2.2.1.tar.xz"; + sha256 = "0aa37arr0h2nppjh7ppf00np2d8mb43imvfq9b7wq5cnzpvs7c6v"; }; - buildInputs = [ glib gtk intltool menu-cache pango pkgconfig vala ]; + buildInputs = [ glib gtk intltool pango pkgconfig vala ] + ++ optional (!extraOnly) menu-cache; + + configureFlags = optional extraOnly "--with-extra-only"; meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index 8e2e202f432..3131b6b2918 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, glib, pkgconfig }: +{ stdenv, fetchurl, glib, pkgconfig, libfm-extra }: +let name = "menu-cache-0.7.0"; +in stdenv.mkDerivation { - name = "menu-cache-0.5.1"; + inherit name; src = fetchurl { - url = "mirror://sourceforge/lxde/menu-cache-0.5.1.tar.gz"; - sha256 = "08m1msgbl6j7j72cwcg18klb99jif8h1phkcnbplxkdf3w15irh8"; + url = "mirror://sourceforge/lxde/${name}.tar.xz"; + sha256 = "0wwkk4jrcl2sp11bspabplchh4ipi1zyn39j3skyzgbm8k40gkhk"; }; - buildInputs = [ glib pkgconfig ]; + buildInputs = [ glib pkgconfig libfm-extra ]; meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?tag=menu-cache"; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index 30ae07f9dbd..31f4348a992 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, cmake, libtiff, pkgconfig, tesseract }: -let rev = "b70b6f584e8151f70f9d90df054af0911ea7475e"; +let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2"; shortRev = builtins.substring 0 7 rev; in stdenv.mkDerivation { - name = "vobsub2srt-git-20140226-${shortRev}"; + name = "vobsub2srt-git-20140817-${shortRev}"; src = fetchgit { inherit rev; url = https://github.com/ruediger/VobSub2SRT.git; - sha256 = "15437eba07e674cec66bc54cfa42ffe8b05816975401c9950bf9016e3881cd6a"; + sha256 = "8e867a021ac529e7607627d5944b95bb9f1378ffabd8837e7a028663a8ce5adf"; }; buildInputs = [ cmake libtiff pkgconfig ]; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 1769a59520b..efce7d4de81 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -6,14 +6,14 @@ , UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: let - version = "1.8"; + version = "1.9"; pn = "biblatex-biber"; in buildPerlPackage { name = "biber-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; - sha256 = "0ffry64pdvg5g487r7qab5b3cs4kq8rq8n3bymxrr1qh3mp79k4n"; + sha256 = "1a3iq7l9i54f8nfzjmp1qdb6aqm7977q1g4san470010fkfbvjdc"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34436e048fa..6daa69a7541 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5385,6 +5385,9 @@ let libelf = callPackage ../development/libraries/libelf { }; libfm = callPackage ../development/libraries/libfm { }; + libfm-extra = callPackage ../development/libraries/libfm { + extraOnly = true; + }; libgadu = callPackage ../development/libraries/libgadu { };