From e5da1bbcedfe183b5a988dbb356986ee3bd4681f Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Mon, 20 Feb 2023 08:52:15 +0000
Subject: [PATCH] cabal2nix:
github.com:NixOS/cabal2nix/8e97f51e4bd4e5b9ff79391aa599ed8547771954 -> 2.19.1
---
horizon.dhall | 6 +-----
pkgs/cabal2nix.nix | 9 +--------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/horizon.dhall b/horizon.dhall
index 848f81e3..ca11062c 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -181,11 +181,7 @@ let packages =
, cabal-doctest = H.callHackage "cabal-doctest" "1.0.9"
, cabal-install = H.callHackage "cabal-install" "3.8.1.0"
, cabal-install-solver = H.callHackage "cabal-install-solver" "3.8.1.0"
- , cabal2nix =
- H.callGit
- "https://github.com/NixOS/cabal2nix"
- "8e97f51e4bd4e5b9ff79391aa599ed8547771954"
- (Some "cabal2nix")
+ , cabal2nix = H.callHackage "cabal2nix" "2.19.1"
, cache = H.callHackage "cache" "0.1.3.0"
, call-stack = H.callHackage "call-stack" "0.4.0"
, canonical-json = H.callHackage "canonical-json" "0.6.0.1"
diff --git a/pkgs/cabal2nix.nix b/pkgs/cabal2nix.nix
index 1293490a..940ceaf5 100644
--- a/pkgs/cabal2nix.nix
+++ b/pkgs/cabal2nix.nix
@@ -8,7 +8,6 @@
, deepseq
, directory
, distribution-nixpkgs
-, fetchgit
, filepath
, hackage-db
, hopenssl
@@ -33,13 +32,7 @@
mkDerivation {
pname = "cabal2nix";
version = "2.19.1";
- src = fetchgit {
- url = "https://github.com/NixOS/cabal2nix";
- sha256 = "1n4jy4xsrzywqvzicsca6kaw4bp0xdz5qfkvj7bkh4np9p3hnj08";
- rev = "8e97f51e4bd4e5b9ff79391aa599ed8547771954";
- fetchSubmodules = true;
- };
- postUnpack = "sourceRoot+=/cabal2nix/; echo source root reset to $sourceRoot";
+ sha256 = "e0dba35dba0917f4663ba3aee131341dcbf2241112227e07e4d4cfbe37f667b2";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = false;
--
GitLab