diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2017-01-24 10:48:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 10:48:56 +0100 |
| commit | 4785a19444fd95c4b229e549861ceaaa3045f79f (patch) | |
| tree | dc173f4bc12dfb7b7140d05da02f8ffbbe267b2d /pkgs | |
| parent | fd26ad6f764510d0234e8dcf5998a13b4b5a424b (diff) | |
| parent | 4e2d9401253422febe56e52d848c4e33757514b5 (diff) | |
| download | nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar.gz nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar.bz2 nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar.lz nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar.xz nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.tar.zst nixlib-4785a19444fd95c4b229e549861ceaaa3045f79f.zip | |
Merge pull request #22073 from romildo/upd.pcmanfm
{lib,pcman}fm: 1.2.4 -> 1.2.5 Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/pcmanfm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libfm/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index e6d96b099fad..aceeae87d085 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation rec { - name = "pcmanfm-1.2.4"; + name = "pcmanfm-1.2.5"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; - sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; + sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc"; }; buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 32eb4e04f03c..2b30dacb58fa 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 +{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_34 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; + sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7"; }; - buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] + buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_34 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; |