From e79084dd8bd64b9dccb0b98a99e58ac4f084d3ca Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 28 Feb 2022 15:17:53 +0100 Subject: pkgs/profpatsch: remove easy-dhall-nix, use dhall from nixpkgs --- pkgs/profpatsch/importDhall.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/profpatsch/importDhall.nix') 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); -- cgit 1.4.1