Skip to content

Commit

Permalink
Unbreak a few packages (#77)
Browse files Browse the repository at this point in the history
* nothing to fix here

this was added in NixOS/nixpkgs@81c3f7b
and we don't need it in the static build.

* Unbreak a few packages

* httpaf / h2

* websocketaf
  • Loading branch information
anmonteiro authored May 19, 2021
1 parent 5d510d0 commit 58960d0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 19 deletions.
5 changes: 0 additions & 5 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ let
"mirage-net-xen"
"netchannel"

# broken
"httpaf-mirage"
"h2-mirage"
"websocketaf-mirage"

# doesn't work with my fork of http/af
"paf"
"git-paf"
Expand Down
1 change: 0 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ in
{
# Stripped down postgres without the `bin` part, to allow static linking
# with musl
# FIXME: gssSupport is currently problematic for static because libkrb5 fails
libpq = super.postgresql.override { enableSystemd = false; gssSupport = false; };

ocamlPackages = oPs.ocamlPackages_4_12;
Expand Down
9 changes: 3 additions & 6 deletions ocaml/gluten/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
with ocamlPackages;
let
buildGluten = args: buildDunePackage (rec {
version = "0.2.1";
version = "0.2.2-dev";
src = builtins.fetchurl {
url = https://github.com/anmonteiro/gluten/archive/410be2e.tar.gz;
sha256 = "1ngx9kci10pzgfjkzc3xczx8ppbhsqli5h3gfhzifpn09fkwkxrk";
url = https://github.com/anmonteiro/gluten/archive/475c361.tar.gz;
sha256 = "0la1r30k6siv064nvlml85qk7m70ysnzwq0mnk7vm34656vh6m05";
};
} // args);

Expand Down Expand Up @@ -48,8 +48,5 @@ in
mirage-flow
cstruct
];
meta = {
broken = true;
};
};
} else { })
6 changes: 3 additions & 3 deletions ocaml/h2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
with ocamlPackages;
let
buildH2 = args: buildDunePackage (rec {
version = "0.8.0";
version = "0.8.0-dev";
src = builtins.fetchurl {
url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6";
url = https://github.com/anmonteiro/ocaml-h2/archive/93c7e071a0bf8e0b7360cc9d7dc4532cbe0943e9.tar.gz;
sha256 = "16jvwbifcq26p6g8w5q49biqjfs2yw82dryfls5zd9cblawzifsb";
};
} // args);
in
Expand Down
4 changes: 2 additions & 2 deletions ocaml/httpaf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildDunePackage {
pname = "httpaf";
propagatedBuildInputs = [ angstrom faraday ];
src = builtins.fetchurl {
url = https://github.com/anmonteiro/httpaf/archive/b78a84204fb10f48f9e38f3acec6ff9c759e0963.tar.gz;
sha256 = "1x72xlamxaqrkplzn0wfd6hzkc7cc11inqwn03zp541qkrjfh0g2";
url = https://github.com/anmonteiro/httpaf/archive/559019829b7ed267a5b4b86aed1e7d7795214bcd.tar.gz;
sha256 = "1v4h9m485i3gfy9xdgz94sm31jbhi53c7n9ry7q615a6ih78vfnb";
};
}
4 changes: 2 additions & 2 deletions ocaml/websocketaf/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ let
buildWebsocketaf = args: buildDunePackage ({
version = "0.0.1-dev";
src = builtins.fetchurl {
url = https://github.com/anmonteiro/websocketaf/archive/fb9926b6f653252e4ba5009bbb171a11c0e4e6fc.tar.gz;
sha256 = "105cbpcdbsx11p63v3s2cld1sixhm5kjjj4g6k9jvi2gs2p808hg";
url = https://github.com/anmonteiro/websocketaf/archive/d75942f936821231cb4ff46b95cf2753d7329233.tar.gz;
sha256 = "14y3cj3sd8kgijj7mw20rfr8hr7asj6mll6n4b9sjj02pqhfqqaz";
};
} // args);

Expand Down

0 comments on commit 58960d0

Please sign in to comment.