Skip to content

Commit f81e9e2

Browse files
shajrashajra
committed
Automate updateMaterialization
1 parent 6c1ca3a commit f81e9e2

File tree

13 files changed

+57
-57
lines changed

13 files changed

+57
-57
lines changed

‎examples/example-cabal/cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ packages:
33
./library
44
./application
55

6-
index-state: 2021-09-01T00:00:00Z
6+
index-state: 2021-09-21T00:00:00Z

‎nix/config.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# DESIGN: HLS already pins index-state in the cabal.project file.
44
# Specifying the index-state here just overrides that pinning.
55
#haskell-nix.hackage.index = {
6-
# state = "2021-09-01T00:00:00Z";
7-
# sha256 = "934338f5c73d91ee7dfdcb838ac44e8d92d5306aa60582cdded7abae887a7646";
6+
# state = "2021-09-21T00:00:00Z";
7+
# sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
88
#};
99
haskell-nix.nixpkgs-pin = {
1010
# DESIGN: default to "nixpkgs-unstable"

‎nix/external/sources.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": null,
66
"owner": "shajra",
77
"repo": "direnv-nix-lorelei",
8-
"rev": "62c6b5278218d563c630bf0d8bd440a687848393",
9-
"sha256": "1kf5igkqlnmifg4mrd59hvc1jnhmjq84zb6cpvsh1c27mzbzlsxv",
8+
"rev": "cb4354f04111114a228cecf17f833abc334fc5f8",
9+
"sha256": "00kinhcbasvbqab6vm50w209353s44zc3k2srcm01zdp0jvx8mjk",
1010
"type": "tarball",
11-
"url": "https://github.com/shajra/direnv-nix-lorelei/archive/62c6b5278218d563c630bf0d8bd440a687848393.tar.gz",
11+
"url": "https://github.com/shajra/direnv-nix-lorelei/archive/cb4354f04111114a228cecf17f833abc334fc5f8.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"haskell.nix": {
@@ -17,10 +17,10 @@
1717
"homepage": "https://input-output-hk.github.io/haskell.nix",
1818
"owner": "input-output-hk",
1919
"repo": "haskell.nix",
20-
"rev": "2054b7dea069ea33c26f3dbd138fc2bb7d21cec1",
21-
"sha256": "1bc0b9hm5ds0hbh30v36c7s0za0k0v0l1m5xqi1crd9v3awa2mb0",
20+
"rev": "e17be32e5839457125ed81c52b10ab960a9e02bf",
21+
"sha256": "1gz3rvkscrriqgbs5pknr3wh95l4mvh6vvm2xr584xc9qg78y3d7",
2222
"type": "tarball",
23-
"url": "https://github.com/input-output-hk/haskell.nix/archive/2054b7dea069ea33c26f3dbd138fc2bb7d21cec1.tar.gz",
23+
"url": "https://github.com/input-output-hk/haskell.nix/archive/e17be32e5839457125ed81c52b10ab960a9e02bf.tar.gz",
2424
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
2525
},
2626
"hls-released": {
@@ -41,10 +41,10 @@
4141
"homepage": null,
4242
"owner": "haskell",
4343
"repo": "haskell-language-server",
44-
"rev": "b6d1df2a362d8101dd3c03a2ea78a655ba85a685",
45-
"sha256": "0smrqx92g04ilq1c5hy3rnay2phfwiab3rjn6pnkc279bp8j1qrw",
44+
"rev": "f329a4bbf88bd291e776caa28a741f66470a197c",
45+
"sha256": "18si1zs98p5qfjj8fvyxa2i1g5l0riyy9v50zvxbs9s9yk0pai5d",
4646
"type": "tarball",
47-
"url": "https://github.com/haskell/haskell-language-server/archive/b6d1df2a362d8101dd3c03a2ea78a655ba85a685.tar.gz",
47+
"url": "https://github.com/haskell/haskell-language-server/archive/f329a4bbf88bd291e776caa28a741f66470a197c.tar.gz",
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
},
5050
"nix-project": {
@@ -53,10 +53,10 @@
5353
"homepage": "",
5454
"owner": "shajra",
5555
"repo": "nix-project",
56-
"rev": "c6d8d62d81c475252c2f8b7f451700a0bc2d7314",
57-
"sha256": "1pbnza2wn9g2nka9cbb3r2fnxcy9idmkhfqif9c9ys53l6grwa8v",
56+
"rev": "1604510c6972465635408e3279e59b2fda0ef595",
57+
"sha256": "16zxags4rnlbc29wbwyqjfcfksnrjxw2n46n4v9jl2nal94qgha9",
5858
"type": "tarball",
59-
"url": "https://github.com/shajra/nix-project/archive/c6d8d62d81c475252c2f8b7f451700a0bc2d7314.tar.gz",
59+
"url": "https://github.com/shajra/nix-project/archive/1604510c6972465635408e3279e59b2fda0ef595.tar.gz",
6060
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
6161
},
6262
"nixpkgs": {
@@ -77,10 +77,10 @@
7777
"homepage": "https://github.com/NixOS/nixpkgs",
7878
"owner": "NixOS",
7979
"repo": "nixpkgs",
80-
"rev": "60f651c2769ae36b0a7ad25a4a5398d3d93cfb67",
81-
"sha256": "014djgil1saxjghivp4zlxv43ww5cwmxb08mxjqr3nj3yz1jg8ka",
80+
"rev": "3397f0ede9ea2ded1f8b6fa689dda71a7a67b806",
81+
"sha256": "0dx5hbwjbwy404ng5m3dv2rdfbsw58gxblcxfgdwmpyn2qx14sip",
8282
"type": "tarball",
83-
"url": "https://github.com/NixOS/nixpkgs/archive/60f651c2769ae36b0a7ad25a4a5398d3d93cfb67.tar.gz",
83+
"url": "https://github.com/NixOS/nixpkgs/archive/3397f0ede9ea2ded1f8b6fa689dda71a7a67b806.tar.gz",
8484
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
8585
},
8686
"nixpkgs-unstable": {
@@ -89,10 +89,10 @@
8989
"homepage": "https://github.com/NixOS/nixpkgs",
9090
"owner": "NixOS",
9191
"repo": "nixpkgs",
92-
"rev": "79c444b5bdeaba142d128afddee14c89ecf2a968",
93-
"sha256": "1qpkmv90b7sf2dvrc24nm8x2ws78w4aif1qi1zlglqssxfy888jm",
92+
"rev": "bc9b956714ed6eac5f8888322aac5bc41389defa",
93+
"sha256": "1wbd66h3hszlmdh0mpj0a51jk580aq2xal30wc0lgk78s6sf0rw7",
9494
"type": "tarball",
95-
"url": "https://github.com/NixOS/nixpkgs/archive/79c444b5bdeaba142d128afddee14c89ecf2a968.tar.gz",
95+
"url": "https://github.com/NixOS/nixpkgs/archive/bc9b956714ed6eac5f8888322aac5bc41389defa.tar.gz",
9696
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
9797
}
9898
}

