commit 3ccb47ca88ee2a439e4d096c75bb83ebe0e07393
parent 8e39c363814abe560cc624a9ce633b819e8b3bc5
Author: Jared Tobin <jared@jtobin.io>
Date: Sun, 19 Jan 2025 20:42:54 +0400
flake: better inputs follows
Diffstat:
| M | flake.lock | | | 243 | ++++++++++++++++++------------------------------------------------------------- |
| M | flake.nix | | | 13 | ++++++++++++- |
2 files changed, 65 insertions(+), 191 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -18,60 +18,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_3": {
- "inputs": {
- "systems": "systems_3"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_4": {
- "inputs": {
- "systems": "systems_4"
- },
- "locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
"lastModified": 1725910328,
@@ -88,75 +34,34 @@
"type": "github"
}
},
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1725910328,
- "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1725910328,
- "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
- "locked": {
- "lastModified": 1725910328,
- "narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "5775c2583f1801df7b790bf7f7d710a19bac66f4",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"ppad-hmac-drbg": {
"inputs": {
"flake-utils": [
"ppad-hmac-drbg",
- "ppad-sha256",
+ "ppad-nixpkgs",
"flake-utils"
],
"nixpkgs": [
"ppad-hmac-drbg",
- "ppad-sha256",
+ "ppad-nixpkgs",
"nixpkgs"
],
- "ppad-sha256": "ppad-sha256",
- "ppad-sha512": "ppad-sha512"
+ "ppad-nixpkgs": [
+ "ppad-nixpkgs"
+ ],
+ "ppad-sha256": [
+ "ppad-sha256"
+ ],
+ "ppad-sha512": [
+ "ppad-sha512"
+ ]
},
"locked": {
- "lastModified": 1731565487,
- "narHash": "sha256-ARrXvAIAaA3H1KuvZxWywh72s5KTIZ+BUHMZ3Rgp9dA=",
+ "lastModified": 1737297956,
+ "narHash": "sha256-3/jNY1Qd1dIYUEQSH47xJxvgg5dS6fVFWwxasgcI9OA=",
"ref": "master",
- "rev": "e7ec90dfcbb3749148da69e3919c3c14880f92be",
- "revCount": 42,
+ "rev": "27a88d0f011578171aee824ef838dfbf60fa6898",
+ "revCount": 43,
"type": "git",
"url": "git://git.ppad.tech/hmac-drbg.git"
},
@@ -168,8 +73,8 @@
},
"ppad-nixpkgs": {
"inputs": {
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_3"
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1737297101,
@@ -188,35 +93,26 @@
},
"ppad-sha256": {
"inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1726493969,
- "narHash": "sha256-toJ5A5+0/xijqVELjXfE3AdWV24B672R16JWq+gKLFk=",
- "ref": "master",
- "rev": "e92f4e13d6afa962109e76d35c6fcb38045e28ed",
- "revCount": 69,
- "type": "git",
- "url": "git://git.ppad.tech/sha256.git"
- },
- "original": {
- "ref": "master",
- "type": "git",
- "url": "git://git.ppad.tech/sha256.git"
- }
- },
- "ppad-sha256_2": {
- "inputs": {
- "flake-utils": "flake-utils_4",
- "nixpkgs": "nixpkgs_4"
+ "flake-utils": [
+ "ppad-sha256",
+ "ppad-nixpkgs",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "ppad-sha256",
+ "ppad-nixpkgs",
+ "nixpkgs"
+ ],
+ "ppad-nixpkgs": [
+ "ppad-nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1737140591,
- "narHash": "sha256-jsIDUQuxf7iv/r0Yxn6yCMRVhgq7Sk0SNjwdQ9GhASU=",
+ "lastModified": 1737298572,
+ "narHash": "sha256-iAo6GFH1FLNi0wt0FczbqPCmVzCm9gfMEjk1oakExt0=",
"ref": "master",
- "rev": "c1d5aa2a01d183f2ef71573cdba4591ce0f7b59c",
- "revCount": 86,
+ "rev": "abc984dc65f0df9bd958c0bc8f390c68e660f710",
+ "revCount": 87,
"type": "git",
"url": "git://git.ppad.tech/sha256.git"
},
@@ -228,15 +124,26 @@
},
"ppad-sha512": {
"inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "flake-utils": [
+ "ppad-sha512",
+ "ppad-nixpkgs",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "ppad-sha512",
+ "ppad-nixpkgs",
+ "nixpkgs"
+ ],
+ "ppad-nixpkgs": [
+ "ppad-nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1728147405,
- "narHash": "sha256-KQ56eDSkXNvy7VXPC2+L64b94nqYjxU0JkZxKFtIePA=",
+ "lastModified": 1737298660,
+ "narHash": "sha256-W8wuLHRH7P5oITCXnxKEEnSD2yX1Qo7uypbxpwKvvM8=",
"ref": "master",
- "rev": "c454a32a4a39b0e18601b8139a12ae895c9b631e",
- "revCount": 8,
+ "rev": "e8ce88cafbf32900556832d3817997642f128242",
+ "revCount": 21,
"type": "git",
"url": "git://git.ppad.tech/sha512.git"
},
@@ -258,7 +165,8 @@
],
"ppad-hmac-drbg": "ppad-hmac-drbg",
"ppad-nixpkgs": "ppad-nixpkgs",
- "ppad-sha256": "ppad-sha256_2"
+ "ppad-sha256": "ppad-sha256",
+ "ppad-sha512": "ppad-sha512"
}
},
"systems": {
@@ -275,51 +183,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_3": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
@@ -11,18 +11,29 @@
type = "git";
url = "git://git.ppad.tech/sha256.git";
ref = "master";
+ inputs.ppad-nixpkgs.follows = "ppad-nixpkgs";
+ };
+ ppad-sha512 = {
+ type = "git";
+ url = "git://git.ppad.tech/sha512.git";
+ ref = "master";
+ inputs.ppad-nixpkgs.follows = "ppad-nixpkgs";
};
ppad-hmac-drbg = {
type = "git";
url = "git://git.ppad.tech/hmac-drbg.git";
ref = "master";
+ inputs.ppad-sha256.follows = "ppad-sha256";
+ inputs.ppad-sha512.follows = "ppad-sha512";
+ inputs.ppad-nixpkgs.follows = "ppad-nixpkgs";
};
flake-utils.follows = "ppad-nixpkgs/flake-utils";
nixpkgs.follows = "ppad-nixpkgs/nixpkgs";
};
outputs = { self, nixpkgs, flake-utils, ppad-nixpkgs
- , ppad-sha256, ppad-hmac-drbg
+ , ppad-sha256, ppad-sha512
+ , ppad-hmac-drbg
}:
flake-utils.lib.eachDefaultSystem (system:
let
