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.

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

boring updates #74

Merged
merged 1 commit into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 4 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
matrix:
stack-yaml:
- stack-nightly.yaml # ghc-9.6
- stack.yaml # ghc-9.4
- stack-nightly.yaml # ghc-9.6
- stack.yaml # ghc-9.4
- stack-lts-20.26.yaml # ghc-9.2
- stack-lts-19.33.yaml # ghc-9.0
- stack-lts-18.28.yaml # ghc-8.10
Expand All @@ -24,11 +24,8 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: freckle/stack-cache-action@v2
with:
stack-yaml: ${{ matrix.stack-yaml }}
- uses: freckle/stack-action@v3
- uses: actions/checkout@v4
- uses: freckle/stack-action@v4
with:
stack-yaml: ${{ matrix.stack-yaml }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- id: tag
uses: freckle/haskell-tag-action@v1
Expand Down
251 changes: 251 additions & 0 deletions flake.lock

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

78 changes: 78 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
inputs = {
stable.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
freckle.url = "github:freckle/flakes?dir=main";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = inputs:
inputs.flake-utils.lib.eachDefaultSystem (system:
let
nixpkgsArgs = { inherit system; config = { }; };

nixpkgs = {
stable = import inputs.stable nixpkgsArgs;
unstable = import inputs.unstable nixpkgsArgs;
};
freckle = inputs.freckle.packages.${system};
freckleLib = inputs.freckle.lib.${system};

in
rec {
packages = {
cabal = nixpkgs.stable.cabal-install;

fourmolu = freckle.fourmolu-0-13-x;

ghc = freckleLib.haskellBundle {
ghcVersion = "ghc-9-4-6";
packageSelection = p: [
p.annotated-exception
p.case-insensitive
p.http-client
p.http-client-tls
p.hspec
p.iproute
p.network
p.QuickCheck
p.unliftio
p.wai
p.warp
p.yesod-core
];
};

haskell-language-server =
nixpkgs.stable.haskell-language-server.override
{ supportedGhcVersions = [ "946" ]; };

stack = nixpkgs.stable.writeShellApplication {
name = "stack";
text = ''
${nixpkgs.stable.stack}/bin/stack --system-ghc --no-nix "$@"
'';
};
};

devShells.default = nixpkgs.stable.mkShell {
buildInputs = with (nixpkgs.stable); [
pcre
pcre.dev
zlib
zlib.dev
];

nativeBuildInputs = with (packages); [
cabal
fourmolu
ghc
haskell-language-server
stack
];

shellHook = ''
export STACK_YAML=stack.yaml
'';
};
});
}
2 changes: 1 addition & 1 deletion graphula.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack
--
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-21.4
resolver: lts-21.11

ghc-options:
"$locals": -fwrite-ide-info
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: caa77fdbc5b9f698262b21ee78030133272ec53116ad6ddbefdc4c321f668e0c
size: 640014
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/4.yaml
original: lts-21.4
sha256: 64d66303f927e87ffe6b8ccf736229bf608731e80d7afdf62bdd63c59f857740
size: 640037
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/11.yaml
original: lts-21.11
Loading