From e79084dd8bd64b9dccb0b98a99e58ac4f084d3ca Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 28 Feb 2022 15:17:53 +0100
Subject: pkgs/profpatsch: remove easy-dhall-nix, use dhall from nixpkgs

---
 pkgs/profpatsch/default.nix          | 17 ++++-------------
 pkgs/profpatsch/importDhall.nix      |  6 +++---
 pkgs/profpatsch/nix-tools.nix        |  2 ++
 pkgs/profpatsch/xdg-open/default.nix |  3 +--
 pkgs/profpatsch/xrandr.nix           |  4 ++--
 5 files changed, 12 insertions(+), 20 deletions(-)

(limited to 'pkgs/profpatsch')

diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index c7516927..3dcde9c3 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -181,7 +181,7 @@ in rec {
     inherit writeExecline writeHaskellInterpret getBins runInEmptyEnv sandbox;
   };
 
-  xrandr = import ./xrandr.nix { inherit pkgs getBins runExeclineLocal writeExecline toNetstringKeyVal dhall-json; };
+  xrandr = import ./xrandr.nix { inherit pkgs getBins runExeclineLocal writeExecline toNetstringKeyVal; };
 
   inherit (callPackage ./utils-hs {})
     until watch-server
@@ -264,16 +264,7 @@ in rec {
     ;
 
 
-  easy-dhall-nix = (import (pkgs.fetchFromGitHub {
-    owner = "justinwoo";
-    repo = "easy-dhall-nix";
-    rev = "288ee825c326f352a5db194a024bd3e1f2f735b2";
-    sha256 = "12v4ql1nm1famz8r80k1xkkdgj7285vy2vn16iili0qwvz3i98ah";
-  }) { inherit pkgs; });
 
-  dhall = easy-dhall-nix.dhall-simple;
-  dhall-nix = easy-dhall-nix.dhall-nix-simple;
-  dhall-json = easy-dhall-nix.dhall-json-simple;
 
   # dhall-flycheck = (import /home/philip/kot/dhall/flycheck/overlay.nix pkgs pkgs).dhall-flycheck;
 
@@ -286,9 +277,9 @@ in rec {
   #     sha256 = "0d6qjr245jmx1lvqdplvrshlkpfaqa46aizyhyb6hg37v8jq8rv7";
   #   }}/overlay.nix" pkgs pkgs).dhall-flycheck;
 
-  buildDhallPackage = pkgs.callPackage ./dhall/build-dhall-package-improved.nix { inherit dhall; };
+  buildDhallPackage = pkgs.callPackage ./dhall/build-dhall-package-improved.nix { };
 
-  inherit (import ./importDhall.nix { inherit pkgs dhall-nix dhall-json exactSource; })
+  inherit (import ./importDhall.nix { inherit pkgs exactSource; })
     importDhall
     importDhall2
     readDhallFileAsJson
@@ -296,7 +287,7 @@ in rec {
 
   rust-deps = (import ./rust-deps.nix { inherit (pkgs) buildRustCrate; });
 
-  inherit (import ./xdg-open { inherit pkgs getBins importDhall2 writeExecline dhall buildDhallPackage runExeclineLocal netencode-rs writeRustSimple record-get el-exec lazy-packages; })
+  inherit (import ./xdg-open { inherit pkgs getBins importDhall2 writeExecline buildDhallPackage runExeclineLocal netencode-rs writeRustSimple record-get el-exec lazy-packages; })
     xdg-open
     Prelude
     read-headers-and-follow-redirect
diff --git a/pkgs/profpatsch/importDhall.nix b/pkgs/profpatsch/importDhall.nix
index d1028c41..4334be3c 100644
--- a/pkgs/profpatsch/importDhall.nix
+++ b/pkgs/profpatsch/importDhall.nix
@@ -1,4 +1,4 @@
-{ pkgs, dhall-nix, dhall-json, exactSource }:
+{ pkgs, exactSource }:
 let
 
   # import the dhall file as nix expression via dhall-nix.
@@ -40,7 +40,7 @@ let
         # TODO: This is a bit of a hack hrm.
         cd "${src}"
         printf '%s' ${pkgs.lib.escapeShellArg "${src}/${main} : ${type}"} \
-          | ${dhall-nix}/bin/dhall-to-nix \
+          | ${pkgs.dhall-nix}/bin/dhall-to-nix \
           > $out
       '';
     in import convert;
@@ -52,7 +52,7 @@ let
     let
       convert = pkgs.runCommandLocal "dhall-to-json" {} ''
         printf '%s' ${pkgs.lib.escapeShellArg "${file} : ${dhallType}"} \
-          | ${dhall-json}/bin/dhall-to-json \
+          | ${pkgs.dhall-json}/bin/dhall-to-json \
           > $out
       '';
     in builtins.fromJSON (builtins.readFile convert);
diff --git a/pkgs/profpatsch/nix-tools.nix b/pkgs/profpatsch/nix-tools.nix
index 1f2ae89e..40db055c 100644
--- a/pkgs/profpatsch/nix-tools.nix
+++ b/pkgs/profpatsch/nix-tools.nix
@@ -3,6 +3,8 @@
 let
   bins = getBins pkgs.nix [ "nix-build" "nix-instantiate" ];
 
+  # TODO: both of these don’t prevent `result` from being created. good? bad?
+
   # Usage (execline syntax):
   #    nix-run { -A foo <more_nix_options> } args...
   #
diff --git a/pkgs/profpatsch/xdg-open/default.nix b/pkgs/profpatsch/xdg-open/default.nix
index f3c0084c..4d0e6804 100644
--- a/pkgs/profpatsch/xdg-open/default.nix
+++ b/pkgs/profpatsch/xdg-open/default.nix
@@ -1,7 +1,6 @@
 { pkgs, getBins,
 importDhall2,
 writeExecline,
-dhall,
 buildDhallPackage,
 runExeclineLocal,
 writeRustSimple,
@@ -20,12 +19,12 @@ let
       // getBins pkgs.s6 [ "s6-ioconnect" ]
       // getBins pkgs.s6-portable-utils [ "s6-test" ]
       // getBins pkgs.s6-networking [ "s6-tcpclient" ]
+      // getBins pkgs.lilyterm-git [ "lilyterm" ]
       // getBins pkgs.netcat-openbsd [ "nc" ]
       // getBins pkgs.dmenu [ "dmenu" "dmenu_path" ]
       # TODO: make sure these are the ones from the environment
       // getBins pkgs.emacs [ "emacsclient" ]
       // getBins pkgs.firefox [ "firefox" ]
-      // getBins pkgs.lilyterm-git [ "lilyterm" ]
       // getBins pkgs.ranger [ "ranger" ]
       // getBins pkgs.khal [ "khal" ]
       ;
diff --git a/pkgs/profpatsch/xrandr.nix b/pkgs/profpatsch/xrandr.nix
index a4630ea0..269ae244 100644
--- a/pkgs/profpatsch/xrandr.nix
+++ b/pkgs/profpatsch/xrandr.nix
@@ -1,10 +1,10 @@
-{ pkgs, getBins, writeExecline, runExeclineLocal, toNetstringKeyVal, dhall-json, ... }:
+{ pkgs, getBins, writeExecline, runExeclineLocal, toNetstringKeyVal, ... }:
 
 let
   inherit (pkgs) lib;
   bins = getBins pkgs.nodejs [ "node" ]
       // getBins pkgs.coreutils [ "echo" "ln" "mkdir" ]
-      // getBins dhall-json [ "json-to-dhall" ]
+      // getBins pkgs.dhall-json [ "json-to-dhall" ]
       // getBins pkgs.xorg.xrandr [ "xrandr" ]
       ;
 
-- 
cgit 1.4.1