Merge pull request #12365 from ttuegel/emacs-packages

Don't recurseIntoAttrs on emacsPackagesNg

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",
@@ -11385,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",
@@ -37286,6 +37318,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",

pkgs/top-level/all-packages.nix

@@ -11688,7 +11688,7 @@ let
     };
   };
 
-  emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24);
+  emacs24PackagesNg = emacsPackagesNgGen emacs24;
 
   emacs24WithPackages = emacs24PackagesNg.emacsWithPackages;
   emacsWithPackages = emacsPackagesNg.emacsWithPackages;

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;