commit c16d001261e0307653e2e55e228936bedfd50866
parent efda90d7ddda365c9e2bda2ed1e9acc9265a4eaf
Author: Jared Tobin <jared@jtobin.io>
Date: Sun, 19 Jan 2025 18:43:39 +0400
meta: use nixpkgs and flake-utils from ppad-nixpkgs
Diffstat:
M | flake.lock | | | 76 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- |
M | flake.nix | | | 13 | ++++++++++--- |
2 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -18,6 +18,24 @@
"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"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1725910328,
@@ -34,12 +52,48 @@
"type": "github"
}
},
- "ppad-sha256": {
+ "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"
+ }
+ },
+ "ppad-nixpkgs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"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_2",
+ "nixpkgs": "nixpkgs_2"
+ },
+ "locked": {
"lastModified": 1728824578,
"narHash": "sha256-sMZLvmbl3fBUHpBePzGuLdUyUALba/P5DCgKVgqEH1k=",
"ref": "master",
@@ -57,13 +111,14 @@
"root": {
"inputs": {
"flake-utils": [
- "ppad-sha256",
+ "ppad-nixpkgs",
"flake-utils"
],
"nixpkgs": [
- "ppad-sha256",
+ "ppad-nixpkgs",
"nixpkgs"
],
+ "ppad-nixpkgs": "ppad-nixpkgs",
"ppad-sha256": "ppad-sha256"
}
},
@@ -81,6 +136,21 @@
"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"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
@@ -2,16 +2,23 @@
description = "ppad-csecp256k1";
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";
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 }:
+ outputs = { self, nixpkgs, flake-utils, ppad-nixpkgs
+ , ppad-sha256
+ }:
flake-utils.lib.eachDefaultSystem (system:
let
lib = "ppad-csecp256k1";