From 723c21ddb671aa4648559109c2d7ea3c23d9a9c9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 18 Apr 2021 10:29:49 +0200 Subject: fix(third_party/nixpkgs): always use easy-dhall-nix tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using the dhall executables from nixpkgs is basically always a mistake, they have to be built and are regularly broken. We don’t want to care about that, but just use the official statically built binary releases. Change-Id: Ia6d9254076ca21f55e020ae81548e80d6be8281d Reviewed-on: https://cl.tvl.fyi/c/depot/+/3041 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: zseri --- third_party/dhall/OWNERS | 3 --- third_party/dhall/default.nix | 25 ------------------------- third_party/nixpkgs/default.nix | 1 + third_party/overlays/dhall/OWNERS | 3 +++ third_party/overlays/dhall/default.nix | 27 +++++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 28 deletions(-) delete mode 100644 third_party/dhall/OWNERS delete mode 100644 third_party/dhall/default.nix create mode 100644 third_party/overlays/dhall/OWNERS create mode 100644 third_party/overlays/dhall/default.nix (limited to 'third_party') diff --git a/third_party/dhall/OWNERS b/third_party/dhall/OWNERS deleted file mode 100644 index a742d0d22b..0000000000 --- a/third_party/dhall/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -inherited: true -owners: - - Profpatsch diff --git a/third_party/dhall/default.nix b/third_party/dhall/default.nix deleted file mode 100644 index b4de613125..0000000000 --- a/third_party/dhall/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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; -} diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 74643cf70f..635082e27b 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -53,5 +53,6 @@ import nixpkgsSrc { depot.third_party.overlays.emacs depot.third_party.overlays.tvl depot.third_party.overlays.ecl-static + depot.third_party.overlays.dhall ] else [ ]); } diff --git a/third_party/overlays/dhall/OWNERS b/third_party/overlays/dhall/OWNERS new file mode 100644 index 0000000000..a742d0d22b --- /dev/null +++ b/third_party/overlays/dhall/OWNERS @@ -0,0 +1,3 @@ +inherited: true +owners: + - Profpatsch diff --git a/third_party/overlays/dhall/default.nix b/third_party/overlays/dhall/default.nix new file mode 100644 index 0000000000..74d2a999b9 --- /dev/null +++ b/third_party/overlays/dhall/default.nix @@ -0,0 +1,27 @@ +{ ... }: + +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