diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-08-28T14·25-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-08-28T21·24+0000 |
| commit | a7cd92770d3d2f35ae04713fb5e245536a1a95e9 (patch) | |
| tree | 757fea8bcf73331454db57bdf609f96f8ceb849b /users/glittershark/xanthous | |
| parent | fb0528c5dada2d3af6152b37a46e505e6bb2ac94 (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/xanthous')
| -rw-r--r-- | users/glittershark/xanthous/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix index 0b89a50afb9e..8dfd0bce4bd0 100644 --- a/users/glittershark/xanthous/default.nix +++ b/users/glittershark/xanthous/default.nix @@ -2,6 +2,9 @@ , lib ? pkgs.lib , ... }: -pkgs.haskell.lib.failOnAllWarnings ( +(pkgs.haskell.lib.failOnAllWarnings ( pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {} -) +)) // { + # TODO(grfn): Get this passing (see https://buildkite.com/tvl/depot/builds/3055) + meta.ci = false; +} |