Skip to content

Commit

Permalink
nix: update to ghc 9.6.4 (#1927)
Browse files Browse the repository at this point in the history
* nix: s/pkgconfig/pkg-config/

This alias is deprecated and removed in newer versions of nixpkgs, so just go
ahead and get rid of it and use the proper spelling.

Change-Id: I793f11948bd47be080c5cf6e17c401f168bc68b4

* cabal: update `rocksdb-haskell`

Change-Id: I014a3fb49b0e121bcac4593faff8f4ddea828bd9

* nix: ghc964 update

This includes an update to the IOHK cache signing key, since apparently they're
publishing new binaries under a new key.

Change-Id: Ie0d0b4d905f3915e0b3f346b6acac6e41ec02251
  • Loading branch information
thoughtpolice authored May 13, 2024
1 parent 12896d7 commit fb0d749
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 26 deletions.
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/kadena-io/rocksdb-haskell.git
tag: 1a82da5660a4cc2681eb90da6505b6897d1b12e9
--sha256: 020n6knl8psh5y9766amrsh706ka83fz3vfm77lrzngg5mcz45qs
tag: cede9de2932a4ead1bd82fd7709b19ab7b19b33d
--sha256: 1dngd44va6h66vwpdpwmnj0zcky87m4vzykjwv49p2km12lwq9mf

source-repository-package
type: git
Expand Down
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ let flakeDefaultNix = (import (
};
in
{ pkgs ? pkgsDef
, compiler ? "ghc963"
, compiler ? "ghc964"
, flakePath ? flakeDefaultNix.outPath
, nix-filter ? inputs.nix-filter
, pact ? null
Expand Down Expand Up @@ -75,7 +75,7 @@ let haskellSrc = with nix-filter.lib; filter {
};
shell.buildInputs = with pkgs; [
zlib
pkgconfig
pkg-config
];
modules = [
{
Expand Down
76 changes: 55 additions & 21 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

nixConfig = {
extra-substituters = "https://nixcache.chainweb.com https://cache.iog.io";
trusted-public-keys = "nixcache.chainweb.com:FVN503ABX9F8x8K0ptnc99XEz5SaA4Sks6kNcZn2pBY= iohk.cachix.org-1:DpRUyj7h7V830dp/i6Nti+NEO2/nhblbov/8MW7Rqoo= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
trusted-public-keys = "nixcache.chainweb.com:FVN503ABX9F8x8K0ptnc99XEz5SaA4Sks6kNcZn2pBY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
};

outputs = inputs@{ self, hs-nix-infra, flake-utils, nix-filter, ... }:
Expand Down

0 comments on commit fb0d749

Please sign in to comment.