diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-10 12:51:22 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-10 13:11:45 -0600 |
| commit | ae160b582cefbf20a2c4d2443624198f31194d3a (patch) | |
| tree | e5f9a3a86044e155c219d0147e59ac2c9615f953 /pkgs | |
| parent | cc79f1808c6c046d42e8a7734ec65ad292aa31dd (diff) | |
| download | nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar.gz nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar.bz2 nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar.lz nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar.xz nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.tar.zst nixlib-ae160b582cefbf20a2c4d2443624198f31194d3a.zip | |
melpa-packages: init w3m at 20170203.647
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-generated.nix | 19 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 |
4 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 8dfad041b9f6..a47b5d69760d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -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"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6081c96006ad..60cbf486777b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66c20853019b..42d7c142cf7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 092f352ec5b9..5c50fe383bb9 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -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 { |