aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/README.md
diff options
context:
space:
mode:
authorXandor Schiefer <me@xandor.co.za>2023-10-04 00:30:54 +0200
committerXandor Schiefer <me@xandor.co.za>2023-10-14 12:29:23 +0200
commit6c422ee16f76e4c8e21e855e94c9608a68d6b071 (patch)
treea73d8d0c7a1541108f01941d2f68730cf46213d6 /README.md
parentMerge pull request #391 from FedericoSchonborn/master (diff)
downloadYubiKey-Guide-6c422ee16f76e4c8e21e855e94c9608a68d6b071.tar.gz
fix: update `hopenpgp-tools` in the NixOS build
Fixes https://github.com/drduh/YubiKey-Guide/issues/370.
Diffstat (limited to 'README.md')
-rw-r--r--README.md34
1 files changed, 32 insertions, 2 deletions
diff --git a/README.md b/README.md
index 23ae7e6..0cf2054 100644
--- a/README.md
+++ b/README.md
@@ -323,13 +323,43 @@ let
};
in {
- nixpkgs.config = { allowBroken = true; };
+ nixpkgs.overlays = [
+ # hopenpgp-tools in nixpkgs 23.05 is out-of-date and has a broken build
+ (final: prev: {
+ haskellPackages = prev.haskellPackages.override {
+ overrides = hsFinal: hsPrev:
+ let
+ optparse-applicative =
+ final.haskell.lib.overrideCabal hsPrev.optparse-applicative
+ (oldAttrs: {
+ version = "0.18.1.0";
+ sha256 =
+ "sha256-Y4EatP0m6Cm4hoNkMlqIvjrMeYGfW7UAWy3TuWHsxJE=";
+ libraryHaskellDepends =
+ (oldAttrs.libraryHaskellDepends or [ ])
+ ++ (with hsFinal; [
+ text
+ prettyprinter
+ prettyprinter-ansi-terminal
+ ]);
+ });
+ hopenpgp-tools =
+ (final.haskell.lib.overrideCabal hsPrev.hopenpgp-tools
+ (oldAttrs: {
+ version = "0.23.8";
+ sha256 =
+ "sha256-FYvlVE0o/LOYk3a2rucAqm7tg5D/uNQRRrCu/wlDNAE=";
+ broken = false;
+ })).override { inherit optparse-applicative; };
+ in { inherit hopenpgp-tools; };
+ };
+ })
+ ];
isoImage.isoBaseName = lib.mkForce "nixos-yubikey";
# Uncomment this to disable compression and speed up image creation time
#isoImage.squashfsCompression = "gzip -Xcompression-level 1";
- boot.kernelPackages = linuxPackages_latest;
# Always copytoram so that, if the image is booted from, e.g., a
# USB stick, nothing is mistakenly written to persistent storage.
boot.kernelParams = [ "copytoram" ];