diff --git a/.github/workflows/updates.yml b/.github/workflows/updates.yml index 74bb663641..d96f78a975 100644 --- a/.github/workflows/updates.yml +++ b/.github/workflows/updates.yml @@ -19,6 +19,7 @@ jobs: - name: "Update pins" run: | nix flake update hackage + nix flake update hackage-for-stackage nix flake update stackage - name: Commit and push changes run: | diff --git a/flake.lock b/flake.lock index 78b5269438..4fd6ca4fe2 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1738715278, - "narHash": "sha256-SI154ShwJ24faTWlV/+phNfwOR7il5LPyRulpsCToHI=", + "lastModified": 1738753148, + "narHash": "sha256-51bAmpHmhB8f0kfIgoNa+Bcbo7MEkSksl0U3oEbJOi0=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "08261aa338ce30b6817ec7ed37b097ef284154e0", + "rev": "fef267ea152c43844462ef7f06c6056dbd2918be", "type": "github" }, "original": { @@ -133,6 +133,23 @@ "type": "github" } }, + "hackage-for-stackage": { + "flake": false, + "locked": { + "lastModified": 1738751775, + "narHash": "sha256-JnryfdymwMT4g1JqjBUw/BwzJOUj6g5PIlDxnRA/5ok=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "67b908f2ba3562455549d6775d99468ab7bcc901", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "for-stackage", + "repo": "hackage.nix", + "type": "github" + } + }, "hls-1.10": { "flake": false, "locked": { @@ -336,86 +353,6 @@ "type": "github" } }, - "nixpkgs-2003": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2205": { - "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2211": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2305": { "locked": { "lastModified": 1705033721, @@ -523,6 +460,7 @@ "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", + "hackage-for-stackage": "hackage-for-stackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", @@ -538,11 +476,6 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2105": "nixpkgs-2105", - "nixpkgs-2111": "nixpkgs-2111", - "nixpkgs-2205": "nixpkgs-2205", - "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", diff --git a/flake.nix b/flake.nix index 4c91e4744b..e803b54be0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,6 @@ inputs = { nixpkgs.follows = "nixpkgs-unstable"; - nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; }; - nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; }; - nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; }; - nixpkgs-2205 = { url = "github:NixOS/nixpkgs/nixpkgs-22.05-darwin"; }; - nixpkgs-2211 = { url = "github:NixOS/nixpkgs/nixpkgs-22.11-darwin"; }; nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; }; nixpkgs-2311 = { url = "github:NixOS/nixpkgs/nixpkgs-23.11-darwin"; }; nixpkgs-2405 = { url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; }; @@ -28,6 +23,10 @@ url = "github:input-output-hk/hackage.nix"; flake = false; }; + hackage-for-stackage = { + url = "github:input-output-hk/hackage.nix/for-stackage"; + flake = false; + }; stackage = { url = "github:input-output-hk/stackage.nix"; flake = false; diff --git a/hackage-src.json b/hackage-src.json deleted file mode 100644 index 65959ccd7c..0000000000 --- a/hackage-src.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/input-output-hk/hackage.nix", - "rev": "9bdefa51c864bbef48a2758b05b4b568f0ded62b", - "date": "2021-08-06T01:11:48+00:00", - "path": "/nix/store/isypgnv4qa5398z6vjc3fi620l4y87c4-hackage.nix-9bdefa5", - "sha256": "0pm3m864wwgf76isjwb8244xh8xykc94b5az6zb1h38q30s9xjji", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/overlays/haskell.nix b/overlays/haskell.nix index d4eb486ea1..1d3acd4dea 100644 --- a/overlays/haskell.nix +++ b/overlays/haskell.nix @@ -23,11 +23,6 @@ final: prev: { # here and be explicit about imports and dependencies. callPackage = prev.lib.callPackageWith (final // final.haskell-nix); - # You can provide different pins for hackage.nix and stackage.nix if required. - # It's also possible to override these sources with NIX_PATH. - hackageSourceJSON = ../hackage-src.json; - stackageSourceJSON = ../stackage-src.json; - # ghc hackage patches. # these are patches that turn hackage packages into the same as the ones # ghc ships with the supposedly same version. See GHC Track Issue: 16199 @@ -47,7 +42,7 @@ final: prev: { # All packages from Hackage as Nix expressions hackageSrc = sources.hackage; # The only stack projects need hackage.nix now - hackageForStack = import hackageSrc; + hackageForStack = import sources.hackage-for-stackage; # Contains the hashes of the cabal 01-index.tar.gz for given # index states. Starting from April 1st 2019. diff --git a/stackage-src.json b/stackage-src.json deleted file mode 100644 index d20fc5eba6..0000000000 --- a/stackage-src.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/input-output-hk/stackage.nix", - "rev": "452e9c671ca172a355dbd2582bdb50ef5133af26", - "date": "2021-08-05T01:03:17+00:00", - "path": "/nix/store/nhsdi6aglbqvrv4s2dzzfm4br40d96a0-stackage.nix-452e9c6", - "sha256": "0qmicvpr6xfnhyqllr3d87zv6q6njnasvj34ni19h7f9hakp0wjx", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/test/stack-remote-resolver/default.nix b/test/stack-remote-resolver/default.nix index 95f45180fa..83468a56bc 100644 --- a/test/stack-remote-resolver/default.nix +++ b/test/stack-remote-resolver/default.nix @@ -3,13 +3,13 @@ let project = project' { src = testSrc "stack-remote-resolver"; - resolverSha256 = "1rldkqqsxd8zxybrkqhc25bcxinhz212kz45jcz8jinfihc91jl7"; + resolverSha256 = "sha256-Vw1i0woTpbnbfl7KLAWZW6tfMHV7MOGLtzSlacM5sLE="; inherit evalPackages; }; packages = project.hsPkgs; in recurseIntoAttrs { - meta.disabled = compiler-nix-name != "ghc865"; + meta.disabled = compiler-nix-name != "ghc984"; ifdInputs = { inherit (project) stack-nix; };