Merge remote-tracking branch 'origin/develop'

default.nix

@@ -64,51 +64,46 @@ let
     evil-escape = super.evil-escape.overrideAttrs (esuper: {
       patches = [ ./evil-escape.patch ];
     });
-    evil-markdown = self.trivialBuild rec {
+    straightBuild = { pname, ... }@args: self.trivialBuild ({
+      ename = pname;
+      version = "1";
+      src = lock.get pname;
+      buildPhase = ":";
+    } // args);
+    evil-markdown = self.straightBuild {
       pname = "evil-markdown";
-      version = "1";
-      recipe = null;
-      ename = pname;
-      src = lock.get pname;
-      buildPhase = ":";
     };
-    evil-org = self.trivialBuild rec {
+    evil-org = self.straightBuild {
       pname = "evil-org-mode";
-      version = "1";
-      recipe = null;
-      ename = pname;
-      src = lock.get pname;
-      buildPhase = ":";
     };
-    evil-quick-diff = self.trivialBuild rec {
+    evil-quick-diff = self.straightBuild {
       pname = "evil-quick-diff";
-      version = "1";
-      recipe = null;
-      ename = pname;
-      src = lock.get pname;
-      buildPhase = ":";
     };
-    org-yt = self.trivialBuild rec {
+    org-mode = self.straightBuild rec {
+      pname = "org-mode";
+      version = "9.4";
+      installPhase = ''
+        LISPDIR=$out/share/emacs/site-lisp
+        install -d $LISPDIR
+
+        cp -r * $LISPDIR
+
+        cat > $LISPDIR/lisp/org-version.el <<EOF
+        (fset 'org-release (lambda () "${version}"))
+        (fset 'org-git-version #'ignore)
+        (provide 'org-version)
+        EOF
+      '';
+    };
+    org-yt = self.straightBuild {
       pname = "org-yt";
-      version = "1";
-      recipe = null;
-      ename = pname;
-      src = lock.get pname;
     };
-    php-extras = self.trivialBuild rec {
+    php-extras = self.straightBuild {
       pname = "php-extras";
-      version = "1";
-      recipe = null;
-      ename = pname;
-      src = lock.get pname;
-      buildPhase = ":";
     };
-    so-long = self.trivialBuild rec {
+    so-long = self.straightBuild {
       pname = "so-long";
-      version = "1";
-      recipe = null;
       ename = "emacs-so-long";
-      src = lock.get pname;
     };
   };
 

derivations.json

@@ -7,7 +7,7 @@
     "nix-straight.el": {
         "owner": "vlaci",
         "repo": "nix-straight.el",
-        "rev": "v1.1.0"
+        "rev": "v1.2.0"
     },
     "evil-markdown": {
         "owner": "Somelauw",
@@ -21,6 +21,10 @@
         "owner": "rgrinberg",
         "repo": "evil-quick-diff"
     },
+    "org-mode": {
+        "owner": "emacs-straight",
+        "repo": "org-mode"
+    },
     "org-yt": {
         "owner": "TobiasZawada",
         "repo": "org-yt"

derivations.lock

@@ -4,12 +4,12 @@
         "args": {
             "owner": "hlissner",
             "repo": "doom-emacs",
-            "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9",
+            "rev": "d39961b30df1bdccdc40281c3879abecbe1ffdfb",
-            "sha256": "1a1gl700f7f0jcvfljp9xw8lhxdlkv36d2mkm976n99jp6rdyhal"
+            "sha256": "18mmdcc24m7n1px5fgkfsb9ys305q3v9hni5djnfzl1y0q3mapg0"
         },
         "meta": {
-            "updated": "2020-01-07T09:34:04+00:00",
+            "updated": "2020-01-25T14:25:34+00:00",
-            "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9"
+            "rev": "d39961b30df1bdccdc40281c3879abecbe1ffdfb"
         }
     },
     "nix-straight.el": {
@@ -17,12 +17,12 @@
         "args": {
             "owner": "vlaci",
             "repo": "nix-straight.el",
-            "rev": "ed6b14fc7a4f391229e74d5a8828a351798dda27",
+            "rev": "446f3d70f1816305130f307c0cf2bc8db77ed698",
-            "sha256": "0rmpvz2c2f4vdk8xdk0xqdr3pzxqfimwch4ri7cyyzqc327bd0m8"
+            "sha256": "1p4yp46kwhii8w9yf882fca9r3addn91wg6f4mv62wnkfm0i6q0f"
         },
         "meta": {
-            "updated": "2019-11-22T19:53:27+00:00",
+            "updated": "2020-01-25T18:43:31+00:00",
-            "rev": "ed6b14fc7a4f391229e74d5a8828a351798dda27"
+            "rev": "446f3d70f1816305130f307c0cf2bc8db77ed698"
         }
     },
     "org-yt": {
@@ -43,12 +43,12 @@
         "args": {
             "owner": "nix-community",
             "repo": "emacs-overlay",
-            "rev": "78dee3837b57fb29c8794d65af165582f51b2db2",
+            "rev": "4b2bc0ed3c0473a6ea26e38952abdd8acf461063",
-            "sha256": "15fv8daidd6pzvvxplnl8fkw67yb8zihknjnnq0lz88x9hp3fviv"
+            "sha256": "0j9sas3g4fhz8ar3f0zk9w273qlp9ij5s65gn8vn4lgnxgwap1ri"
         },
         "meta": {
-            "updated": "2020-01-07T09:34:09+00:00",
+            "updated": "2020-01-25T18:43:36+00:00",
-            "rev": "78dee3837b57fb29c8794d65af165582f51b2db2"
+            "rev": "4b2bc0ed3c0473a6ea26e38952abdd8acf461063"
         }
     },
     "evil-markdown": {
@@ -115,5 +115,18 @@
             "updated": "2020-01-07T11:56:38+00:00",
             "rev": "4d44e9bbdc3ae35d0050ca298886710f6531f434"
         }
+    },
+    "org-mode": {
+        "fetcher": "fetchFromGitHub",
+        "args": {
+            "owner": "emacs-straight",
+            "repo": "org-mode",
+            "rev": "cd1014a75a1ad63fdc44d6cd2722d529f1f5b7f7",
+            "sha256": "090fpka0mc8qvj2l0s8vh1cm2qfmlx9pfcd2ypnx8p88vgs2chg8"
+        },
+        "meta": {
+            "updated": "2020-01-25T18:50:42+00:00",
+            "rev": "cd1014a75a1ad63fdc44d6cd2722d529f1f5b7f7"
+        }
     }
 }