about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--third_party/default.nix21
1 files changed, 20 insertions, 1 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index d64789c06f96..c0a8b4df5dcb 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -38,14 +38,33 @@ in exposed.lib.fix(self: exposed // {
   # version of it.
   inherit nixpkgsCommit nixpkgsSrc stableNixpkgsSrc;
 
-  # Packages to be overridden
+  # Expose upstream attributes so they can be overridden in readTree nodes
   originals = {
     inherit (nixpkgs) gtest openldap go grpc notmuch rr;
     inherit (stableNixpkgs) git tdlib;
     ffmpeg = nixpkgs.ffmpeg-full;
     telega = stableNixpkgs.emacsPackages.telega;
+
   };
 
+  # 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";
+    }) { pkgs = nixpkgs; };
+
+  dhall = self.easy-dhall-nix.dhall-simple;
+  dhall-bash = self.easy-dhall-nix.dhall-bash-simple;
+  dhall-docs = self.easy-dhall-nix.dhall-docs-simple;
+  dhall-json = self.easy-dhall-nix.dhall-json-simple;
+  dhall-lsp-server = self.easy-dhall-nix.dhall-lsp-simple;
+  dhall-nix = self.easy-dhall-nix.dhall-nix-simple;
+  # not yet in dhall-simple
+  # dhall-nixpkgs = self.easy-dhall-nix.dhall-nixpkgs-simple;
+  dhall-yaml = self.easy-dhall-nix.dhall-yaml-simple;
+
   # Use LLVM 11
   llvmPackages = nixpkgs.llvmPackages_11;
   clangStdenv = nixpkgs.llvmPackages_11.stdenv;