Skip to content

Commit b1a1cbf

Browse files
committed
Nix: un-pin ocamlgraph
Fixes #1453 NixOS/nixpkgs#397883 was closed because NixOS/nixpkgs#406830 updated OCamlgraph and was merged.
1 parent 5736c16 commit b1a1cbf

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

engine/default.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,7 @@ let
6666
stdio
6767
re
6868
js_of_ocaml
69-
(ocamlgraph.overrideAttrs (_: {
70-
src = fetchFromGitHub {
71-
owner = "maximebuyse";
72-
repo = "ocamlgraph";
73-
rev = "fix-stable-topological-sort";
74-
sha256 = "sha256-l7v7Kxjaz3xP6T91peAzloyusxpsIOYHXLIiiRHa490=";
75-
};
76-
}))
69+
ocamlgraph
7770
] ++
7871
# F* dependencies
7972
[ batteries menhirLib ppx_deriving ppxlib sedlex stdint ];

flake.nix

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,7 @@
6565
cat "${hax-env-file}" | xargs -I{} echo "export {}"
6666
fi
6767
'';
68-
ocamlPackages = pkgs.ocamlPackages.overrideScope (final: prev: {
69-
ocamlgraph = prev.ocamlgraph.overrideAttrs (_: rec {
70-
name = "ocamlgraph-${version}";
71-
version = "2.2.0";
72-
src = pkgs.fetchurl {
73-
url =
74-
"https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz";
75-
hash = "sha256-sJViEIY8wk9IAgO6PC7wbfrlV5U2oFdENk595YgisjA=";
76-
};
77-
});
78-
});
68+
ocamlPackages = pkgs.ocamlPackages;
7969
in rec {
8070
packages = {
8171
inherit rustc ocamlformat rustfmt fstar hax-env rustc-docs;

0 commit comments

Comments
 (0)