commit 585e53f16478a3a4a3d581163136866fbd311d4e
parent 0da2520a8c1c6ddaad121fef7569458be669a729
Author: Jared Tobin <jared@jtobin.io>
Date: Mon, 16 Sep 2024 16:30:13 +0400
meta: flake, lock updates
Diffstat:
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -38,22 +38,6 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1710734606,
- "narHash": "sha256-rFJl+WXfksu2NkWJWKGd5Km17ZGEjFg9hOQNwstsoU8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "79bb4155141a5e68f2bdee2bf6af35b1d27d3a1d",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
"lastModified": 1725910328,
"narHash": "sha256-n9pCtzGZ0httmTwMuEbi5E78UQ4ZbQMr1pzi5N0LAG8=",
"owner": "NixOS",
@@ -71,18 +55,19 @@
"ppad-sha256": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1726324606,
"narHash": "sha256-fV6mQuQLOtPQzXBP4LLeerb7dgGnA3bPBdNfd3eND6A=",
- "ref": "refs/heads/master",
+ "ref": "v0.1.0",
"rev": "6c0243df810e8959e193a0fe9e9f772235fefc52",
"revCount": 64,
"type": "git",
"url": "git://git.ppad.tech/sha256.git"
},
"original": {
+ "ref": "v0.1.0",
"type": "git",
"url": "git://git.ppad.tech/sha256.git"
}
@@ -90,7 +75,10 @@
"root": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": [
+ "ppad-sha256",
+ "nixpkgs"
+ ],
"ppad-sha256": "ppad-sha256"
}
},
diff --git a/flake.nix b/flake.nix
@@ -2,9 +2,15 @@
description = "ppad-secp256k1";
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+ nixpkgs = {
+ follows = "ppad-sha256/nixpkgs";
+ };
flake-utils.url = "github:numtide/flake-utils";
- ppad-sha256.url = "git://git.ppad.tech/sha256.git";
+ ppad-sha256 = {
+ type = "git";
+ url = "git://git.ppad.tech/sha256.git";
+ ref = "v0.1.0";
+ };
};
outputs = { self, nixpkgs, flake-utils, ppad-sha256 }:
@@ -18,7 +24,7 @@
hpkgs = pkgs.haskell.packages.ghc964.override {
overrides = new: old: {
ppad-sha256 = ppad-sha256.packages.${system}.ppad-sha256;
- ${lib} = old.callCabal2nix lib ./. {};
+ ${lib} = new.callCabal2nix lib ./. { };
};
};