Skip to content

Commit

Permalink
chore(nix): bump dependencies (#1298)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhess authored Nov 3, 2024
2 parents fe95f24 + 5b59500 commit e1fc18e
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 56 deletions.
110 changes: 56 additions & 54 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
pre-commit-hooks-nix.inputs.nixpkgs.follows = "nixpkgs";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";

ghc-wasm.url = "git+https://gitlab.haskell.org/ghc/ghc-wasm-meta";
ghc-wasm.url = "git+https://gitlab.haskell.org/ghc/ghc-wasm-meta?ref=refs/heads/master&rev=a04cc1a2206d2030326e1d49be9c6a94ee4283a3";
};

outputs = inputs@ { flake-parts, ... }:
Expand Down Expand Up @@ -431,6 +431,17 @@
doHoogle = true;
}
{
# Some packages are not visible to haskell.nix's planner, and need
# to be added manually.
#
# Ref:
# https://github.com/input-output-hk/haskell.nix/commit/61fbe408c01b6d61d010e6fb8e78bd19b5b025cc
package-keys = [
"bytestring-builder"
"diagrams"
"fail"
];

# These packages don't generate HIE files. See:
# https://github.com/input-output-hk/haskell.nix/issues/1242
packages.mtl-compat.writeHieFiles = false;
Expand Down Expand Up @@ -492,6 +503,12 @@

#TODO Explicitly requiring tasty-discover shouldn't be necessary - see the commented-out `build-tool-depends` in primer.cabal.
tasty-discover = "latest";

# Required until http-client-tls mess is resolved.
#
# Ref:
# https://github.com/input-output-hk/haskell.nix/issues/2277
hoogle.index-state = "2024-10-01T00:00:00Z";
};

buildInputs = (with final; [
Expand Down
2 changes: 1 addition & 1 deletion primer-service/primer-service.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ executable primer-client
, bytestring >=0.10.8.2 && <0.13
, directory
, exceptions
, http-client-tls ^>=0.3.6.1
, http-client-tls ==0.3.6.3
, optparse-applicative
, primer
, primer-service
Expand Down

0 comments on commit e1fc18e

Please sign in to comment.