Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Bump deps #133

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[Chore] Bump deps #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55b6b38
Automatically update flake.lock to the latest version
serokell-bot Oct 7, 2024
ccbc5d2
[Chore] Bump stack2cabal
rvem Oct 7, 2024
2552f9a
[Chore] Update resolvers used by the project
rvem Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by stack2cabal

with-compiler: ghc-9.2.5
with-compiler: ghc-9.2.8

packages:
./
Expand Down
900 changes: 453 additions & 447 deletions cabal.project.freeze
View file
Open in desktop

Large diffs are not rendered by default.

255 changes: 188 additions & 67 deletions flake.lock
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
};
};
};
} // (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
} // (flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" ] (system:
let
haskellPkgs = haskell-nix.legacyPackages."${system}";
pkgs = import nixpkgs {
Expand Down Expand Up @@ -92,8 +92,17 @@
# all components for the current haskell package
all-components = get-package-components hs-pkg.components;

stack2cabal = haskellPkgs.haskell.lib.overrideCabal haskellPkgs.haskellPackages.stack2cabal
(drv: { jailbreak = true; broken = false; });
stack2cabal = (haskellPkgs.haskell.lib.overrideCabal haskellPkgs.haskellPackages.stack2cabal
(drv: { jailbreak = true; broken = false; })).overrideAttrs (oldAttrs: {
version = "724dc9f";
# Pin the revision that works with newer GHCs
src = pkgs.fetchFromGitHub {
owner = "hasufell";
repo = "stack2cabal";
rev = "724dc9f478dac1208a607b9e4d2bc37b7a38e126";
sha256 = "sha256-HvtsyfuqwI21Dj1qOqxaLo0LA4MeEaNtxzeprKg+VGc=";
};
});

in {
# nixpkgs revision pinned by this flake
Expand Down
Loading
Loading