commit 8e39c363814abe560cc624a9ce633b819e8b3bc5
parent a456a84a32574eec829bbb152bc07093e2039a88
Author: Jared Tobin <jared@jtobin.io>
Date: Sun, 19 Jan 2025 18:51:31 +0400
meta: use nixpkgs and flake-utils from ppad-nixpkgs
Diffstat:
M | flake.lock | | | 78 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- |
M | flake.nix | | | 13 | ++++++++++--- |
2 files changed, 84 insertions(+), 7 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -54,6 +54,24 @@
"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,
@@ -102,6 +120,22 @@
"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": [
@@ -132,6 +166,26 @@
"url": "git://git.ppad.tech/hmac-drbg.git"
}
},
+ "ppad-nixpkgs": {
+ "inputs": {
+ "flake-utils": "flake-utils_3",
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1737297101,
+ "narHash": "sha256-EnXnq+JLflbWt+DvaGGnY2gfAqsGNOm5vPgHh3hkfwQ=",
+ "ref": "master",
+ "rev": "f29823875250bc99b3891f7373535ccde9a29a44",
+ "revCount": 1,
+ "type": "git",
+ "url": "git://git.ppad.tech/nixpkgs.git"
+ },
+ "original": {
+ "ref": "master",
+ "type": "git",
+ "url": "git://git.ppad.tech/nixpkgs.git"
+ }
+ },
"ppad-sha256": {
"inputs": {
"flake-utils": "flake-utils",
@@ -154,8 +208,8 @@
},
"ppad-sha256_2": {
"inputs": {
- "flake-utils": "flake-utils_3",
- "nixpkgs": "nixpkgs_3"
+ "flake-utils": "flake-utils_4",
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1737140591,
@@ -195,14 +249,15 @@
"root": {
"inputs": {
"flake-utils": [
- "ppad-sha256",
+ "ppad-nixpkgs",
"flake-utils"
],
"nixpkgs": [
- "ppad-sha256",
+ "ppad-nixpkgs",
"nixpkgs"
],
"ppad-hmac-drbg": "ppad-hmac-drbg",
+ "ppad-nixpkgs": "ppad-nixpkgs",
"ppad-sha256": "ppad-sha256_2"
}
},
@@ -250,6 +305,21 @@
"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
@@ -2,6 +2,11 @@
description = "Pure Haskell Schnorr, ECDSA on secp256k1";
inputs = {
+ ppad-nixpkgs = {
+ type = "git";
+ url = "git://git.ppad.tech/nixpkgs.git";
+ ref = "master";
+ };
ppad-sha256 = {
type = "git";
url = "git://git.ppad.tech/sha256.git";
@@ -12,11 +17,13 @@
url = "git://git.ppad.tech/hmac-drbg.git";
ref = "master";
};
- flake-utils.follows = "ppad-sha256/flake-utils";
- nixpkgs.follows = "ppad-sha256/nixpkgs";
+ flake-utils.follows = "ppad-nixpkgs/flake-utils";
+ nixpkgs.follows = "ppad-nixpkgs/nixpkgs";
};
- outputs = { self, nixpkgs, flake-utils, ppad-sha256, ppad-hmac-drbg }:
+ outputs = { self, nixpkgs, flake-utils, ppad-nixpkgs
+ , ppad-sha256, ppad-hmac-drbg
+ }:
flake-utils.lib.eachDefaultSystem (system:
let
lib = "ppad-secp256k1";