From 7c68b9a1d716d44873b563b24e1e670098bf4241 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@homotopic.tech>
Date: Wed, 15 Mar 2023 10:03:10 +0000
Subject: [PATCH] horizon-spec: 0.10.0 -> 0.11.0 horizon-gen-nix: 0.8.0 ->
0.9.0 horizon-spec-pretty: 0.0.1 -> 0.1.0 horizon-spec-lens: 0.1.0 -> 0.2.0
---
horizon.dhall | 21 ++++++++++++---------
pkgs/horizon-gen-nix.nix | 8 +++++---
pkgs/horizon-spec-lens.nix | 10 +++++++---
pkgs/horizon-spec-pretty.nix | 11 +++++++----
pkgs/horizon-spec.nix | 12 +++++-------
5 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/horizon.dhall b/horizon.dhall
index d4552844..1393042d 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -550,16 +550,19 @@ let packages =
, hnix-store-remote = H.callHackage "hnix-store-remote" "0.6.0.0"
, hopenssl = H.callHackage "hopenssl" "2.2.4"
, horizon-gen-nix =
- H.callTarball
- "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix/-/archive/master/horizon-gen-nix-master.tar.gz"
- (Some "horizon-gen-nix")
+ H.callHorizonGitlab "horizon-gen-nix" "0.9.0" (Some "horizon-gen-nix")
, horizon-spec =
- H.callGit
- "https://gitlab.horizon-haskell.net/haskell/horizon-spec"
- "7c5ca21695f5964cca852d2d6d43729c7418ace7"
- (Some "horizon-spec")
- , horizon-spec-lens = H.callHackage "horizon-spec-lens" "0.1"
- , horizon-spec-pretty = H.callHackage "horizon-spec-pretty" "0.0.1"
+ H.callHorizonGitlab "horizon-spec" "0.11.0" (Some "horizon-spec")
+ , horizon-spec-lens =
+ H.callHorizonGitlab
+ "horizon-spec-lens"
+ "0.2.0"
+ (Some "horizon-spec-lens")
+ , horizon-spec-pretty =
+ H.callHorizonGitlab
+ "horizon-spec-pretty"
+ "0.1.0"
+ (Some "horizon-spec-pretty")
, hosc = H.callHackage "hosc" "0.19.1"
, hostname = H.callHackage "hostname" "1.0"
, hourglass = H.callHackage "hourglass" "0.2.12"
diff --git a/pkgs/horizon-gen-nix.nix b/pkgs/horizon-gen-nix.nix
index 0ae88279..69976dbb 100644
--- a/pkgs/horizon-gen-nix.nix
+++ b/pkgs/horizon-gen-nix.nix
@@ -16,16 +16,17 @@
, path
, path-dhall-instance
, pretty
+, raw-strings-qq
, silently
, sydtest
, text
}:
mkDerivation {
pname = "horizon-gen-nix";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchzip {
- url = "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix/-/archive/master/horizon-gen-nix-master.tar.gz";
- sha256 = "0yix3z210v9jpsw5pxiz0r8rj03r1j91jq5fxy6qgf3bavv3i005";
+ url = "https://gitlab.horizon-haskell.net/haskell/horizon-gen-nix/-/archive/0.9.0/horizon-gen-nix-0.9.0.tar.gz";
+ sha256 = "0jmrpkn56kykisj7zki4ib1zhm6m4qxbzhgz9k4lmf0gh4w37iln";
};
postUnpack = "sourceRoot+=/horizon-gen-nix/; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -47,6 +48,7 @@ mkDerivation {
path
path-dhall-instance
pretty
+ raw-strings-qq
silently
text
];
diff --git a/pkgs/horizon-spec-lens.nix b/pkgs/horizon-spec-lens.nix
index f6dfed03..6fb8f889 100644
--- a/pkgs/horizon-spec-lens.nix
+++ b/pkgs/horizon-spec-lens.nix
@@ -1,8 +1,12 @@
-{ mkDerivation, base, horizon-spec, lens, lib }:
+{ mkDerivation, base, fetchzip, horizon-spec, lens, lib }:
mkDerivation {
pname = "horizon-spec-lens";
- version = "0.1";
- sha256 = "b7db04f3e480eafba6c9c6ce5dc9758f5996dd5dede080313e48393b7c43b481";
+ version = "0.2.0";
+ src = fetchzip {
+ url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec-lens/-/archive/0.2.0/horizon-spec-lens-0.2.0.tar.gz";
+ sha256 = "0iqpvid9p6gyvbmc45cry2fafmg9khl0wkpn4sc9gfhgxhl2a6gm";
+ };
+ postUnpack = "sourceRoot+=/horizon-spec-lens/; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
diff --git a/pkgs/horizon-spec-pretty.nix b/pkgs/horizon-spec-pretty.nix
index 6393bb4d..d1070b1b 100644
--- a/pkgs/horizon-spec-pretty.nix
+++ b/pkgs/horizon-spec-pretty.nix
@@ -3,16 +3,20 @@
, bytestring
, containers
, dhall
+, fetchzip
, horizon-spec
-, lens
, lib
, path
, text
}:
mkDerivation {
pname = "horizon-spec-pretty";
- version = "0.0.1";
- sha256 = "8edf0b0aaeab131627ef277c223b6311a7cdf441ed0118355b0092f77a62f633";
+ version = "0.1.0";
+ src = fetchzip {
+ url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec-pretty/-/archive/0.1.0/horizon-spec-pretty-0.1.0.tar.gz";
+ sha256 = "0sa90d981qig9qlf260d82kkbdjan4501briv3wd15h2nzzd4faz";
+ };
+ postUnpack = "sourceRoot+=/horizon-spec-pretty/; echo source root reset to $sourceRoot";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
@@ -22,7 +26,6 @@ mkDerivation {
containers
dhall
horizon-spec
- lens
path
text
];
diff --git a/pkgs/horizon-spec.nix b/pkgs/horizon-spec.nix
index 32a0dd13..aa18ef06 100644
--- a/pkgs/horizon-spec.nix
+++ b/pkgs/horizon-spec.nix
@@ -2,7 +2,7 @@
, base
, containers
, dhall
-, fetchgit
+, fetchzip
, lib
, path
, path-dhall-instance
@@ -12,12 +12,10 @@
}:
mkDerivation {
pname = "horizon-spec";
- version = "0.10.0";
- src = fetchgit {
- url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec";
- sha256 = "1c5a1n8c2rf765zrqq4l0lcdikriw9f7ca5l0xa6sy1cpdhg3sgh";
- rev = "7c5ca21695f5964cca852d2d6d43729c7418ace7";
- fetchSubmodules = true;
+ version = "0.11.0";
+ src = fetchzip {
+ url = "https://gitlab.horizon-haskell.net/haskell/horizon-spec/-/archive/0.11.0/horizon-spec-0.11.0.tar.gz";
+ sha256 = "0jhpivaafwg9a75qj0aq1lirhvhx4404l8bdsx794sbjqifnwnxn";
};
postUnpack = "sourceRoot+=/horizon-spec/; echo source root reset to $sourceRoot";
isLibrary = true;
--
GitLab