commit 21663da2aee53c3f78b8cd63d05661b0db642ccc
parent e86efa2247adba15e2901b13811237536763c6f2
Author: Jared Tobin <jared@jtobin.io>
Date: Mon, 22 Dec 2025 19:18:10 -0330
flake: update
Diffstat:
| M | flake.lock | | | 138 | ++++++++++++++++++++----------------------------------------------------------- |
| M | flake.nix | | | 33 | +++++++++++++++++++++++++++++---- |
2 files changed, 64 insertions(+), 107 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -65,80 +65,6 @@
"url": "git://git.ppad.tech/base16.git"
}
},
- "ppad-base16_2": {
- "inputs": {
- "flake-utils": [
- "ppad-bip32",
- "ppad-secp256k1",
- "ppad-hmac-drbg",
- "ppad-base16",
- "ppad-nixpkgs",
- "flake-utils"
- ],
- "nixpkgs": [
- "ppad-bip32",
- "ppad-secp256k1",
- "ppad-hmac-drbg",
- "ppad-base16",
- "ppad-nixpkgs",
- "nixpkgs"
- ],
- "ppad-nixpkgs": [
- "ppad-bip32",
- "ppad-secp256k1",
- "ppad-hmac-drbg",
- "ppad-nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1741625558,
- "narHash": "sha256-ZBDXRD5fsVqA5bGrAlcnhiu67Eo50q0M9614nR3NBwY=",
- "ref": "master",
- "rev": "fb63457f2e894eda28250dfe65d0fcd1d195ac2f",
- "revCount": 24,
- "type": "git",
- "url": "git://git.ppad.tech/base16.git"
- },
- "original": {
- "ref": "master",
- "type": "git",
- "url": "git://git.ppad.tech/base16.git"
- }
- },
- "ppad-base16_3": {
- "inputs": {
- "flake-utils": [
- "ppad-pbkdf",
- "ppad-base16",
- "ppad-nixpkgs",
- "flake-utils"
- ],
- "nixpkgs": [
- "ppad-pbkdf",
- "ppad-base16",
- "ppad-nixpkgs",
- "nixpkgs"
- ],
- "ppad-nixpkgs": [
- "ppad-pbkdf",
- "ppad-nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1741625558,
- "narHash": "sha256-ZBDXRD5fsVqA5bGrAlcnhiu67Eo50q0M9614nR3NBwY=",
- "ref": "master",
- "rev": "fb63457f2e894eda28250dfe65d0fcd1d195ac2f",
- "revCount": 24,
- "type": "git",
- "url": "git://git.ppad.tech/base16.git"
- },
- "original": {
- "ref": "master",
- "type": "git",
- "url": "git://git.ppad.tech/base16.git"
- }
- },
"ppad-base58": {
"inputs": {
"flake-utils": [
@@ -211,11 +137,11 @@
]
},
"locked": {
- "lastModified": 1766360190,
- "narHash": "sha256-aZh7oXi/nE6/Ft0aE6Y6rdoUWqcv5lE8J3ocrd/oR98=",
+ "lastModified": 1766437840,
+ "narHash": "sha256-VfzKdpkxgFcikXfgLg4HMReXJ5NF2XXf0yOQl5awTnY=",
"ref": "master",
- "rev": "f38feccb2b38aa6f3108a13c58b5d3195272a843",
- "revCount": 53,
+ "rev": "948c5e477175306875a5227cfde64bdc0365c739",
+ "revCount": 55,
"type": "git",
"url": "git://git.ppad.tech/bip32.git"
},
@@ -245,11 +171,11 @@
]
},
"locked": {
- "lastModified": 1766353466,
+ "lastModified": 1766362512,
"narHash": "sha256-uQ2PW6AuO5ihjQuaedKUjpCzXBNd+yrZWxQl7kz6QwE=",
"ref": "master",
- "rev": "602f5fbd031106b89b31bea5eddf1c0dc3b07148",
- "revCount": 253,
+ "rev": "703e7e3659198a1ead37cb4b3e6dbcd995b8dd45",
+ "revCount": 255,
"type": "git",
"url": "git://git.ppad.tech/fixed.git"
},
@@ -275,7 +201,11 @@
"ppad-nixpkgs",
"nixpkgs"
],
- "ppad-base16": "ppad-base16_2",
+ "ppad-base16": [
+ "ppad-bip32",
+ "ppad-secp256k1",
+ "ppad-base16"
+ ],
"ppad-nixpkgs": [
"ppad-bip32",
"ppad-secp256k1",
@@ -293,11 +223,11 @@
]
},
"locked": {
- "lastModified": 1750582815,
- "narHash": "sha256-m9Ynf6rCAGrGU8bPil2apUC5nwPNfJSkak4GOVPj9ok=",
+ "lastModified": 1766436802,
+ "narHash": "sha256-cZBaR5zBpguiusf3/BzjwrMY63FoXDVGuas+e8QyjTc=",
"ref": "master",
- "rev": "d49f5c7c03c82d4d8321f2932b19160822715ebc",
- "revCount": 52,
+ "rev": "c23408f69f64d41c3d5478801bb16c0603b4e43b",
+ "revCount": 53,
"type": "git",
"url": "git://git.ppad.tech/hmac-drbg.git"
},
@@ -339,7 +269,9 @@
"ppad-nixpkgs",
"nixpkgs"
],
- "ppad-base16": "ppad-base16_3",
+ "ppad-base16": [
+ "ppad-base16"
+ ],
"ppad-nixpkgs": [
"ppad-nixpkgs"
],
@@ -351,11 +283,11 @@
]
},
"locked": {
- "lastModified": 1750504143,
- "narHash": "sha256-m6L/zql8pKo/Z2Sye/3bDfKcg0kWyFNCW1K2i5qqZb0=",
+ "lastModified": 1766443383,
+ "narHash": "sha256-+FjF8wCtcY5t18PzMWWeiRNbj6x28v/zsOZ/QZ3pPLY=",
"ref": "master",
- "rev": "e61072b6f3c7bf134c53dff5e3e659f4802f959c",
- "revCount": 15,
+ "rev": "f57238108ff1feaa1b7ec95bee3953a5a0236cf7",
+ "revCount": 16,
"type": "git",
"url": "git://git.ppad.tech/pbkdf.git"
},
@@ -440,11 +372,11 @@
]
},
"locked": {
- "lastModified": 1766355085,
- "narHash": "sha256-Kvl8C9GXN6BMgPpahfBF0Emq2BH318McldU1k2L/K0k=",
+ "lastModified": 1766437039,
+ "narHash": "sha256-kBWdl/ENxhOxExPIoV7Ie2E3g6NHTuKEsyaOpEPKVUA=",
"ref": "master",
- "rev": "50faf718771e0577b6ac13f5c7a0391abf1376f7",
- "revCount": 215,
+ "rev": "07e360a0da43053bff65c81f5e992fb37fa4e996",
+ "revCount": 221,
"type": "git",
"url": "git://git.ppad.tech/secp256k1.git"
},
@@ -474,11 +406,11 @@
]
},
"locked": {
- "lastModified": 1750583530,
- "narHash": "sha256-elc+wo2v26SW9WWqZ+36nlrEHTCIotUbbPU0eeMaKLc=",
+ "lastModified": 1766435555,
+ "narHash": "sha256-ysN0iRuBLSQrgWU3rCFUyq0NvRpug6DTBRZSlWbmI1A=",
"ref": "master",
- "rev": "282fa90825bbc04c324c58186da473cb380d0fc2",
- "revCount": 95,
+ "rev": "a4c17689cd66e1ef35c667914765cb24c9a4b305",
+ "revCount": 96,
"type": "git",
"url": "git://git.ppad.tech/sha256.git"
},
@@ -508,11 +440,11 @@
]
},
"locked": {
- "lastModified": 1750736173,
- "narHash": "sha256-7AGv9HktdslIaVDO8IQUMrcBewmFngHlwqEUaYsI6kw=",
+ "lastModified": 1766437426,
+ "narHash": "sha256-vn0nUVrMqux2PorMOZlx3RAqylf88BTw+jRMXC0gIz8=",
"ref": "master",
- "rev": "ba7757cf61132cf3c3d79960f51ddaf4801f7aec",
- "revCount": 30,
+ "rev": "669c4ffd1cc7826876af2d67661738c2081ea6a9",
+ "revCount": 31,
"type": "git",
"url": "git://git.ppad.tech/sha512.git"
},
diff --git a/flake.nix b/flake.nix
@@ -41,6 +41,7 @@
url = "git://git.ppad.tech/pbkdf.git";
ref = "master";
inputs.ppad-nixpkgs.follows = "ppad-nixpkgs";
+ inputs.ppad-base16.follows = "ppad-base16";
inputs.ppad-sha256.follows = "ppad-sha256";
inputs.ppad-sha512.follows = "ppad-sha512";
};
@@ -68,13 +69,37 @@
(hlib.enableCabalFlag bip32 "llvm")
[ llvm ];
+ sha256 = ppad-sha256.packages.${system}.default;
+ sha256-llvm =
+ hlib.addBuildTools
+ (hlib.enableCabalFlag sha256 "llvm")
+ [ llvm ];
+
+ sha512 = ppad-sha512.packages.${system}.default;
+ sha512-llvm =
+ hlib.addBuildTools
+ (hlib.enableCabalFlag sha512 "llvm")
+ [ llvm ];
+
+ pbkdf = ppad-pbkdf.packages.${system}.default;
+ pbkdf-llvm =
+ hlib.addBuildTools
+ (hlib.enableCabalFlag pbkdf "llvm")
+ [ llvm ];
+
hpkgs = pkgs.haskell.packages.ghc981.extend (new: old: {
- ${lib} = old.callCabal2nixWithOptions lib ./. "--enable-profiling" {};
ppad-bip32 = bip32-llvm;
ppad-base16 = ppad-base16.packages.${system}.default;
- ppad-sha256 = ppad-sha256.packages.${system}.default;
- ppad-sha512 = ppad-sha512.packages.${system}.default;
- ppad-pbkdf = ppad-pbkdf.packages.${system}.default;
+ ppad-sha256 = sha256-llvm;
+ ppad-sha512 = sha512-llvm;
+ ppad-pbkdf = pbkdf-llvm;
+ ${lib} = new.callCabal2nixWithOptions lib ./. "--enable-profiling" {
+ ppad-bip32 = new.ppad-bip32;
+ ppad-base16 = new.ppad-base16;
+ ppad-sha256 = new.ppad-sha256;
+ ppad-sha512 = new.ppad-sha512;
+ ppad-pbkdf = new.ppad-pbkdf;
+ };
});
cc = pkgs.stdenv.cc;
