mirrors/emacs-overlay
1
Fork 0
mirror of https://github.com/nix-community/emacs-overlay.git synced 2025-12-06 02:40:25 -08:00
Code Issues Projects Releases Wiki Activity

Renamed packageFile arg to packageElisp for clarity

Browse source
This commit is contained in:
Steve Purcell 2020-06-21 15:36:01 +12:00
parent 257557be07
commit fa7e127f03
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.org
View file

@ -64,7 +64,7 @@ can be handy for CI purposes:
... ...
let let
emacsForCI = pkgs.emacsWithPackagesFromPackageRequires { emacsForCI = pkgs.emacsWithPackagesFromPackageRequires {
packageFile = builtins.readFile ./flycheck.el; packageElisp = builtins.readFile ./flycheck.el;
extraEmacsPackages = epkgs: [ extraEmacsPackages = epkgs: [
epkgs.package-lint epkgs.package-lint
]; ];

4
packreq.nix
View file

@ -7,13 +7,13 @@ Package-Requires declarations.
let let
parse = pkgs.callPackage ./parse.nix { }; parse = pkgs.callPackage ./parse.nix { };
in in
{ packageFile { packageElisp
, extraEmacsPackages ? epkgs: [ ] , extraEmacsPackages ? epkgs: [ ]
, package ? pkgs.emacs , package ? pkgs.emacs
, override ? (epkgs: epkgs) , override ? (epkgs: epkgs)
}: }:
let let
packages = parse.parsePackagesFromPackageRequires packageFile; packages = parse.parsePackagesFromPackageRequires packageElisp;
emacsPackages = pkgs.emacsPackagesGen package; emacsPackages = pkgs.emacsPackagesGen package;
emacsWithPackages = emacsPackages.emacsWithPackages; emacsWithPackages = emacsPackages.emacsWithPackages;
in in

8
parse.nix
View file

@ -6,8 +6,8 @@ let
(x: builtins.typeOf x == "string") (x: builtins.typeOf x == "string")
(builtins.split _sep _s); (builtins.split _sep _s);
# Parse (all) Package-Requires elisp headers found in the input string # Parse (all) Package-Requires packageElisp headers found in the input string
# `packageFile` into a list of package name strings. # `packageElisp` into a list of package name strings.
# #
# Example inputs: # Example inputs:
# #
@ -19,9 +19,9 @@ let
# => [ "dash" "pkg-info" ] # => [ "dash" "pkg-info" ]
# ;; Package-Requires: ((dash) (pkg-info "0.4")) # ;; Package-Requires: ((dash) (pkg-info "0.4"))
# => [ "dash" "pkg-info" ] # => [ "dash" "pkg-info" ]
parsePackagesFromPackageRequires = packageFile: parsePackagesFromPackageRequires = packageElisp:
let let
lines = splitString "\r?\n" packageFile; lines = splitString "\r?\n" packageElisp;
requires = requires =
lib.concatMapStrings lib.concatMapStrings
(line: (line: