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

Merge pull request #814 from garbas/vifm-update 

vifm: update to 0.7.5 and enabling new options
This commit is contained in:
Michael Raskin 2013-08-10 04:03:01 -07:00
parent 37996253e6 24a0e6ad5f
commit 7701b22977
2 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/applications/misc/vifm/default.nix
View File

@ -1,48 +1,31 @@
x@{builderDefsPackage { pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
, ncurses
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x) let
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); name = "vifm-${version}";
sourceInfo = rec { version = "0.7.5";
baseName="vifm";
version="0.6.3"; in stdenv.mkDerivation {
name="${baseName}-${version}"; inherit name;
url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv"; src = fetchurl {
}; url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
in sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
}; };
inherit (sourceInfo) name version; #phaseNames = ["doConfigure" "doMakeInstall"];
inherit buildInputs; buildInputs = [ utillinux ncurses file libX11 ];
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = { meta = {
description = "A vi-like file manager"; description = "A vi-like file manager";
maintainers = with a.lib.maintainers; maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
[ platforms = pkgs.lib.platforms.linux;
raskin license = pkgs.lib.licenses.gpl2;
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
}; };
passthru = { passthru = {
updateInfo = { updateInfo = {
downloadPage = "http://vifm.sf.net"; downloadPage = "http://vifm.sf.net";
}; };
}; };
}) x }

2
pkgs/top-level/all-packages.nix
View File

@ -1830,7 +1830,7 @@ let
vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
vifm = callPackage ../applications/misc/vifm {}; vifm = callPackage ../applications/misc/vifm { };
viking = callPackage ../applications/misc/viking { viking = callPackage ../applications/misc/viking {
inherit (gnome) scrollkeeper; inherit (gnome) scrollkeeper;