public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
parent 56aa0ff1d9 00aac09d24
commit 8d46593881
6 changed files with 5178 additions and 7871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs-modes/elpa-packages.json
+3 -3
View File
@@ -246,10 +246,10 @@
"org": { "org": {
"fetch": { "fetch": {
"tag": "fetchurl", "tag": "fetchurl",
"url": "http://elpa.gnu.org/packages/org-20151214.tar", "url": "http://elpa.gnu.org/packages/org-20151221.tar",
"sha256": "15m9l7p7xfmcrxrcsxbvpp8bq5ajcapknvqblhmk77j7ca3jffi1" "sha256": "01p8c70bd2mp3w08vpha0dvpljhj4r5797b0m9q16z4zhxqaqbqx"
}, },
"version": "20151214", "version": "20151221",
"deps": [] "deps": []
}, },
"bug-hunter": { "bug-hunter": {
pkgs/applications/editors/emacs-modes/melpa-packages.json
+3665 -3437
View File
File diff suppressed because it is too large Load Diff
pkgs/applications/editors/emacs-modes/melpa-packages.nix
+1 -1
View File
@@ -18,7 +18,7 @@ let
inherit (lib) makeScope mapAttrs; inherit (lib) makeScope mapAttrs;
json = builtins.readFile ./melpa-stable-packages.json; json = builtins.readFile ./melpa-packages.json;
manifest = builtins.fromJSON json; manifest = builtins.fromJSON json;
mkPackage = self: name: recipe: mkPackage = self: name: recipe:
pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
+1502 -4423
View File
File diff suppressed because it is too large Load Diff
pkgs/build-support/emacs/melpa.nix
+2 -2
View File
@@ -22,8 +22,8 @@ with lib;
let let
packageBuild = fetchurl { packageBuild = fetchurl {
url = https://raw.githubusercontent.com/milkypostman/melpa/12a862e5c5c62ce627dab83d7cf2cca6e8b56c47/package-build.el; url = https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/package-build.el;
sha256 = "1nviyyprypz7nmam9rwli4yv3kxh170glfbznryrp4czxkrjjdhk"; sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j";
}; };
fname = "${pname}-${version}"; fname = "${pname}-${version}";
pkgs/build-support/emacs/melpa2nix.el
+5 -5
View File
@@ -23,14 +23,14 @@
(defun melpa2nix-package-build-archive (name version files) (defun melpa2nix-package-build-archive (name version files)
"Build a package archive for package NAME." "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)) (let* ((start-time (current-time))
(archive-entry (package-build-package name (archive-entry (package-build-package name
version version
files files
package-build-working-dir package-build-working-dir
package-build-archive-dir))) package-build-archive-dir)))
(pb/message "Built in %.3fs, finished at %s" (package-build--message "Built in %.3fs, finished at %s"
(time-to-seconds (time-since start-time)) (time-to-seconds (time-since start-time))
(current-time-string)))) (current-time-string))))