diff options
| -rw-r--r-- | third_party/default.nix | 18 | ||||
| -rw-r--r-- | third_party/dhall/OWNERS | 3 | ||||
| -rw-r--r-- | third_party/dhall/default.nix | 22 | ||||
| -rw-r--r-- | third_party/nixpkgs-exposed/exposed/default.nix | 1 |
4 files changed, 26 insertions, 18 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index c0a8b4df5dcb..774e634f9cef 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -47,24 +47,6 @@ in exposed.lib.fix(self: exposed // { }; - # 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; 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; +} diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix index 3aa97e4bd6e5..3d3e23afab46 100644 --- a/third_party/nixpkgs-exposed/exposed/default.nix +++ b/third_party/nixpkgs-exposed/exposed/default.nix @@ -91,6 +91,7 @@ libffi linuxPackages linuxPackages_5_11 + lr luajit lutris makeFontsConf |