about summary refs log tree commit diff
path: root/users/glittershark/gws.fyi
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-08-28T14·25-0400
committerglittershark <grfn@gws.fyi>2020-08-28T21·24+0000
commita7cd92770d3d2f35ae04713fb5e245536a1a95e9 (patch)
tree757fea8bcf73331454db57bdf609f96f8ceb849b /users/glittershark/gws.fyi
parentfb0528c5dada2d3af6152b37a46e505e6bb2ac94 (diff)
revert(glittershark): "Temporarily skip grfn's subtree" r/1728
This reverts commit 475d41f698415919093ca98f676ffcda218093ac. I'd like
my derivations back, please.

Changes necessary to get this working:

- Don't depend on `nixpkgs` being in the NIX_PATH for my website - it's
  not necessary anyway since emacs 27 is mainline now
- .skip-subtrees on things that shouldn't be evaluated anyway
- Get rid of system/pkgs, and move the one thing in there that *wasn't*
  already in third_party (alsi) to third_party
- Drop notifymuch for now - it's not working, and I'll probably get it
  landed in nixpkgs before I manage to get it working
- Add __readTree = true to my systems so they get built.
- explicitly disable ci for xanthous, which is failing to build and had
  been omitted previously

Change-Id: I20f5e81d6eb7ffe040091a08d75d0cb15304f707
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1864
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users/glittershark/gws.fyi')
-rw-r--r--users/glittershark/gws.fyi/orgExportHTML.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/users/glittershark/gws.fyi/orgExportHTML.nix b/users/glittershark/gws.fyi/orgExportHTML.nix
index 153036789f6b..ad5a24795826 100644
--- a/users/glittershark/gws.fyi/orgExportHTML.nix
+++ b/users/glittershark/gws.fyi/orgExportHTML.nix
@@ -1,22 +1,15 @@
-{ pkgs ? import <nixpkgs> {}, ... }:
+{ pkgs, ... }:
 
 with pkgs;
 with lib;
 
 let
 
-  emacs-nixpkgs =
-    (import <nixpkgs> {
-      overlays = [(import (builtins.fetchTarball {
-        url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz";
-        sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j";
-      }))];
-    });
-
-  emacs = (emacs-nixpkgs.emacsPackagesFor emacs-nixpkgs.emacsUnstable)
-    .emacsWithPackages (p: with p; [
-      org
-    ]);
+  emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
+
+  emacs = emacsWithPackages (p: with p; [
+    org
+  ]);
 
 in