mynix/tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wd2: build using flake instead of git submodule

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2023-04-03 17:31:32 +03:00
parent e7ab70f15d
commit 32d09ab0a7
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
5 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

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

4
README.md
View file

@ -14,13 +14,13 @@ nix build git+https://git.pleshevski.ru/mynix/tools#<name>
## As one-time executable application ## As one-time executable application
```sh ```sh
nix run git+https://git.pleshevski.ru/mynix/tools\?submodules=1#<name> nix run git+https://git.pleshevski.ru/mynix/tools#<name>
``` ```
## Using nix-profile ## Using nix-profile
```sh ```sh
nix profile install git+https://git.pleshevski.ru/mynix/tools\?submodules=1#<name> nix profile install git+https://git.pleshevski.ru/mynix/tools#<name>
``` ```
## As overlay for your flake ## As overlay for your flake

26
flake.lock
View file

@ -57,7 +57,31 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix",
"wd2": "wd2"
}
},
"wd2": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1680529255,
"narHash": "sha256-5MCwQKCpi3keKJ64GHnQ8XPibDfK+6oVDNr4lA9XNns=",
"ref": "refs/heads/main",
"rev": "bb99c5585b5a2e1edcdaf8b22f76ba4bbbb889dc",
"revCount": 21,
"type": "git",
"url": "https://git.pleshevski.ru/pleshevskiy/wd2"
},
"original": {
"type": "git",
"url": "https://git.pleshevski.ru/pleshevskiy/wd2"
} }
} }
}, },

9
flake.nix
View file

@ -2,12 +2,17 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils"; 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";
wd2.url = "git+https://git.pleshevski.ru/pleshevskiy/wd2";
wd2.inputs.nixpkgs.follows = "nixpkgs";
wd2.inputs.flake-utils.follows = "flake-utils";
}; };
outputs = { nixpkgs, flake-utils, poetry2nix, ... }: outputs = { nixpkgs, flake-utils, poetry2nix, ... } @ inputs:
let let
inherit (builtins) listToAttrs mapAttrs; inherit (builtins) listToAttrs mapAttrs;
@ -20,7 +25,7 @@
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; }; wd2 = pkgs'.callPackage "${inputs.wd2}/wd2.nix" { inherit d2; };
in in
{ {
inherit d2 d2plugin-tala wd2 fawltydeps; inherit d2 d2plugin-tala wd2 fawltydeps;

1
pkgs/wd2

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