diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix | |
parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix index 3cea9ae4ef09..019d241f507b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix @@ -1,17 +1,22 @@ -{ fetchurl, lib, trivialBuild, writeText }: +{ lib +, fetchFromGitHub +, trivialBuild +}: trivialBuild { - pname = "font-lock+"; - version = "20180101.25"; + pname = "font-lock-plus"; + version = "208+unstable=2018-01-01"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25"; - sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4"; - name = "font-lock+.el"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "font-lock-plus"; + rev = "f2c1ddcd4c9d581bd32be88fad026b49f98b6541"; + hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4="; }; - meta = { - homepage = "https://melpa.org/#/font-lock+"; - license = lib.licenses.gpl2Plus; + meta = with lib; { + homepage = "https://github.com/emacsmirror/font-lock-plus"; + description = "Enhancements to standard library font-lock.el"; + license = licenses.gpl2Plus; }; } |