fix: d2 builds now
This commit is contained in:
parent
4eb3973ce7
commit
1d8cff745c
@ -1,54 +0,0 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, git
|
||||
, testers
|
||||
, d2
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "d2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrastruct";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GImv4OJHanj6dKtAJpTaGLrR4AaVTboiYHwRdh/gXaU";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T7eki06fQuGvYIJKvBJsIkFS1fQ9Jbv+ieUSr2vupqg=";
|
||||
|
||||
excludedPackages = [ "./e2etests" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X oss.terrastruct.com/d2/lib/version.Version=v${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage ci/release/template/man/d2.1
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
preCheck = ''
|
||||
# See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests.
|
||||
export TESTDATA_ACCEPT=1
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = d2;
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern diagram scripting language that turns text to diagrams";
|
||||
homepage = "https://d2lang.com";
|
||||
license = licenses.mpl20;
|
||||
};
|
||||
}
|
@ -233,9 +233,7 @@ EOF";
|
||||
clio = clio-flake.packages."${system}".default;
|
||||
unstablePkgs = import unstable { inherit system; };
|
||||
#lean4Pkg = lean4-flake.defaultPackage."${system}";
|
||||
in { config, pkgs, ... }: let
|
||||
d2-lang = pkgs.callPackage ./d2.nix {};
|
||||
in {
|
||||
in { config, pkgs, ... }: {
|
||||
|
||||
imports = [
|
||||
agenix-flake.nixosModules.default
|
||||
@ -317,8 +315,7 @@ EOF";
|
||||
alloy6
|
||||
tlaplus
|
||||
jdk
|
||||
# TODO(zaphar): d2 is broken in latest nixpkgs
|
||||
#d2-lang
|
||||
d2
|
||||
plantuml-c4
|
||||
nssTools
|
||||
nomad
|
||||
|
Loading…
x
Reference in New Issue
Block a user