‎nix/materialized-darwin/hls-unstable-ghc8106/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-darwin/hls-unstable-ghc8107/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-darwin/hls-unstable-ghc865/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-darwin/hls-unstable-ghc884/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-linux/hls-unstable-ghc8106/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-linux/hls-unstable-ghc8107/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-linux/hls-unstable-ghc865/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎nix/materialized-linux/hls-unstable-ghc884/.plan.nix/ghcide.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
(hsPkgs."dependent-sum" or (errorHandler.buildDepError "dependent-sum"))
6363
(hsPkgs."dlist" or (errorHandler.buildDepError "dlist"))
6464
(hsPkgs."extra" or (errorHandler.buildDepError "extra"))
65+
(hsPkgs."fuzzy" or (errorHandler.buildDepError "fuzzy"))
6566
(hsPkgs."filepath" or (errorHandler.buildDepError "filepath"))
6667
(hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree"))
6768
(hsPkgs."ghc-exactprint" or (errorHandler.buildDepError "ghc-exactprint"))
@@ -75,7 +76,6 @@
7576
(hsPkgs."hiedb" or (errorHandler.buildDepError "hiedb"))
7677
(hsPkgs."lsp-types" or (errorHandler.buildDepError "lsp-types"))
7778
(hsPkgs."lsp" or (errorHandler.buildDepError "lsp"))
78-
(hsPkgs."monoid-subclasses" or (errorHandler.buildDepError "monoid-subclasses"))
7979
(hsPkgs."mtl" or (errorHandler.buildDepError "mtl"))
8080
(hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri"))
8181
(hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative"))
@@ -129,7 +129,6 @@
129129
"Development/IDE/Plugin/Completions/Logic"
130130
"Development/IDE/Session/VersionCheck"
131131
"Development/IDE/Types/Action"
132-
"Text/Fuzzy"
133132
"Control/Concurrent/Strict"
134133
"Generics/SYB/GHC"
135134
"Development/IDE"

‎support/materialization-check.nix

-20
This file was deleted.

‎support/materialization-update

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/sh -eu
2+
3+
cd "$(dirname "$0")/.."
4+
5+
6+
mkdir --parent nix/materialized-darwin
7+
mkdir --parent nix/materialized-linux
8+
9+
for hlsUnstable in false true
10+
do
11+
for ghcVersion in 8.10.7 8.10.6 8.8.4 8.6.5
12+
do
13+
case "$hlsUnstable" in
14+
true) stability=unstable ;;
15+
false) stability=released ;;
16+
esac
17+
echo
18+
echo "###"
19+
echo "### Update Materialization: $ghcVersion, $stability"
20+
echo "###"
21+
echo
22+
"$(nix-build nix \
23+
--no-out-link \
24+
--argstr ghcVersion "$ghcVersion" \
25+
--arg hlsUnstable "$hlsUnstable" \
26+
--attr updateMaterialized)"
27+
done
28+
done

0 commit comments

Comments
 (0)