about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2020-01-02 02:39:08 +0100
committerProfpatsch <mail@profpatsch.de>2020-01-26 22:52:30 +0100
commit057b0a46b542267dc4c8a3a61427923bb2797a50 (patch)
tree2ff7735447da7a10399d9bea3a1bee8e61704a6b
parentf951122cfa4eae46609c8f10e4b2677d14cf9efa (diff)
machines/profpatsch/shiki: use dhall from binary release
The hackage (and thus nixpkgs) version is sadly very much outdated.
Luckily, Justin Woo provides the statically linked binaries from the
upstream project.

This won’t work for patches or using the library, but at the moment
it’s okay.
-rw-r--r--machines/profpatsch/pkgs.nix9
-rw-r--r--machines/profpatsch/shiki.nix4
-rw-r--r--pkgs/profpatsch/utils-hs/default.nix11
3 files changed, 2 insertions, 22 deletions
diff --git a/machines/profpatsch/pkgs.nix b/machines/profpatsch/pkgs.nix
index df60fb62..4919a808 100644
--- a/machines/profpatsch/pkgs.nix
+++ b/machines/profpatsch/pkgs.nix
@@ -102,14 +102,6 @@ let
         --replace 'notify-send' '${notify-send}'
     '';
 
-  dhall-flycheck = pkgs.vuizvui.profpatsch.haskellPackages.callPackage
-    (import "${pkgs.fetchFromGitHub {
-      owner = "Profpatsch";
-      repo = "dhall-flycheck";
-      rev = "0db095732820cd27eccbe9ece97500dd292353de";
-      sha256 = "05n76b781fgm5n7kqq1gpqfzshjfpadahxryxqrfvs3sjn3a6bvp";
-    }}/dhall-flycheck.nix") {};
-
 in
 { inherit
     nix
@@ -123,6 +115,5 @@ in
     saneGhci
     /*searx*/
     pyrnotify
-    dhall-flycheck
     ;
 }
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 3929c019..f624abe7 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -176,8 +176,8 @@ in {
         pkgs.vuizvui.profpatsch.watch-server # restart server on code change
         pkgs.vuizvui.profpatsch.until        # restart until cmd succeeds
         execline
-        dhall
-        myPkgs.dhall-flycheck
+        pkgs.vuizvui.profpatsch.dhall
+        pkgs.vuizvui.profpatsch.dhall-flycheck
       ];
       documentation = [
         # mustache-spec NOT IN 16.09
diff --git a/pkgs/profpatsch/utils-hs/default.nix b/pkgs/profpatsch/utils-hs/default.nix
index 9ddd50ec..f54b0dfa 100644
--- a/pkgs/profpatsch/utils-hs/default.nix
+++ b/pkgs/profpatsch/utils-hs/default.nix
@@ -58,17 +58,6 @@ let
             dependent-sum prettyprinter (hlib.doJailbreak ref-tf)
           ]);
         });
-
-        dhall-nix = hlib.justStaticExecutables (hlib.overrideCabal hsuper.dhall-nix (old: {
-          src = fetchFromGitHub {
-            owner = "Profpatsch";
-            repo = "dhall-nix";
-            # manual update to dhall @0.19
-            rev = "feae0ce5b2ecf4daeeae15c39f427f126c33da7c";
-            sha256 = "1kdsbnj681lf65dsdclcrzj4cab1hh0v22n2140386zvwmawyp6r";
-          };
-          broken = false;
-        }));
       });
     };