melpa-packages: init w3m at 20170203.647

This commit is contained in:
Thomas Tuegel 2017-02-10 12:51:22 -06:00
parent cc79f1808c
commit ae160b582c
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
4 changed files with 33 additions and 3 deletions

View file

@ -69224,6 +69224,25 @@
license = lib.licenses.free;
};
}) {};
w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "w3m";
version = "20170203.647";
src = fetchcvs {
cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
module = "emacs-w3m";
sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc";
name = "w3m";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/w3m";
license = lib.licenses.free;
};
}) {};
wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wacspace";

View file

@ -13,7 +13,7 @@ To update the list of packages from MELPA,
*/
{ lib }:
{ lib, external }:
self:
@ -174,6 +174,17 @@ self:
# upstream issue: missing file header
zeitgeist = markBroken super.zeitgeist;
w3m = super.w3m.override (args: {
melpaBuild = drv: args.melpaBuild (drv // {
prePatch =
let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
substituteInPlace w3m.el \
--replace 'defcustom w3m-command nil' \
'defcustom w3m-command "${w3m}"'
'';
});
});
};
melpaPackages = super // overrides;

View file

@ -13121,7 +13121,7 @@ with pkgs;
external = {
inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
inherit (pythonPackages) elpy;
inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
};
};

View file

@ -56,7 +56,7 @@ let
};
melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit lib;
inherit external lib;
};
orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {