From fac638122465aedfbaf53e07b6252958066b6610 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Sun, 4 Sep 2022 13:55:10 +0100
Subject: [PATCH] Pull foundation from hackage
---
flake.lock | 35 -----------------------------------
flake.nix | 4 ----
overlay.nix | 2 +-
3 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/flake.lock b/flake.lock
index e3d6599a..a6538cbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -132,39 +132,6 @@
"type": "github"
}
},
- "foundation": {
- "flake": false,
- "locked": {
- "lastModified": 1653349151,
- "narHash": "sha256-W19+xRxbJ3weRuayuXhkwWX6R6cil2dKZSkMmwH+ox8=",
- "owner": "parsonsmatt",
- "repo": "foundation",
- "rev": "8166c31a115521f2ce5fabfba8247982979eeebf",
- "type": "github"
- },
- "original": {
- "owner": "parsonsmatt",
- "repo": "foundation",
- "type": "github"
- }
- },
- "ghc-tcplugins-extra": {
- "flake": false,
- "locked": {
- "lastModified": 1657981318,
- "narHash": "sha256-PRHBLEWy93hsxh805w5spq1+EZ2h6LQq+fyrF9GF6jg=",
- "owner": "clash-lang",
- "repo": "ghc-tcplugins-extra",
- "rev": "8852d8ad94effa39e3400a243b21ae444df6c69e",
- "type": "github"
- },
- "original": {
- "owner": "clash-lang",
- "repo": "ghc-tcplugins-extra",
- "rev": "8852d8ad94effa39e3400a243b21ae444df6c69e",
- "type": "github"
- }
- },
"haskell-flake": {
"locked": {
"lastModified": 1661726764,
@@ -273,8 +240,6 @@
"double-conversion": "double-conversion",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
- "foundation": "foundation",
- "ghc-tcplugins-extra": "ghc-tcplugins-extra",
"haskell-flake": "haskell-flake",
"integer-logarithms": "integer-logarithms",
"lint-utils": "lint-utils",
diff --git a/flake.nix b/flake.nix
index 48157ae0..d54fb25a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,10 +22,6 @@
};
flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs.follows = "nixpkgs";
- foundation = {
- url = "github:parsonsmatt/foundation";
- flake = false;
- };
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
haskell-flake.url = "github:srid/haskell-flake";
integer-logarithms = {
diff --git a/overlay.nix b/overlay.nix
index 84b36057..e9c130d4 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -81,7 +81,7 @@ final: prev: with pkgs.haskell.lib; {
foldl = dontCheck (prev.foldl);
- foundation = doJailbreak (prev.callCabal2nix "foundation" (inputs.foundation + /foundation) { });
+ foundation = prev.callHackage "foundation" "0.0.29" { };
generic-lens-lite = doJailbreak prev.generic-lens-lite;
--
GitLab