From d3bd516367625e82b068c38f7ece7a781c735b9e Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 1 Jun 2023 13:58:32 -0400
Subject: [PATCH] add/bump necessary haskell library flake inputs
---
flake.lock | 212 +++++++++++++++++++++++++++++++++++++--
flake.nix | 10 +-
nix/haskell-packages.nix | 2 +
3 files changed, 216 insertions(+), 8 deletions(-)
diff --git a/flake.lock b/flake.lock
index d583394..605b213 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,6 +48,22 @@
"type": "github"
}
},
+ "flake-compat_4": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-utils": {
"locked": {
"lastModified": 1667395993,
@@ -138,6 +154,39 @@
"type": "github"
}
},
+ "flake-utils_7": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1681202837,
+ "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_8": {
+ "locked": {
+ "lastModified": 1676283394,
+ "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -206,6 +255,29 @@
"type": "github"
}
},
+ "gitignore_4": {
+ "inputs": {
+ "nixpkgs": [
+ "tahoe-ssk",
+ "hs-flake-utils",
+ "pre-commit-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1660459072,
+ "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"hs-flake-utils": {
"inputs": {
"flake-utils": "flake-utils_2",
@@ -269,6 +341,27 @@
"url": "https://whetstone.private.storage/jcalderone/hs-flake-utils.git"
}
},
+ "hs-flake-utils_4": {
+ "inputs": {
+ "flake-utils": "flake-utils_8",
+ "nixpkgs": "nixpkgs_4",
+ "pre-commit-hooks": "pre-commit-hooks_4"
+ },
+ "locked": {
+ "lastModified": 1681762240,
+ "narHash": "sha256-+PLx9xHBvV70dA7Gy/+YTH1w3PcSOrGV0z0rGxts8jU=",
+ "ref": "main",
+ "rev": "a51e591b7fdf8881ac0237452691df7b1aceecd3",
+ "revCount": 10,
+ "type": "git",
+ "url": "https://whetstone.private.storage/jcalderone/hs-flake-utils.git"
+ },
+ "original": {
+ "ref": "main",
+ "type": "git",
+ "url": "https://whetstone.private.storage/jcalderone/hs-flake-utils.git"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1677624842,
@@ -333,6 +426,22 @@
"type": "github"
}
},
+ "nixpkgs-stable_4": {
+ "locked": {
+ "lastModified": 1673800717,
+ "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-22.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
"lastModified": 1677624842,
@@ -365,6 +474,22 @@
"type": "github"
}
},
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1677624842,
+ "narHash": "sha256-4DF9DbDuK4/+KYx0L6XcPBeDHUFVCtzok2fWtwXtb5w=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "d70f5cd5c3bef45f7f52698f39e7cc7a89daa7f0",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-22.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@@ -453,6 +578,36 @@
"type": "github"
}
},
+ "pre-commit-hooks_4": {
+ "inputs": {
+ "flake-compat": "flake-compat_4",
+ "flake-utils": [
+ "tahoe-ssk",
+ "hs-flake-utils",
+ "flake-utils"
+ ],
+ "gitignore": "gitignore_4",
+ "nixpkgs": [
+ "tahoe-ssk",
+ "hs-flake-utils",
+ "nixpkgs"
+ ],
+ "nixpkgs-stable": "nixpkgs-stable_4"
+ },
+ "locked": {
+ "lastModified": 1677722096,
+ "narHash": "sha256-7mjVMvCs9InnrRybBfr5ohqcOz+pyEX8m22C1XsDilg=",
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "61a3511668891c68ebd19d40122150b98dc2fe3b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "pre-commit-hooks.nix",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
"flake-utils": "flake-utils",
@@ -462,7 +617,23 @@
"nixpkgs"
],
"tahoe-chk": "tahoe-chk",
- "tahoe-great-black-swamp": "tahoe-great-black-swamp"
+ "tahoe-great-black-swamp": "tahoe-great-black-swamp",
+ "tahoe-ssk": "tahoe-ssk"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
}
},
"tahoe-chk": {
@@ -502,19 +673,46 @@
]
},
"locked": {
- "lastModified": 1683553313,
- "narHash": "sha256-tXZc8ZDNkHtegoM1HlDUf1Jr5IE04aobZDpnBaBm53w=",
- "ref": "refs/tags/0.2.0.2",
- "rev": "ab799ee24d7150e13b300b86240433ecdb783577",
- "revCount": 187,
+ "lastModified": 1685640961,
+ "narHash": "sha256-zH9bRWqm1dYcgg9/VSVJ7y8qZIM8fwp5H0rRsaWT8lg=",
+ "ref": "refs/tags/0.3.0.0",
+ "rev": "3d00d90d1e64897aa92f33a012343a5ca46fe7fc",
+ "revCount": 194,
"type": "git",
"url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp"
},
"original": {
- "ref": "refs/tags/0.2.0.2",
+ "ref": "refs/tags/0.3.0.0",
"type": "git",
"url": "https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp"
}
+ },
+ "tahoe-ssk": {
+ "inputs": {
+ "flake-utils": "flake-utils_7",
+ "hs-flake-utils": "hs-flake-utils_4",
+ "nixpkgs": [
+ "hs-flake-utils",
+ "nixpkgs"
+ ],
+ "tahoe-chk": [
+ "tahoe-chk"
+ ]
+ },
+ "locked": {
+ "lastModified": 1685641443,
+ "narHash": "sha256-lgHcvFz6s07HXdGCz1C/dOSVLi0HiAtHiv0Na4QkQEg=",
+ "ref": "refs/tags/0.2.0.0",
+ "rev": "1afe634278c96d61b8acb994ec82a71a6394d032",
+ "revCount": 84,
+ "type": "git",
+ "url": "https://whetstone.private.storage/PrivateStorage/tahoe-ssk"
+ },
+ "original": {
+ "ref": "refs/tags/0.2.0.0",
+ "type": "git",
+ "url": "https://whetstone.private.storage/PrivateStorage/tahoe-ssk"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 01d65c6..d04dcad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,8 +12,14 @@
inputs.nixpkgs.follows = "hs-flake-utils/nixpkgs";
};
+ tahoe-ssk = {
+ url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-ssk?ref=refs/tags/0.2.0.0";
+ inputs.nixpkgs.follows = "hs-flake-utils/nixpkgs";
+ inputs.tahoe-chk.follows = "tahoe-chk";
+ };
+
tahoe-great-black-swamp = {
- url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?ref=refs/tags/0.2.0.2";
+ url = "git+https://whetstone.private.storage/PrivateStorage/tahoe-great-black-swamp?ref=refs/tags/0.3.0.0";
inputs.nixpkgs.follows = "hs-flake-utils/nixpkgs";
inputs.tahoe-chk.follows = "tahoe-chk";
};
@@ -25,6 +31,7 @@
flake-utils,
hs-flake-utils,
tahoe-chk,
+ tahoe-ssk,
tahoe-great-black-swamp,
}: let
ulib = flake-utils.lib;
@@ -42,6 +49,7 @@
packageName = "gbs-downloader";
hsPkgsOverrides = import ./nix/haskell-packages.nix {
tahoe-chk = tahoe-chk.outputs.packages.${system}.default;
+ tahoe-ssk = tahoe-ssk.outputs.packages.${system}.default;
tahoe-great-black-swamp = tahoe-great-black-swamp.outputs.packages.${system}.default;
haskellLib = pkgs.haskell.lib;
};
diff --git a/nix/haskell-packages.nix b/nix/haskell-packages.nix
index 175fc20..dbf474b 100644
--- a/nix/haskell-packages.nix
+++ b/nix/haskell-packages.nix
@@ -1,9 +1,11 @@
{
haskellLib,
tahoe-chk,
+ tahoe-ssk,
tahoe-great-black-swamp,
}: hfinal: hprev: {
inherit tahoe-chk;
+ inherit tahoe-ssk;
inherit tahoe-great-black-swamp;
# A broken dependency of a tahoe-great-black-swamp executable that we don't
--
GitLab