From cf7761e96e1a92efb891fce5325cc1b7b13e6411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Sat, 25 Jan 2020 20:19:06 +0100 Subject: [PATCH 1/4] nix-doom-emacs: support versions using dependency pinning Doom versions after the following needs an updated version of nix-straight.el commit 4cc14389e84937c52c248e740190e2697bfcd389 Author: Henrik Lissner Date: Tue Jan 14 22:32:11 2020 -0500 PIN ALL THE PACKAGES --- derivations.json | 2 +- derivations.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/derivations.json b/derivations.json index d8778b5..15ff576 100644 --- a/derivations.json +++ b/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", diff --git a/derivations.lock b/derivations.lock index 6bbdcb3..beb3b45 100644 --- a/derivations.lock +++ b/derivations.lock @@ -17,12 +17,12 @@ "args": { "owner": "vlaci", "repo": "nix-straight.el", - "rev": "ed6b14fc7a4f391229e74d5a8828a351798dda27", - "sha256": "0rmpvz2c2f4vdk8xdk0xqdr3pzxqfimwch4ri7cyyzqc327bd0m8" + "rev": "446f3d70f1816305130f307c0cf2bc8db77ed698", + "sha256": "1p4yp46kwhii8w9yf882fca9r3addn91wg6f4mv62wnkfm0i6q0f" }, "meta": { - "updated": "2019-11-22T19:53:27+00:00", - "rev": "ed6b14fc7a4f391229e74d5a8828a351798dda27" + "updated": "2020-01-25T18:43:31+00:00", + "rev": "446f3d70f1816305130f307c0cf2bc8db77ed698" } }, "org-yt": { From 8e95b5f888bbe9d36a1a54d8a602dbac747c284e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Sat, 25 Jan 2020 20:22:30 +0100 Subject: [PATCH 2/4] nix-doom-emacs: org-mode fork to support newer doom versions commit 964291bb3662ffb19ddc9150c2f4eb0ec05b3af1 Author: Henrik Lissner Date: Wed Jan 22 18:36:37 2020 -0500 Fix #2409: switch to org mirror --- default.nix | 19 +++++++++++++++++++ derivations.json | 4 ++++ derivations.lock | 13 +++++++++++++ 3 files changed, 36 insertions(+) diff --git a/default.nix b/default.nix index 82ea183..038a33e 100644 --- a/default.nix +++ b/default.nix @@ -88,6 +88,25 @@ let src = lock.get pname; buildPhase = ":"; }; + org-mode = self.trivialBuild rec { + pname = "org-mode"; + version = "9.4"; + recipe = null; + ename = pname; + src = lock.get pname; + installPhase = '' + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + + cp -r * $LISPDIR + + cat > $LISPDIR/lisp/org-version.el < Date: Sat, 25 Jan 2020 21:28:05 +0100 Subject: [PATCH 3/4] straightBuild: simplify extra package definition --- default.nix | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/default.nix b/default.nix index 038a33e..2855001 100644 --- a/default.nix +++ b/default.nix @@ -64,36 +64,24 @@ 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-mode = self.trivialBuild rec { + org-mode = self.straightBuild rec { pname = "org-mode"; version = "9.4"; - recipe = null; - ename = pname; - src = lock.get pname; installPhase = '' LISPDIR=$out/share/emacs/site-lisp install -d $LISPDIR @@ -107,27 +95,15 @@ let EOF ''; }; - org-yt = self.trivialBuild rec { + 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; }; }; From 40f264bd733586d6448024a5283ce9d4366c8d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= Date: Sat, 25 Jan 2020 21:29:09 +0100 Subject: [PATCH 4/4] updating dependencies --- derivations.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/derivations.lock b/derivations.lock index f7e6269..3f4337c 100644 --- a/derivations.lock +++ b/derivations.lock @@ -4,12 +4,12 @@ "args": { "owner": "hlissner", "repo": "doom-emacs", - "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9", - "sha256": "1a1gl700f7f0jcvfljp9xw8lhxdlkv36d2mkm976n99jp6rdyhal" + "rev": "d39961b30df1bdccdc40281c3879abecbe1ffdfb", + "sha256": "18mmdcc24m7n1px5fgkfsb9ys305q3v9hni5djnfzl1y0q3mapg0" }, "meta": { - "updated": "2020-01-07T09:34:04+00:00", - "rev": "b5a279311cfec3d1e66678bf3bff47f4118a62a9" + "updated": "2020-01-25T14:25:34+00:00", + "rev": "d39961b30df1bdccdc40281c3879abecbe1ffdfb" } }, "nix-straight.el": { @@ -43,12 +43,12 @@ "args": { "owner": "nix-community", "repo": "emacs-overlay", - "rev": "78dee3837b57fb29c8794d65af165582f51b2db2", - "sha256": "15fv8daidd6pzvvxplnl8fkw67yb8zihknjnnq0lz88x9hp3fviv" + "rev": "4b2bc0ed3c0473a6ea26e38952abdd8acf461063", + "sha256": "0j9sas3g4fhz8ar3f0zk9w273qlp9ij5s65gn8vn4lgnxgwap1ri" }, "meta": { - "updated": "2020-01-07T09:34:09+00:00", - "rev": "78dee3837b57fb29c8794d65af165582f51b2db2" + "updated": "2020-01-25T18:43:36+00:00", + "rev": "4b2bc0ed3c0473a6ea26e38952abdd8acf461063" } }, "evil-markdown": {