Skip to content
Merged
12 changes: 6 additions & 6 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ jobs:
skipPush: true
- if: ${{ needs.pre_job.outputs.should_skip_develop != 'true' }}
run: |
nix develop --command cabal update
nix develop --command cabal build
nix develop --print-build-logs --command cabal update
nix develop --print-build-logs --command cabal build

# Build and then push HLS binaries with developmet shell to cachix
# This job runs when
Expand Down Expand Up @@ -91,16 +91,16 @@ jobs:
name: haskell-language-server
authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
- name: Build development shell
run: nix develop --profile dev
run: nix develop --print-build-logs --profile dev
- name: Build development shell (GHC 9.0.1)
run: nix develop .#haskell-language-server-901-dev --profile dev
run: nix develop --print-build-logs .#haskell-language-server-901-dev --profile dev
- name: Push development shell
if: ${{ env.HAS_TOKEN == 'true' }}
run: cachix push haskell-language-server dev
- name: Build binaries
run: nix build
run: nix build --print-build-logs
- name: Build binaries (GHC 9.0.1)
run: nix build .#haskell-language-server-901
run: nix build --print-build-logs .#haskell-language-server-901
- name: Push binaries
if: ${{ env.HAS_TOKEN == 'true' }}
run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server
2 changes: 2 additions & 0 deletions configuration-ghc-901.nix
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ let

ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_0_0_4;

ormolu = hself.ormolu_0_2_0_0;

operational = hself.callCabal2nix "operational" (pkgs.fetchFromGitHub {
owner = "HeinrichApfelmus";
repo = "operational";
Expand Down
18 changes: 9 additions & 9 deletions flake.lock

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

26 changes: 6 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,11 @@
sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk=";
}) { };

lsp = hself.callCabal2nix "lsp"
(builtins.fetchTarball {
url = "https://hackage.haskell.org/package/lsp-1.2.0.1/lsp-1.2.0.1.tar.gz";
sha256 = "1lhzsraiw11ldxvxn8ax11hswpyzsvw2da2qmp3p6fc9rfpz4pj5";
}) { };
lsp = hself.lsp_1_2_0_1;

lsp-types = hself.callCabal2nix "lsp-types"
(builtins.fetchTarball {
url = "https://hackage.haskell.org/package/lsp-types-1.3.0.0/lsp-types-1.3.0.0.tar.gz";
sha256 = "0qajyyj2d51daa4y0pqaa87n4nny0i920ivvzfnrk9gq9386iac7";
}) { };
lsp-types = hself.lsp-types_1_3_0_1;

lsp-test = hself.callCabal2nix "lsp-test"
(builtins.fetchTarball {
url = "https://hackage.haskell.org/package/lsp-test-0.14.0.1/lsp-test-0.14.0.1.tar.gz";
sha256 = "10lnyg7nlbd3ymgvjjlrkfndyy7ay9cwnsk684p08k2gzlric4yq";
}) { };
lsp-test = hself.lsp-test_0_14_0_1;
};

hlsSources =
Expand Down Expand Up @@ -177,7 +165,7 @@
+ pkgs.lib.replaceStrings [ "." ] [ "" ]
pkgs.haskellPackages.ghc.version);
ghc884 = pkgs.hlsHpkgs "ghc884";
ghc8104 = pkgs.hlsHpkgs "ghc8104";
ghc8107 = pkgs.hlsHpkgs "ghc8107";
ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");

# For markdown support
Expand Down Expand Up @@ -252,15 +240,13 @@
# dev shell
haskell-language-server-dev = mkDevShell ghcDefault;
haskell-language-server-884-dev = mkDevShell ghc884;
haskell-language-server-8104-dev = mkDevShell ghc8104;
haskell-language-server-8105-dev = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
haskell-language-server-8107-dev = mkDevShell ghc8107;
haskell-language-server-901-dev = mkDevShell ghc901;

# hls package
haskell-language-server = mkExe ghcDefault;
haskell-language-server-884 = mkExe ghc884;
haskell-language-server-8104 = mkExe ghc8104;
haskell-language-server-8105 = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
haskell-language-server-8107 = mkExe ghc8107;
haskell-language-server-901 = mkExe ghc901;

# docs
Expand Down