Skip to content

Commit 8d5e347

Browse files
berbermanAilrun
berberman
and
Ailrun
authored
Update nix flake (#2065)
* Update nix flake * Fix missing ghc-api-compat in hiedb * unrelated: Update paths_ignore for #2063 Co-authored-by: Junyoung "Clare" Jang <jjc9310@gmail.com>
1 parent 2857eee commit 8d5e347

File tree

6 files changed

+31
-52
lines changed

6 files changed

+31
-52
lines changed

‎.github/workflows/bench.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: fkirc/skip-duplicate-actions@v3.4.0
1616
with:
1717
cancel_others: true
18-
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**.nix", "**/test/**", "flake.lock"]'
18+
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**.nix", "**/test/**", "flake.lock", "**/README.md", "FUNDING.yml"]'
1919

2020
bench-init:
2121
needs: pre_job

‎.github/workflows/nix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: fkirc/skip-duplicate-actions@master
2020
with:
2121
cancel_others: true
22-
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**"]'
22+
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**/README.md", "FUNDING.yml"]'
2323
- id: skip_check_no_nix
2424
uses: fkirc/skip-duplicate-actions@master
2525
with:

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: fkirc/skip-duplicate-actions@v3.4.0
2121
with:
2222
cancel_others: true
23-
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**.nix", "flake.lock"]'
23+
paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**.nix", "flake.lock", "**/README.md", "FUNDING.yml"]'
2424
# If we only change ghcide downstream packages we have not test ghcide itself
2525
- id: skip_ghcide_check
2626
uses: fkirc/skip-duplicate-actions@v3.4.0

‎configuration-ghc-901.nix

+5-19
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@ let
1616
hpkgsOverride = hself: hsuper:
1717
with pkgs.haskell.lib;
1818
let
19-
lsp-src = pkgs.fetchFromGitHub {
20-
owner = "anka-213";
21-
repo = "lsp";
22-
rev = "tag-ghc-9.0.1-without-pr-326";
23-
sha256 = "lW/EdBnvKPLE2+CGE/grIekOu+U/Wh6zMCN4xhJDtPY=";
24-
};
25-
2619
dependent-sum-src = pkgs.fetchFromGitHub {
2720
owner = "anka-213";
2821
repo = "dependent-sum";
2922
rev = "8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5";
3023
sha256 = "WtxTB6ufTZC6SxOtGSfhlO4mY0y9eWejMSa0yUJ7dHQ=";
3124
};
3225
in {
26+
27+
# we need add ghc-api-compat to build depends,
28+
# since its condition tree is not evaluated under ghc 9
29+
hiedb = addBuildDepend hsuper.hiedb hself.ghc-api-compat;
30+
3331
blaze-textual = hself.callCabal2nix "blaze-textual"
3432
(pkgs.fetchFromGitHub {
3533
owner = "jwaldmann";
@@ -52,25 +50,13 @@ let
5250
sha256 = "8ct7t3xIxIAoC+f8VO5e5+QKrd5L5Zu1eButSaE+1Uk=";
5351
}) { };
5452

55-
ghc-api-compat = hself.callCabal2nix "ghc-api-compat"
56-
(pkgs.fetchFromGitHub {
57-
owner = "hsyl20";
58-
repo = "ghc-api-compat";
59-
rev = "8fee87eac97a538dbe81ff1ab18cff10f2f9fa15";
60-
sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk=";
61-
}) { };
62-
6353
th-extras = hself.callCabal2nix "th-extras" (pkgs.fetchFromGitHub {
6454
owner = "anka-213";
6555
repo = "th-extras";
6656
rev = "57a97b4df128eb7b360e8ab9c5759392de8d1659";
6757
sha256 = "Qtha1ge/C0L+uFcV2dZ5xpG59DCxQT7LuK/OYfiM4Pk=";
6858
}) { };
6959

70-
lsp = hself.callCabal2nix "lsp" "${lsp-src}/lsp" { };
71-
lsp-types = hself.callCabal2nix "lsp-types" "${lsp-src}/lsp-types" { };
72-
lsp-test = hself.callCabal2nix "lsp-test" "${lsp-src}/lsp-test" { };
73-
7460
dependent-sum =
7561
hself.callCabal2nix "dependent-sum" "${dependent-sum-src}/dependent-sum"
7662
{ };

‎flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+17-24
Original file line numberDiff line numberDiff line change
@@ -71,36 +71,30 @@
7171
tweaks = hself: hsuper:
7272
with haskell.lib; {
7373

74-
hiedb = hself.callCabal2nix "hiedb"
75-
(builtins.fetchTarball {
76-
url =
77-
"https://hackage.haskell.org/package/hiedb-0.4.0.0/hiedb-0.4.0.0.tar.gz";
78-
sha256 =
79-
"13jz8c46zfpf54ya2wsv4akhn0wcfc6qjazqsjfir5gpvsi7v8xr";
74+
ghc-api-compat = hself.callCabal2nix "ghc-api-compat"
75+
(pkgs.fetchFromGitHub {
76+
owner = "hsyl20";
77+
repo = "ghc-api-compat";
78+
rev = "8fee87eac97a538dbe81ff1ab18cff10f2f9fa15";
79+
sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk=";
8080
}) { };
8181

82-
implicit-hie = hself.callCabal2nix "implicit-hie"
82+
lsp = hself.callCabal2nix "lsp"
8383
(builtins.fetchTarball {
84-
url =
85-
"https://hackage.haskell.org/package/implicit-hie-0.1.2.6/implicit-hie-0.1.2.6.tar.gz";
86-
sha256 =
87-
"067bmw5b9qg55ggklbfyf93jgpkbzmprmgv906jscfzvv1h8266c";
84+
url = "https://hackage.haskell.org/package/lsp-1.2.0.1/lsp-1.2.0.1.tar.gz";
85+
sha256 = "1lhzsraiw11ldxvxn8ax11hswpyzsvw2da2qmp3p6fc9rfpz4pj5";
8886
}) { };
8987

90-
implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle"
88+
lsp-types = hself.callCabal2nix "lsp-types"
9189
(builtins.fetchTarball {
92-
url =
93-
"https://hackage.haskell.org/package/implicit-hie-cradle-0.3.0.5/implicit-hie-cradle-0.3.0.5.tar.gz";
94-
sha256 =
95-
"15a7g9x6cjk2b92hb2wilxx4550msxp1pmk5a2shiva821qaxnfq";
90+
url = "https://hackage.haskell.org/package/lsp-types-1.3.0.0/lsp-types-1.3.0.0.tar.gz";
91+
sha256 = "0qajyyj2d51daa4y0pqaa87n4nny0i920ivvzfnrk9gq9386iac7";
9692
}) { };
9793

98-
ghc-source-gen = hself.callCabal2nix "ghc-source-gen"
94+
lsp-test = hself.callCabal2nix "lsp-test"
9995
(builtins.fetchTarball {
100-
url =
101-
"https://hackage.haskell.org/package/ghc-source-gen-0.4.1.0/ghc-source-gen-0.4.1.0.tar.gz";
102-
sha256 =
103-
"0kk599vk54ckikpxkzwrbx7z5x0xr20hr179rldmnlb34bf9mpnk";
96+
url = "https://hackage.haskell.org/package/lsp-test-0.14.0.1/lsp-test-0.14.0.1.tar.gz";
97+
sha256 = "10lnyg7nlbd3ymgvjjlrkfndyy7ay9cwnsk684p08k2gzlric4yq";
10498
}) { };
10599
};
106100

@@ -184,7 +178,6 @@
184178
pkgs.haskellPackages.ghc.version);
185179
ghc884 = pkgs.hlsHpkgs "ghc884";
186180
ghc8104 = pkgs.hlsHpkgs "ghc8104";
187-
ghc8105 = pkgs.hlsHpkgs "ghc8105";
188181
ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
189182

190183
# Create a development shell of hls project
@@ -238,14 +231,14 @@
238231
haskell-language-server-dev = mkDevShell ghcDefault;
239232
haskell-language-server-884-dev = mkDevShell ghc884;
240233
haskell-language-server-8104-dev = mkDevShell ghc8104;
241-
haskell-language-server-8105-dev = mkDevShell ghc8105;
234+
haskell-language-server-8105-dev = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
242235
haskell-language-server-901-dev = mkDevShell ghc901;
243236

244237
# hls package
245238
haskell-language-server = mkExe ghcDefault;
246239
haskell-language-server-884 = mkExe ghc884;
247240
haskell-language-server-8104 = mkExe ghc8104;
248-
haskell-language-server-8105 = mkExe ghc8105;
241+
haskell-language-server-8105 = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
249242
haskell-language-server-901 = mkExe ghc901;
250243
};
251244

0 commit comments

Comments
 (0)