From 26a6c3a3405cdb2c2218cdc4e1e2bcf7a07af7ba Mon Sep 17 00:00:00 2001 From: lbodor Date: Wed, 27 Mar 2024 15:59:28 +1100 Subject: [PATCH] WIP-haskell-cabal: fetch correct cabal revisions Fetch cabal revisions from `https://hackage.haskell.org/package/{name}-{version}/revisions/`, rather than `https://hackage.haskell.org/package/{name}/revisions/`, which fetches revisions for the latest package version, not the version pinned in `./dist-newstyle/cache/plan.json`. --- modules/dream2nix/WIP-haskell-cabal/lock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dream2nix/WIP-haskell-cabal/lock.py b/modules/dream2nix/WIP-haskell-cabal/lock.py index da03cb6b..778c9665 100644 --- a/modules/dream2nix/WIP-haskell-cabal/lock.py +++ b/modules/dream2nix/WIP-haskell-cabal/lock.py @@ -46,10 +46,10 @@ for i, pkg in enumerate(pkgs): id = pkg["id"] version = pkg["pkg-version"] - print(f"[{i+1}/{pkg_len}] Resolving revision for {name}") + print(f"[{i+1}/{pkg_len}] Resolving revision for {name}-{version}") revisions = requests.get( - f"https://hackage.haskell.org/package/{name}/revisions/", + f"https://hackage.haskell.org/package/{name}-{version}/revisions/", headers={"Accept": "application/json"}, ).json()