pleshevskiy
/
wd2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

flake: use d2 from nixpkgs instead of tools

This commit is contained in:
Dmitriy Pleshevskiy 2023-04-03 16:11:38 +03:00
parent 82d99a485c
commit 03c25ed475
Signed by: pleshevskiy
GPG Key ID: 79C4487B44403985
2 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
flake.lock
View File

@ -15,73 +15,26 @@
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1679281263,
"narHash": "sha256-neMref1GTruSLt1jBgAw+lvGsZj8arQYfdxvSi5yp4Q=",
"lastModified": 1680487167,
"narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8276a165b9fa3db1a7a4f29ee29b680e0799b9dc",
"rev": "53dad94e874c9586e71decf82d972dfb640ef044",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"tools": "tools"
}
},
"tools": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1679320952,
"narHash": "sha256-L7x8BwHWGFILwvXTluKJkfkSYZQxPbSXrzDc/HC80Oc=",
"ref": "refs/heads/main",
"rev": "88e2a5beb95722b454f081e5b766eef8f908eeb3",
"revCount": 30,
"type": "git",
"url": "https://git.pleshevski.ru/mynix/tools"
},
"original": {
"type": "git",
"url": "https://git.pleshevski.ru/mynix/tools"
"nixpkgs": "nixpkgs"
}
}
},

8
flake.nix
View File

@ -1,10 +1,10 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
tools.url = "git+https://git.pleshevski.ru/mynix/tools";
};
outputs = { self, nixpkgs, flake-utils, tools, ... }:
outputs = { nixpkgs, flake-utils, ... }:
let
inherit (builtins) readFile;
@ -27,9 +27,7 @@
inherit (builtins) mapAttrs;
pkgs = import nixpkgs { inherit system; };
wd2 = pkgs.callPackage mkWd2 {
d2 = tools.packages.${system}.d2;
};
wd2 = pkgs.callPackage mkWd2 { };
mkApp = drv: flake-utils.lib.mkApp { inherit drv; };
packages = {