Merge branch 'MkModifiers' into 'master'

Re-export MkModifiers

See merge request horizon/horizon-spec!23

ChangeLog.md

 # Changelog for horizon-spec
 
+## v0.6.1
+
+* Re-export MkModifiers constructor.
+
 ## v0.6
 
 * Change Overlay to wrap a `PackageSet` rather than a `PackageList`. The

flake.lock

@@ -139,16 +139,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1670319964,
-        "narHash": "sha256-g1B2WTztV3vsmHdKTEKy18jyXoM7/7OYgDEknGSQPLQ=",
-        "ref": "tee-check",
-        "rev": "c61d8aeff89d492a8615f68d675af7fcecbdd389",
-        "revCount": 42,
+        "lastModified": 1676204115,
+        "narHash": "sha256-cYYt6sN9t+lYYYelAbRtM/ioVJ27kMcUtR4unA8jfd4=",
+        "ref": "refs/heads/master",
+        "rev": "cc55bca9b25e65f7060de642c99e51bd96dfc190",
+        "revCount": 47,
         "type": "git",
         "url": "https://gitlab.homotopic.tech/nix/lint-utils"
       },
       "original": {
-        "ref": "tee-check",
         "type": "git",
         "url": "https://gitlab.homotopic.tech/nix/lint-utils"
       }

flake.nix

@@ -5,7 +5,7 @@
     flake-utils.url = "github:numtide/flake-utils";
     horizon-platform.url = "git+https://gitlab.homotopic.tech/horizon/horizon-platform";
     lint-utils = {
-      url = "git+https://gitlab.homotopic.tech/nix/lint-utils?ref=tee-check";
+      url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -48,16 +48,13 @@
           code = "${./.}/dhall/package.dhall";
         };
 
-        legacyPackages = horizon-platform.legacyPackages.${system}.override
+        overrides = hfinal: hprev:
           {
-            overrides = hfinal: hprev:
-              {
-                # Setting -f-with-http should disable http, but it doesn't.
-                dhall = disableLibraryProfiling (doJailbreak (appendConfigureFlag "-f-with-http" hprev.dhall));
-                horizon-spec = dontCheck (disableLibraryProfiling (hprev.callCabal2nix "horizon-spec" ./. { }));
-              };
+            horizon-spec = dontCheck (disableLibraryProfiling (hprev.callCabal2nix "horizon-spec" ./. { }));
           };
 
+        legacyPackages = horizon-platform.legacyPackages.${system}.extend overrides;
+
         horizon-spec-tests-wrapper = writeBashBin "horizon-spec-tests-wrapper" ''
           DHALL_PRELUDE=${dhall-prelude}/source.dhall ${legacyPackages.horizon-spec}/bin/horizon-spec-tests
         '';

horizon-spec.cabal

 cabal-version:      3.0
 name:               horizon-spec
-version:            0.6
+version:            0.6.1
 synopsis:           Horizon Stable Package Set Type Definitions
 description:
   This package contains the type definitions for the Horizon stable package set (https://horizon-haskell.net). This is a schema used to define package sets sourcing from hackage and git.

src/Horizon/Spec.hs

@@ -10,7 +10,7 @@ module Horizon.Spec
   , HaskellSource(FromGit, FromHackage, FromTarball, FromLocal)
   , HorizonExport(MakePackageSet, MakeOverlay)
   , LocalSource(MkLocalSource, fromLocalSource)
-  , Modifiers(doJailbreak, doBenchmark, doCheck, enableProfiling, includeBenchmarks, includeExecutables, includeTests)
+  , Modifiers(MkModifiers, doJailbreak, doBenchmark, doCheck, enableProfiling, includeBenchmarks, includeExecutables, includeTests)
   , Name(MkName, fromName)
   , OverlayExportSettings(MkOverlayExportSettings, packagesDir, overlayFile, overlay)
   , OverlayFile(MkOverlayFile, fromOverlayFile)