Skip to content

Commit

Permalink
Merge #4288
Browse files Browse the repository at this point in the history
4288: Fix index-state syntax r=amesgen a=andreabedini

# Description

The second index-state stanza completely ovverides the first, resetting hackage index state to HEAD. See haskell/cabal#8568



Co-authored-by: Andrea Bedini <andrea.bedini@tweag.io>
  • Loading branch information
iohk-bors[bot] and andreabedini authored Feb 14, 2023
2 parents d5c4460 + 52d2f9d commit 9cb9181
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
11 changes: 7 additions & 4 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ repository cardano-haskell-packages

-- See CONTRIBUTING for some Nix commands you will need to run if you
-- update either of these.
-- Bump this if you need newer packages from Hackage
index-state: 2022-12-01T00:00:00Z
-- Bump this if you need newer packages from CHaP
index-state: cardano-haskell-packages 2022-11-15T00:00:00Z
-- repeat the index-state for hackage to work around haskell.nix parsing limitation
index-state: 2023-01-19T00:00:00Z
index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2023-01-19T00:00:00Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2022-11-15T00:00:00Z

packages: ./cardano-ping
./ouroboros-network-testing
Expand Down
12 changes: 6 additions & 6 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"homepage": "",
"owner": "input-output-hk",
"repo": "hackage.nix",
"rev": "a63a92060aa872b284db85fb914a7732931a0132",
"sha256": "1n211sgf43ymmi9bappp322gz8lrbgpqbgpbfk5hh234i5qkxqqr",
"rev": "bf364fc1eb12378e43c11a913fc8165702ce25c5",
"sha256": "1bhcyhwpn8vn7f4swa2lb8ygszm0905hq694k7mdvpwmk9fjn44y",
"type": "tarball",
"url": "https://github.com/input-output-hk/hackage.nix/archive/a63a92060aa872b284db85fb914a7732931a0132.tar.gz",
"url": "https://github.com/input-output-hk/hackage.nix/archive/bf364fc1eb12378e43c11a913fc8165702ce25c5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "b3c99d7f13df89a9a918c835ecb7114098912962"
},
Expand All @@ -30,10 +30,10 @@
"homepage": "https://input-output-hk.github.io/haskell.nix",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "cbf1e918b6e278a81c385155605b8504e498efef",
"sha256": "1dc9h10ads7krj4izp79d1nilyli9z34hdxayqrs82dfdv7fqyqp",
"rev": "a8e1e1dda4490210cac21eac5830813fe73dc497",
"sha256": "0g2igvgizz7q7669c7xvbbcqihk6w96a7857g2lzs5k2wff3fp9b",
"type": "tarball",
"url": "https://github.com/input-output-hk/haskell.nix/archive/cbf1e918b6e278a81c385155605b8504e498efef.tar.gz",
"url": "https://github.com/input-output-hk/haskell.nix/archive/a8e1e1dda4490210cac21eac5830813fe73dc497.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
"version": "962ecfed3a4fb656b5a91d89159291e00ed766bc"
},
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let
# IDE tools
ghcid = "0.8.7";
hasktags = "0.71.2";
haskell-language-server = "latest";
haskell-language-server = "1.8.0.0";
# Draw graph of module dependencies
graphmod = "1.4.4";
# Profiling tools
Expand Down

0 comments on commit 9cb9181

Please sign in to comment.