From 006d7838da154ff57087acde7b48cbf3526f3176 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Thu, 29 Dec 2022 11:02:06 +0000
Subject: [PATCH] horizon-gen-nix: 918df757ce5c9244232c1e3a1e05e9d9e3ab4f09 ->
0.4.0
---
horizon.dhall | 6 +-----
pkgs/horizon-gen-nix.nix | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/horizon.dhall b/horizon.dhall
index f27faa86..04d8d694 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -378,17 +378,13 @@ in H.HorizonExport.MakePackageSet
, H.callHackage "hledger" "1.27.1"
, H.callHackage "hlint" "3.5"
, H.callHackage "hopenssl" "2.2.4"
+ , H.callHackage "horizon-gen-nix" "0.4.0"
, H.callHackage "horizon-spec" "0.4.1"
, H.callHackage "hosc" "0.19.1"
, H.callHackage "hostname" "1.0"
, H.callHackage "hourglass" "0.2.12"
, H.callHackage "hpack-dhall" "0.5.7"
, H.callHackage "hpack" "0.35.0"
- , H.callGit
- "horizon-gen-nix"
- "https://gitlab.homotopic.tech/horizon/horizon-gen-nix"
- "918df757ce5c9244232c1e3a1e05e9d9e3ab4f09"
- (None Text)
, H.callHackage "hscolour" "1.24.4"
, H.callHackage "hslua-aeson" "2.2.1"
, H.callHackage "hslua-core" "2.2.1"
diff --git a/pkgs/horizon-gen-nix.nix b/pkgs/horizon-gen-nix.nix
index fcd5286e..996bd26e 100644
--- a/pkgs/horizon-gen-nix.nix
+++ b/pkgs/horizon-gen-nix.nix
@@ -3,28 +3,26 @@
, base
, cabal2nix
, containers
-, data-fix
, dhall
, directory
-, fetchgit
+, distribution-nixpkgs
+, either
+, horizon-spec
, language-nix
, lens
, lib
-, megaparsec
+, optparse-applicative
, path
, path-dhall-instance
, pretty
+, silently
+, sydtest
, text
}:
mkDerivation {
pname = "horizon-gen-nix";
- version = "0.1.0.0";
- src = fetchgit {
- url = "https://gitlab.homotopic.tech/horizon/horizon-gen-nix";
- sha256 = "0x10wdjqs411l902i0b5vlr7rw30al2sd6r614yi5g63zrylahs3";
- rev = "918df757ce5c9244232c1e3a1e05e9d9e3ab4f09";
- fetchSubmodules = true;
- };
+ version = "0.4.0";
+ sha256 = "c27e7ee4e02876e8814d4e047baadfd6ebcec7f18953678f0f90176233531568";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = false;
@@ -33,18 +31,21 @@ mkDerivation {
Cabal-syntax
cabal2nix
containers
- data-fix
dhall
directory
+ distribution-nixpkgs
+ either
+ horizon-spec
language-nix
lens
- megaparsec
+ optparse-applicative
path
path-dhall-instance
pretty
+ silently
text
];
- executableHaskellDepends = [ base ];
+ executableHaskellDepends = [ base directory path sydtest ];
enableLibraryProfiling = true;
enableExecutableProfiling = true;
doHaddock = false;
@@ -52,7 +53,7 @@ mkDerivation {
doCheck = false;
doBenchmark = false;
hyperlinkSource = false;
- description = "Short description of your package";
- license = lib.licenses.bsd3;
+ description = "Generate nix expressions from horizon-spec definitions";
+ license = lib.licenses.mit;
broken = false;
}
--
GitLab