From a91d25bb55d029ac84a4d7dd6cb1752c7de17a0d Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Sun, 4 Sep 2022 13:57:11 +0100
Subject: [PATCH] Pull cereal from hackage
---
flake.lock | 17 -----------------
flake.nix | 4 ----
overlay.nix | 2 +-
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/flake.lock b/flake.lock
index a6538cbc..25444f4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -34,22 +34,6 @@
"type": "github"
}
},
- "cereal": {
- "flake": false,
- "locked": {
- "lastModified": 1660071359,
- "narHash": "sha256-1CEEynJBeSz+zeNSy8uJ4qdOYz93jvIJJB7MBQRA99I=",
- "owner": "GaloisInc",
- "repo": "cereal",
- "rev": "c188f3d45ab4245c962975ac237e13c85aeb7136",
- "type": "github"
- },
- "original": {
- "owner": "GaloisInc",
- "repo": "cereal",
- "type": "github"
- }
- },
"doctest": {
"flake": false,
"locked": {
@@ -235,7 +219,6 @@
"inputs": {
"all-cabal-hashes": "all-cabal-hashes",
"cborg": "cborg",
- "cereal": "cereal",
"doctest": "doctest",
"double-conversion": "double-conversion",
"flake-parts": "flake-parts",
diff --git a/flake.nix b/flake.nix
index d54fb25a..1c3a96af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,6 @@
url = "github:parsonsmatt/cborg/05ca2063ff631667699bffbeee3a4a076943b905";
flake = false;
};
- cereal = {
- url = "github:GaloisInc/cereal";
- flake = false;
- };
doctest = {
url = "github:parsonsmatt/doctest/a5f696b80bb8220d284e34d90f0b94291b859e77";
flake = false;
diff --git a/overlay.nix b/overlay.nix
index e9c130d4..082a1c83 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -41,7 +41,7 @@ final: prev: with pkgs.haskell.lib; {
cborg-json = doJailbreak (prev.callCabal2nix "cborg-json" (inputs.cborg + /cborg-json) { });
- cereal = prev.callCabal2nix "cereal" inputs.cereal { };
+ cereal = prev.callHackage "cereal" "0.5.8.3" { };
compact = doJailbreak (prev.callHackage "compact" "0.2.0.0" { });
--
GitLab