mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/dhall): Move easy-dhall-nix import into separate folder

Browse source 
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 <sternenseemann@systemli.org>
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Vincent Ambo 2021-04-10 14:00:13 +02:00 committed by tazjin
parent 9c5b5600ea
commit 6489d94ad6
4 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
third_party/default.nix vendored
View file

@ -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;

3
third_party/dhall/OWNERS vendored Normal file
View file

@ -0,0 +1,3 @@
inherited: true
owners:
- Profpatsch

22
third_party/dhall/default.nix vendored Normal file
View file

@ -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;
}

1
third_party/nixpkgs-exposed/exposed/default.nix vendored
View file

@ -91,6 +91,7 @@
libffi
linuxPackages
linuxPackages_5_11
lr
luajit
lutris
makeFontsConf