diff --git a/README.org b/README.org index 4fc855a90..7ec5c16cb 100644 --- a/README.org +++ b/README.org @@ -64,7 +64,7 @@ can be handy for CI purposes: ... let emacsForCI = pkgs.emacsWithPackagesFromPackageRequires { - packageFile = builtins.readFile ./flycheck.el; + packageElisp = builtins.readFile ./flycheck.el; extraEmacsPackages = epkgs: [ epkgs.package-lint ]; diff --git a/packreq.nix b/packreq.nix index 5e432201a..d7d7dc79a 100644 --- a/packreq.nix +++ b/packreq.nix @@ -7,13 +7,13 @@ Package-Requires declarations. let parse = pkgs.callPackage ./parse.nix { }; in -{ packageFile +{ packageElisp , extraEmacsPackages ? epkgs: [ ] , package ? pkgs.emacs , override ? (epkgs: epkgs) }: let - packages = parse.parsePackagesFromPackageRequires packageFile; + packages = parse.parsePackagesFromPackageRequires packageElisp; emacsPackages = pkgs.emacsPackagesGen package; emacsWithPackages = emacsPackages.emacsWithPackages; in diff --git a/parse.nix b/parse.nix index 3fc18b7f0..b79411127 100644 --- a/parse.nix +++ b/parse.nix @@ -6,8 +6,8 @@ let (x: builtins.typeOf x == "string") (builtins.split _sep _s); - # Parse (all) Package-Requires elisp headers found in the input string - # `packageFile` into a list of package name strings. + # Parse (all) Package-Requires packageElisp headers found in the input string + # `packageElisp` into a list of package name strings. # # Example inputs: # @@ -19,9 +19,9 @@ let # => [ "dash" "pkg-info" ] # ;; Package-Requires: ((dash) (pkg-info "0.4")) # => [ "dash" "pkg-info" ] - parsePackagesFromPackageRequires = packageFile: + parsePackagesFromPackageRequires = packageElisp: let - lines = splitString "\r?\n" packageFile; + lines = splitString "\r?\n" packageElisp; requires = lib.concatMapStrings (line: