diff options
| -rw-r--r-- | flake.lock | 72 | ||||
| -rw-r--r-- | flake.nix | 20 |
2 files changed, 55 insertions, 37 deletions
@@ -8,11 +8,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1668376967, - "narHash": "sha256-w898bwo0E+5IvKevhnk6S4EMDm/oW6wbI3/ZRvvJmIM=", + "lastModified": 1673289566, + "narHash": "sha256-9EEQ+8MgSfuPwBIwuqZTZn76qnYby5Jb+hlAsxSDWr4=", "owner": "aeneasverif", "repo": "charon", - "rev": "3304f736b092f33dc0945cbe0be3afdf8c002191", + "rev": "1ba9f3106d824146dd18d6654f5703de6bda54be", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1666567222, - "narHash": "sha256-AVySilLW+eNM409GSIJYsF6wg5NsxK12Ht2DMSYAgO0=", + "lastModified": 1673056065, + "narHash": "sha256-a68tMDTDqdAauxq377ALl4Uwm6oh9MeoY2WbTYRWZoo=", "owner": "ipetkov", "repo": "crane", - "rev": "2ce1a3313e299b0db63b11f94c863af74b0b08ad", + "rev": "0144134311767fcee80213321f079a8ffa0b9cc1", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "fstar-src": { "flake": false, "locked": { - "lastModified": 1668549455, - "narHash": "sha256-WHgHYmeWwy3RfIE2pkOyLTpkhi8FXL83zO8Tv2N9Iic=", + "lastModified": 1673111773, + "narHash": "sha256-nIO8kJUw8u37aLNO2wVs2qTh+udbM26O2SUgPiDlEj0=", "owner": "fstarlang", "repo": "fstar", - "rev": "2040a595ed2faff0a1dce782fefbb518102eb1dd", + "rev": "7af8a89d6b6aae356199d141fa73d8473d477904", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1668456660, - "narHash": "sha256-m4/L+AgF5LaG6v82L3TpB66vv/PIORtd0XTvoOlP1Ok=", + "lastModified": 1673012892, + "narHash": "sha256-nGye6HQm0CD0MRu6mua8HlxTOC3w7pSj8x3Ifq8vZv8=", "owner": "hacl-star", "repo": "hacl-star", - "rev": "7241848c958eb6ae7dec0cd683852ae10a3bd799", + "rev": "4c2ad8c3aaa4d0d7d19bee97435d0a4769a1e772", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1668558838, - "narHash": "sha256-etn/6ASEQFHIbTddAaHuz55/mWNz/UJcu3363YUHUOE=", + "lastModified": 1673137841, + "narHash": "sha256-xf69FFvypmqNT+ixCpyCUDQH79BytES0scPdvdqMH8E=", "owner": "hacl-star", "repo": "hacl-nix", - "rev": "8f22117a9e9b2733acfa0f50fc5cf849bca18860", + "rev": "c415983108b263092c4c72b38c3f22b4ee5c359f", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "karamel-src": { "flake": false, "locked": { - "lastModified": 1668034772, - "narHash": "sha256-1Z3is1g0qhrn4eKFepXxD1fPhcPVIB02rAihMUU5zyc=", + "lastModified": 1672266237, + "narHash": "sha256-14ocqeeE3wUxwEiBIRyzvj4WDrUrClMQaquqTMStKb0=", "owner": "fstarlang", "repo": "karamel", - "rev": "55b36e2c06b99f735283062e74f826d3088c2697", + "rev": "6e4dc86ea0ab981dff6da3725b560bccb0b311fe", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666703756, - "narHash": "sha256-GwpMJ1hT+z1fMAUkaGtvbvofJQwdVFDEGVhfE82+AUk=", + "lastModified": 1673134516, + "narHash": "sha256-mAZQKqkNQbBmJnmUU0blOfkKlgMSSVyPHdeWeuKad8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f994293d1eb8812f032e8919e10a594567cf6ef7", + "rev": "f6f44561884c3470e2b783683d5dbac42dfc833b", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1667811565, - "narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=", + "lastModified": 1669140675, + "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "667e5581d16745bcda791300ae7e2d73f49fff25", + "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1666494036, - "narHash": "sha256-4mmm+1MBPMD56LMLN9QcEwnfnu41NkA6lDeZGjSrxIw=", + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "af2e939ba2c7cbb188d06d6650c6353b10b3f2be", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "type": "github" }, "original": { @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1666839029, - "narHash": "sha256-gmSmf3bDS9oR4OHsvKHEErqje228XXP22uKIQWZj4Jo=", + "lastModified": 1673231106, + "narHash": "sha256-Tbw4N/TL+nHmxF8RBoOJbl/6DRRzado/9/ttPEzkGr8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c095030cf6c84e304f867ad066d8d5b051131af5", + "rev": "3488cec01351c2f1086b02a3a61808be7a25103e", "type": "github" }, "original": { @@ -25,11 +25,29 @@ }; buildInputs = [ ocamlPackages.calendar ]; }; + ocamlgraph = ocamlPackages.buildDunePackage rec { + pname = "ocamlgraph"; + version = "2.0.0"; + src = pkgs.fetchurl { + url = "https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz"; + sha256 = "20fe267797de5322088a4dfb52389b2ea051787952a8a4f6ed70fcb697482609"; + }; + buildInputs = [ ocamlPackages.stdlib-shims ocamlPackages.graphics ]; + }; + unionFind = ocamlPackages.buildDunePackage rec { + pname = "unionFind"; + version = "20220122"; + src = pkgs.fetchurl { + url = "https://gitlab.inria.fr/fpottier/unionFind/-/archive/20220122/archive.tar.gz"; + sha512 = "c49dd3f9a6689f6a5efe39c26efe2c137f8812b4be6ee76c2cc20068cf86ad73c0ac97ec9a543245dddb63792ce8c1904576b3435bf419cc7837bc5e368eee6d"; + }; + buildInputs = []; + }; aeneas = ocamlPackages.buildDunePackage { pname = "aeneas"; version = "0.1.0"; src = ./compiler; - buildInputs = [ easy_logging charon.packages.${system}.charon-ml ] + buildInputs = [ easy_logging ocamlgraph unionFind charon.packages.${system}.charon-ml ] ++ (with ocamlPackages; [ calendar core_unix |