Skip to content

Commit 1d409d5

Browse files
committed
flake.nix: Use branch names instead of revs for haskell pins
Also use published versions of warp and http2, they already contain the changes that were pinned
1 parent f5f804d commit 1d409d5

File tree

3 files changed

+52
-100
lines changed

3 files changed

+52
-100
lines changed

flake.lock

Lines changed: 28 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,84 +8,74 @@
88
flake-utils.url = "github:numtide/flake-utils";
99

1010
cryptobox-haskell = {
11-
url = "github:wireapp/cryptobox-haskell?rev=7546a1a25635ef65183e3d44c1052285e8401608";
11+
url = "github:wireapp/cryptobox-haskell?ref=master";
1212
flake = false;
1313
};
1414
bloodhound = {
15-
url = "github:wireapp/bloodhound?rev=dac0f1384b335ce35dc026bf8154e574b1a15d62";
15+
url = "github:wireapp/bloodhound?ref=wire-fork";
1616
flake = false;
1717
};
1818
hsaml2 = {
19-
url = "github:dylex/hsaml2?rev=874627ad22e69afe4d9a797e39633ffb30697c78";
19+
url = "github:dylex/hsaml2?ref=main";
2020
flake = false;
2121
};
2222
hedis = {
23-
url = "github:wireapp/hedis?rev=00d7fbf5f19b812b9e64e12be8860c4741be8558";
23+
url = "github:wireapp/hedis?ref=wire-changes";
2424
flake = false;
2525
};
2626

2727
http-client = {
28-
url = "github:wireapp/http-client?rev=37494bb9a89dd52f97a8dc582746c6ff52943934";
28+
url = "github:wireapp/http-client?ref=master";
2929
flake = false;
3030
};
3131

3232
hspec-wai = {
33-
url = "github:wireapp/hspec-wai?rev=08176f07fa893922e2e78dcaf996c33d79d23ce2";
33+
url = "github:wireapp/hspec-wai?ref=body-contains";
3434
flake = false;
3535
};
3636

3737
cql = {
38-
url = "github:wireapp/cql?rev=abbd2739969d17a909800f282d10d42a254c4e3b";
38+
url = "github:wireapp/cql?ref=develop";
3939
flake = false;
4040
};
4141

4242
cql-io = {
43-
url = "github:wireapp/cql-io?rev=c2b6aa995b5817ed7c78c53f72d5aa586ef87c36";
43+
url = "github:wireapp/cql-io?ref=control-conn";
4444
flake = false;
4545
};
4646

4747
wai-predicates = {
48-
url = "github:wireapp/wai-predicates?rev=ff95282a982ab45cced70656475eaf2cefaa26ea";
48+
url = "github:wireapp/wai-predicates?ref=develop";
4949
flake = false;
5050
};
5151

5252
tasty = {
53-
url = "github:wireapp/tasty?rev=97df5c1db305b626ffa0b80055361b7b28e69cec";
53+
url = "github:wireapp/tasty?ref=mangoiv/full-stacktrace-rebased";
5454
flake = false;
5555
};
5656

5757
servant-openapi3 = {
58-
url = "github:wireapp/servant-openapi3?rev=0db0095040df2c469a48f5b8724595f82afbad0c";
58+
url = "github:wireapp/servant-openapi3?ref=required-request-bodies";
5959
flake = false;
6060
};
6161

6262
postie = {
63-
url = "github:alexbiehl/postie?rev=13404b8cb7164cd9010c9be6cda5423194dd0c06";
63+
url = "github:alexbiehl/postie?ref=master";
6464
flake = false;
6565
};
6666

6767
tinylog = {
68-
url = "github:wireapp/tinylog?rev=9609104263e8cd2a631417c1c3ef23e090de0d09";
68+
url = "github:wireapp/tinylog?ref=wire-fork";
6969
flake = false;
7070
};
7171

7272
tasty-ant-xml = {
73-
url = "github:wireapp/tasty-ant-xml?rev=11c53e976e2e941f25a33e8768669eb576d19ea8";
73+
url = "github:wireapp/tasty-ant-xml?ref=drop-console-formatting_rebased";
7474
flake = false;
7575
};
7676

7777
text-icu-translit = {
78-
url = "github:wireapp/text-icu-translit?rev=317bbd27ea5ae4e7f93836ee9ca664f9bde7c583";
79-
flake = false;
80-
};
81-
82-
warp = {
83-
url = "github:yesodweb/wai?rev=ef34334b160c74b62435ccc21f5b458f73506b2f";
84-
flake = false;
85-
};
86-
87-
http2 = {
88-
url = "github:wireapp/http2?rev=ca606d86ed304fa780f7a60d11244019c62a10e0";
78+
url = "github:wireapp/text-icu-translit?ref=master";
8979
flake = false;
9080
};
9181

nix/haskell-pins.nix

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,17 +142,6 @@ let
142142
src = inputs.text-icu-translit;
143143
};
144144

145-
# open PR https://github.com/yesodweb/wai/pull/958 for sending connection: close when closing connection
146-
warp = {
147-
src = inputs.warp;
148-
packages.warp = "warp";
149-
};
150-
151-
http2 = {
152-
src = inputs.http2;
153-
};
154-
155-
156145
# Our fork of 2.0.0. This release hasn't been updated for a while and Nix
157146
# is bad in coping with Hackage patched revisions and overriding
158147
# ghc-options. So, we have our fork to gain GHC 9.8 compatibility.
@@ -213,6 +202,15 @@ let
213202
version = "0.3.3.1";
214203
sha256 = "sha256-jgSTBBDcxRQ0tjs0wTyvEpEAkGA7npJKjdXDT81VpT4=";
215204
};
205+
206+
warp = {
207+
version = "3.4.12";
208+
sha256 = "sha256-Y9xQ1wBbBtSZ4qw3yTGSYX27qi2uFRDJVtAdmQqRnFQ=";
209+
};
210+
http2 = {
211+
version = "5.4.0";
212+
sha256 = "sha256-PeEWVd61bQ8G7LvfLeXklzXqNJFaAjE2ecRMWJZESPE=";
213+
};
216214
};
217215
# Name -> Source -> Maybe Subpath -> Drv
218216
mkGitDrv = name: src: subpath:

0 commit comments

Comments
 (0)