JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'emacs-packages'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-27 11:08:52 -06:00
commit 8d46593881
6 changed files with 5178 additions and 7871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs-modes/elpa-packages.json
View File

@ -246,10 +246,10 @@
"org": {
"fetch": {
"tag": "fetchurl",
"url": "http://elpa.gnu.org/packages/org-20151214.tar",
"sha256": "15m9l7p7xfmcrxrcsxbvpp8bq5ajcapknvqblhmk77j7ca3jffi1"
"url": "http://elpa.gnu.org/packages/org-20151221.tar",
"sha256": "01p8c70bd2mp3w08vpha0dvpljhj4r5797b0m9q16z4zhxqaqbqx"
},
"version": "20151214",
"version": "20151221",
"deps": []
},
"bug-hunter": {

7102
pkgs/applications/editors/emacs-modes/melpa-packages.json
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -18,7 +18,7 @@ let
inherit (lib) makeScope mapAttrs;
json = builtins.readFile ./melpa-stable-packages.json;
json = builtins.readFile ./melpa-packages.json;
manifest = builtins.fromJSON json;
mkPackage = self: name: recipe:

5925
pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/build-support/emacs/melpa.nix
View File

@ -22,8 +22,8 @@ with lib;
let
packageBuild = fetchurl {
url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el;
sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk";
url = https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/package-build.el;
sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j";
};
fname = "${pname}-${version}";

10
pkgs/build-support/emacs/melpa2nix.el
View File

@ -23,14 +23,14 @@
(defun melpa2nix-package-build-archive (name version files)
"Build a package archive for package NAME."
(pb/message "\n;;; %s\n" name)
(package-build--message "\n;;; %s\n" name)
(let* ((start-time (current-time))
(archive-entry (package-build-package name
version
files
package-build-working-dir
package-build-archive-dir)))
(pb/message "Built in %.3fs, finished at %s"
(time-to-seconds (time-since start-time))
(current-time-string))))
(package-build--message "Built in %.3fs, finished at %s"
(time-to-seconds (time-since start-time))
(current-time-string))))