From 6489d94ad60c431d27836a0bc65953e44175b262 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 14:00:13 +0200 Subject: refactor(3p/dhall): Move easy-dhall-nix import into separate folder This is part of paving the way for clearly distinguishing between packages from nixpkgs and //third_party. See also: b/108, cl/2910 Change-Id: I28b5abd1f0f9fa3c4478c9f255b2025f4a4139f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2917 Tested-by: BuildkiteCI Reviewed-by: sterni Reviewed-by: Profpatsch Reviewed-by: tazjin --- third_party/dhall/OWNERS | 3 +++ third_party/dhall/default.nix | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 third_party/dhall/OWNERS create mode 100644 third_party/dhall/default.nix (limited to 'third_party/dhall') diff --git a/third_party/dhall/OWNERS b/third_party/dhall/OWNERS new file mode 100644 index 000000000000..a742d0d22bf6 --- /dev/null +++ b/third_party/dhall/OWNERS @@ -0,0 +1,3 @@ +inherited: true +owners: + - Profpatsch diff --git a/third_party/dhall/default.nix b/third_party/dhall/default.nix new file mode 100644 index 000000000000..6f3782233fa3 --- /dev/null +++ b/third_party/dhall/default.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +let + # binary releases of dhall tools, since the build in nixpkgs is + # broken most of the time. The binaries are also fully static + # builds, instead of the half-static crap that nixpkgs produces. + easy-dhall-nix = + import (builtins.fetchTarball { + url = "https://github.com/justinwoo/easy-dhall-nix/archive/eae7f64c4d6c70681e5a56c84198236930ba425e.tar.gz"; + sha256 = "1y2x15v8a679vlpxazjpibfwajp6zph60f8wjcm4xflbvazk0dx7"; + }) { inherit pkgs; }; +in { + dhall = easy-dhall-nix.dhall-simple; + dhall-bash = easy-dhall-nix.dhall-bash-simple; + dhall-docs = easy-dhall-nix.dhall-docs-simple; + dhall-json = easy-dhall-nix.dhall-json-simple; + dhall-lsp-server = easy-dhall-nix.dhall-lsp-simple; + dhall-nix = easy-dhall-nix.dhall-nix-simple; + # not yet in dhall-simple + # dhall-nixpkgs = easy-dhall-nix.dhall-nixpkgs-simple; + dhall-yaml = easy-dhall-nix.dhall-yaml-simple; +} -- cgit 1.4.1