From 0b9a39026b0107301908741f6226e815a411cdf0 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 3 Apr 2023 17:04:05 +0300 Subject: [PATCH] wd2: build package from remote repository using git submodule --- .gitmodules | 3 +++ flake.nix | 9 +++++---- pkgs/wd2 | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 pkgs/wd2 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..db87d2a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "pkgs/wd2"] + path = pkgs/wd2 + url = gitea@git.pleshevski.ru:pleshevskiy/wd2.git diff --git a/flake.nix b/flake.nix index 76990ef..b2bdac3 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,17 @@ { inputs = { - flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:NixOS/nixpkgs"; + flake-utils.url = "github:numtide/flake-utils"; poetry2nix.url = "github:nix-community/poetry2nix"; poetry2nix.inputs.nixpkgs.follows = "nixpkgs"; poetry2nix.inputs.flake-utils.follows = "flake-utils"; }; - outputs = { self, nixpkgs, flake-utils, poetry2nix, ... }: + outputs = { nixpkgs, flake-utils, poetry2nix, ... }: let inherit (builtins) listToAttrs mapAttrs; - allPackageNames = [ "d2" "d2plugin-tala" "d2full" "fawltydeps" ]; + allPackageNames = [ "d2" "d2plugin-tala" "d2full" "wd2" "fawltydeps" ]; mkAllPackages = pkgs': let d2-unwrapped = pkgs'.callPackage ./pkgs/d2/d2-unwrapped.nix { }; @@ -20,9 +20,10 @@ inherit d2-unwrapped d2plugin-tala; }; fawltydeps = pkgs'.callPackage ./pkgs/fawltydeps { }; + wd2 = pkgs'.callPackage ./pkgs/wd2/wd2.nix { inherit d2; }; in { - inherit d2 d2plugin-tala fawltydeps; + inherit d2 d2plugin-tala wd2 fawltydeps; d2-full = d2.override { withTala = true; }; }; diff --git a/pkgs/wd2 b/pkgs/wd2 new file mode 160000 index 0000000..bb99c55 --- /dev/null +++ b/pkgs/wd2 @@ -0,0 +1 @@ +Subproject commit bb99c5585b5a2e1edcdaf8b22f76ba4bbbb889dc