From 3800c62d8993e2a5e1533b7e1400bef2913b38d6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jan 2016 11:01:39 -0600 Subject: [PATCH 1/5] Revert "melpa-packages.json: remove "0blayout" to mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353" This reverts commit 4f85afad5ba5629f2b6bb792f38cad0841a946bc. --- .../editors/emacs-modes/melpa-packages.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json index 0035cbf2d05..8717a5f126a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.json +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json @@ -37286,6 +37286,21 @@ "emacs" ] }, + "0blayout": { + "fetch": { + "tag": "fetchFromGitHub", + "owner": "etu", + "repo": "0blayout-mode", + "sha256": "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96", + "rev": "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc" + }, + "recipe": { + "sha256": "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92", + "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943" + }, + "version": "20151021.549", + "deps": [] + }, "afternoon-theme": { "fetch": { "tag": "fetchFromGitHub", From 3673ab7799711c4cdb7331a99ce48b50a488893a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jan 2016 11:02:11 -0600 Subject: [PATCH 2/5] Revert "melpa-packages.json: remove "4clojure" to mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353" This reverts commit 2f5e87a7bff1148df4cdb3494894f003046b6385. --- .../editors/emacs-modes/melpa-packages.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json index 8717a5f126a..b5b4aa4b7e1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.json +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json @@ -2115,6 +2115,24 @@ "web-server" ] }, + "4clojure": { + "fetch": { + "tag": "fetchFromGitHub", + "owner": "joshuarh", + "repo": "4clojure.el", + "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq", + "rev": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca" + }, + "recipe": { + "sha256": "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb", + "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943" + }, + "version": "20131014.1707", + "deps": [ + "json", + "request" + ] + }, "mustard-theme": { "fetch": { "tag": "fetchFromGitHub", From f094da5e0d1bcac74a782834423d9d37a5db4dcf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jan 2016 11:02:21 -0600 Subject: [PATCH 3/5] Revert "melpa-packages.json: remove "2048-game" to mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353" This reverts commit 625fe8164fed723c90248a6c5dbb12533309e4a6. --- .../editors/emacs-modes/melpa-packages.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json index b5b4aa4b7e1..889b4cea4a5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.json +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json @@ -11403,6 +11403,20 @@ "version": "20140306.845", "deps": [] }, + "2048-game": { + "fetch": { + "tag": "fetchhg", + "url": "https://bitbucket.com/zck/2048.el", + "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l", + "rev": "ea6c3bce8ac1" + }, + "recipe": { + "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0", + "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943" + }, + "version": "20151026.1433", + "deps": [] + }, "mag-menu": { "fetch": { "tag": "fetchFromGitHub", From f3b7101bbbc17f3127cb0374f6217df1afdb81f9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jan 2016 11:03:07 -0600 Subject: [PATCH 4/5] emacs24PackagesNg: do not recurseIntoAttrs Fixes #12353. The "emacs-" prefix on the package names interfered with "nix-env -i" because package names starting with numerals were interpreted as versions of the "emacs" package. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c9fda23a30..8d185f61369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11688,7 +11688,7 @@ let }; }; - emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); + emacs24PackagesNg = emacsPackagesNgGen emacs24; emacs24WithPackages = emacs24PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; From 3a03a6dd608ab64ab0d396890e572064bce5dc4f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jan 2016 11:05:45 -0600 Subject: [PATCH 5/5] build emacs24PackagesNg on Hydra This is required now because we do not recurseIntoAttrs for emacsPackagesNg. This has the side-effect of removing duplicate jobs. --- pkgs/top-level/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4795fa21a90..5682b331c92 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -235,6 +235,8 @@ let zsh = linux; zsnes = ["i686-linux"]; + emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg; + gnome = { gnome_panel = linux; metacity = linux;