diff options
| author | Shea Levy <shea@shealevy.com> | 2016-09-10 11:25:21 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-09-10 11:25:21 -0400 |
| commit | c6460fb0cbda179b83558a6e19c13a2d5f81a5ed (patch) | |
| tree | 1514ded726d188031f50df1f34448b968f3e74e0 /pkgs | |
| parent | be33fc89734b0490e281964e4a75b981fac48332 (diff) | |
| download | nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar.gz nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar.bz2 nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar.lz nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar.xz nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.tar.zst nixpkgs-c6460fb0cbda179b83558a6e19c13a2d5f81a5ed.zip | |
melpa: Add inherit-local, bump f.el
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-generated.nix | 27 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 17 |
2 files changed, 24 insertions, 20 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 94bbcaf274e..e1382d6d50b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -20035,12 +20035,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20160815.1253"; + version = "20160909.829"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "4f8d3112f03e99506bab3c910fa3a29f0b8eb86b"; - sha256 = "0gf4vh7h4sjmp74kfiwxngjpx44m88mksridfil7piapbg23z9xm"; + rev = "e055e3dd404c8a7cc7849a0e6fd8aade714c5355"; + sha256 = "1n9v2ackd86xbl0msnrvrfxp1qacydz9n0zjxm328jxlvj4h35rx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; @@ -33334,6 +33334,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "20160909.755"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local"; + sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d2e3d2b866f..62fb9407ee5 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -686,23 +686,6 @@ let }; }; - f = melpaBuild rec { - pname = "f"; - version = "20151113"; - src = fetchFromGitHub { - owner = "rejeep"; - repo = "f.el"; - rev = "e0259ee060ff9a3f12204adcc8630869080acd68"; - sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1"; - }; - fileSpecs = [ "f.el" ]; - packageRequires = [ dash s ]; - meta = { - description = "Emacs library for working with files and directories"; - license = gpl3Plus; - }; - }; - find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; |