From b85d408d81f992436b84530bdb64d140be3dbfdf Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Sun, 4 Sep 2022 13:44:43 +0100
Subject: [PATCH] Take composite-lens-extra 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 201c7e2c..56e5101a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -50,22 +50,6 @@
"type": "github"
}
},
- "composite-lens-extra": {
- "flake": false,
- "locked": {
- "lastModified": 1662139407,
- "narHash": "sha256-klAhsEDQiFJYarYaGmGI9HLndqz6ddOgHalCoIwcJN8=",
- "ref": "refs/heads/master",
- "rev": "ee6d665429e0e0a2c9273d95ee60108490bf9d03",
- "revCount": 14,
- "type": "git",
- "url": "https://gitlab.homotopic.tech/haskell/composite-lens-extra"
- },
- "original": {
- "type": "git",
- "url": "https://gitlab.homotopic.tech/haskell/composite-lens-extra"
- }
- },
"doctest": {
"flake": false,
"locked": {
@@ -317,7 +301,6 @@
"all-cabal-hashes": "all-cabal-hashes",
"cborg": "cborg",
"cereal": "cereal",
- "composite-lens-extra": "composite-lens-extra",
"doctest": "doctest",
"double-conversion": "double-conversion",
"flake-parts": "flake-parts",
diff --git a/flake.nix b/flake.nix
index c9142407..8f2100d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,10 +8,6 @@
url = "github:GaloisInc/cereal";
flake = false;
};
- composite-lens-extra = {
- url = "git+https://gitlab.homotopic.tech/haskell/composite-lens-extra";
- flake = false;
- };
doctest = {
url = "github:parsonsmatt/doctest/a5f696b80bb8220d284e34d90f0b94291b859e77";
flake = false;
diff --git a/overlay.nix b/overlay.nix
index 656c5ce6..70ad340b 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -51,7 +51,7 @@ final: prev: with pkgs.haskell.lib; {
composite-dhall = prev.callHackage "composite-dhall" "0.1.0.1" { };
- composite-lens-extra = prev.callCabal2nix "composite-lens-extra" inputs.composite-lens-extra { };
+ composite-lens-extra = prev.callHackage "composite-lens-extra" "0.1.0.0" { };
conduit = dontCheck prev.conduit;
--
GitLab