diff --git a/flake.lock b/flake.lock
index ed421c39e515d4af9d4c05e165d3df03bb29f5e7..e84854a9323cf906f76af0442491816dc3589671 100644
--- a/flake.lock
+++ b/flake.lock
@@ -125,11 +125,11 @@
"horizon-platform": {
"flake": false,
"locked": {
- "lastModified": 1678524042,
- "narHash": "sha256-WGTbVYoUMdiBoz/mu9ie0WP50ANdhBUUmH+hmktAekc=",
+ "lastModified": 1678805130,
+ "narHash": "sha256-I4q5yTZZJB5vuWfA/T0NaIgAi3kaP5k6OWCc34YWlgc=",
"ref": "refs/heads/master",
- "rev": "eb9368ebed9468eaf31fb0704445580271f973d1",
- "revCount": 982,
+ "rev": "b04d3fea8d6127c1aa7d8e8bb0d2812e8b5e1d20",
+ "revCount": 991,
"type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
},
diff --git a/flake.nix b/flake.nix
index 31d484839c586a23adba476157d615aadd074bf1..032782602ef72f486203b97c964861978e09a945 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,6 @@
name = "horizon-gen-nix";
runtimeInputs = with pkgs; [ ghc cabal-install ];
text = ''
- cabal update
${horizon-platform-prev.legacyPackages.${system}.horizon-gen-nix}/bin/horizon-gen-nix;
${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt pkgs/*
${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt initial-packages.nix
@@ -77,23 +76,6 @@
&& v.meta.broken == false)
legacyPackages;
- run-impure-tests = writePorcelainOrDieBin {
- name = "run-impure-tests";
- src = ./.;
- command = ''
- export PATH=$PATH:${pkgs.nix-prefetch-git}/bin:${pkgs.cabal-install}/bin
- cabal update
- rm pkgs -rf && nix run .#horizon-gen-nix;
- nixpkgs-fmt pkgs/*
- '';
- advice = "Try removing the offending packages from pkgs/ and running nix run .#horizon-gen-nix";
- };
-
- run-impure-tests-app = {
- type = "app";
- program = "${run-impure-tests}/bin/run-impure-tests";
- };
-
procex = import ./shell/default.nix { haskellPackages = horizon-platform-prev.legacyPackages.${system}; inherit (pkgs) runCommand writeShellScriptBin; };
in
{
@@ -105,7 +87,6 @@
program = "${procex}/bin/procex-shell";
};
- run-impure-tests = run-impure-tests-app;
};
checks = with lint-utils.linters.${system}; {
diff --git a/horizon.dhall b/horizon.dhall
index 04b87a343bd8f43d0c8f3d1ac08600f53852e66b..1393042d3741855aa5134f890f6a7d41195a01c4 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -1,6 +1,5 @@
let H =
- https://gitlab.horizon-haskell.net/dhall/horizon-spec/-/raw/0.6/horizon-spec/package.dhall
- sha256:9a80164572526dc5350f105c8db0790fdf36634629b4cf03402ba14fd173d121
+ https://gitlab.horizon-haskell.net/dhall/horizon-spec/-/raw/0.10.0/horizon-spec/package.dhall
let packages =
{ BNFC = H.callHackage "BNFC" "2.9.4.1"
@@ -550,10 +549,20 @@ let packages =
, hnix-store-core = H.callHackage "hnix-store-core" "0.6.1.0"
, hnix-store-remote = H.callHackage "hnix-store-remote" "0.6.0.0"
, hopenssl = H.callHackage "hopenssl" "2.2.4"
- , horizon-gen-nix = H.callHackage "horizon-gen-nix" "0.6"
- , horizon-spec = H.callHackage "horizon-spec" "0.6.4"
- , horizon-spec-lens = H.callHackage "horizon-spec-lens" "0.1"
- , horizon-spec-pretty = H.callHackage "horizon-spec-pretty" "0.0.1"
+ , horizon-gen-nix =
+ H.callHorizonGitlab "horizon-gen-nix" "0.9.0" (Some "horizon-gen-nix")
+ , horizon-spec =
+ 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 e47000c5e8f363327928c8d0b6ac2f9ceeb84fd7..69976dbb5c887353a6b9a52cd1a61200bfca2157 100644
--- a/pkgs/horizon-gen-nix.nix
+++ b/pkgs/horizon-gen-nix.nix
@@ -7,6 +7,7 @@
, directory
, distribution-nixpkgs
, either
+, fetchzip
, horizon-spec
, language-nix
, lens
@@ -15,14 +16,19 @@
, path
, path-dhall-instance
, pretty
+, raw-strings-qq
, silently
, sydtest
, text
}:
mkDerivation {
pname = "horizon-gen-nix";
- version = "0.6";
- sha256 = "814a01e62e66aca869df8738656e1c351a9b20a6cfe1f25fac2070f6073f0db6";
+ version = "0.9.0";
+ src = fetchzip {
+ 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;
isExecutable = true;
enableSeparateDataOutput = false;
@@ -42,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 f6dfed03cf924a8a2824be1e2c9b0f5c40b41e3e..6fb8f8892fee8405d620ecd6e4069d13c120d87e 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 6393bb4d24b080f9943cb4d6d34202048b6435df..d1070b1b20a8ad9b86dcb7cd95e8b2d275a6dfa1 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 cea22c252d0688ffe8ca03b38303bb6f2a5161a4..aa18ef0673475b13db005fc439232265b2a5f64d 100644
--- a/pkgs/horizon-spec.nix
+++ b/pkgs/horizon-spec.nix
@@ -2,21 +2,24 @@
, base
, containers
, dhall
+, fetchzip
, lib
, path
, path-dhall-instance
-, prettyprinter
-, sydtest
, template-haskell
, text
, th-lift
}:
mkDerivation {
pname = "horizon-spec";
- version = "0.6.4";
- sha256 = "092aff7d396d331dbe45414e40fa5a142e8c47a4df8f141aa493cce5437fb72f";
+ 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;
- isExecutable = true;
+ isExecutable = false;
enableSeparateDataOutput = false;
libraryHaskellDepends = [
base
@@ -28,13 +31,6 @@ mkDerivation {
text
th-lift
];
- executableHaskellDepends = [
- base
- dhall
- prettyprinter
- sydtest
- text
- ];
enableLibraryProfiling = true;
enableExecutableProfiling = true;
doHaddock = false;