Skip to content

Commit

Permalink
Bump flake inputs and tools (#859)
Browse files Browse the repository at this point in the history
 - Update flake inputs
 - Update HLS to 2.5
- Use upstream scriv as nedbat/scriv#91 was
merged and released in 1.4.0 (latest is 1.5.1 already).
  • Loading branch information
amesgen authored Jan 5, 2024
2 parents 5a984ce + 9fa5f84 commit 404aaec
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 50 deletions.
10 changes: 5 additions & 5 deletions docs/website/contents/for-developers/ReleaseProcess.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,12 @@ A - ...
# Installing `scriv`

To manage the workflow described above, we will use the `scriv` tool slightly
modified to support cabal files.. If you use `nix` then you will find `scriv` in
modified to support cabal files. If you use `nix` then you will find `scriv` in
the Nix shell. Otherwise, the way to install it from source is:

1. Clone [our fork of scriv](https://github.com/IntersectMBO/scriv/) and `cd`
into it.
2. Run `pip install -e $(pwd)`
```
pip install scriv
```

If you encounter an error mentioning:
`pkg_resources.extern.packaging.version.InvalidVersion: Invalid version: ...` we
Expand All @@ -248,7 +248,7 @@ installation complains with the error `error: externally-managed-environment`,
pass in the flag `--break-system-packages`:

```
pip install --break-system-packages -e $(pwd)
pip install --break-system-packages scriv
```

# Adding a changelog fragment
Expand Down
83 changes: 50 additions & 33 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 nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ hsPkgs.shellFor {
# This is the place for tools that are required to be built with the same GHC
# version as used in hsPkgs.
tools = lib.mapAttrs (_: t: t // { index-state = pkgs.tool-index-state; }) {
haskell-language-server = { version = "2.4.0.0"; };
haskell-language-server = { version = "2.5.0.0"; };
};

shellHook = ''
Expand Down
12 changes: 1 addition & 11 deletions nix/tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inputs: final: prev:

let
inherit (final) lib;
tool-index-state = "2023-11-16T00:00:00Z";
tool-index-state = "2024-01-01T00:00:00Z";
tool = name: version: other:
final.haskell-nix.tool final.hsPkgs.args.compiler-nix-name name ({
version = version;
Expand Down Expand Up @@ -52,16 +52,6 @@ in

cabal-fmt = tool "cabal-fmt" "0.1.9" { };

scriv = prev.scriv.overrideAttrs (_: {
version = "1.2.0-custom-iog";
src = final.fetchFromGitHub {
owner = "input-output-hk";
repo = "scriv";
rev = "567a1aa3f6df77d1a531290f10a261ec6a49c75a";
hash = "sha256-wpWDuZ3c8JJKVWPw9PHgcpneRWYjd/0z4oAIirPa0/E=";
};
});

haskellBuildUtils = prev.haskellBuildUtils.override {
inherit (final.hsPkgs.args) compiler-nix-name;
index-state = tool-index-state;
Expand Down

0 comments on commit 404aaec

Please sign in to comment.