wd2: build package from remote repository using git submodule

This commit is contained in:
Dmitriy Pleshevskiy 2023-04-03 17:04:05 +03:00
parent a0aa4c0bf2
commit 0b9a39026b
Signed by: pleshevskiy
GPG Key ID: 79C4487B44403985
3 changed files with 9 additions and 4 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "pkgs/wd2"]
path = pkgs/wd2
url = gitea@git.pleshevski.ru:pleshevskiy/wd2.git

View File

@ -1,17 +1,17 @@
{ {
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
poetry2nix.url = "github:nix-community/poetry2nix"; poetry2nix.url = "github:nix-community/poetry2nix";
poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
poetry2nix.inputs.flake-utils.follows = "flake-utils"; poetry2nix.inputs.flake-utils.follows = "flake-utils";
}; };
outputs = { self, nixpkgs, flake-utils, poetry2nix, ... }: outputs = { nixpkgs, flake-utils, poetry2nix, ... }:
let let
inherit (builtins) listToAttrs mapAttrs; inherit (builtins) listToAttrs mapAttrs;
allPackageNames = [ "d2" "d2plugin-tala" "d2full" "fawltydeps" ]; allPackageNames = [ "d2" "d2plugin-tala" "d2full" "wd2" "fawltydeps" ];
mkAllPackages = pkgs': mkAllPackages = pkgs':
let let
d2-unwrapped = pkgs'.callPackage ./pkgs/d2/d2-unwrapped.nix { }; d2-unwrapped = pkgs'.callPackage ./pkgs/d2/d2-unwrapped.nix { };
@ -20,9 +20,10 @@
inherit d2-unwrapped d2plugin-tala; inherit d2-unwrapped d2plugin-tala;
}; };
fawltydeps = pkgs'.callPackage ./pkgs/fawltydeps { }; fawltydeps = pkgs'.callPackage ./pkgs/fawltydeps { };
wd2 = pkgs'.callPackage ./pkgs/wd2/wd2.nix { inherit d2; };
in in
{ {
inherit d2 d2plugin-tala fawltydeps; inherit d2 d2plugin-tala wd2 fawltydeps;
d2-full = d2.override { withTala = true; }; d2-full = d2.override { withTala = true; };
}; };

1
pkgs/wd2 Submodule

@ -0,0 +1 @@
Subproject commit bb99c5585b5a2e1edcdaf8b22f76ba4bbbb889dc