diff --git a/lib/console.nix b/lib/console.nix index a725457a..4c014541 100644 --- a/lib/console.nix +++ b/lib/console.nix @@ -1,4 +1,4 @@ -{lib, ...}: let +{...}: let indentLine = l: " " + l; diff --git a/local.nix b/local.nix index 2576086d..b53b937c 100644 --- a/local.nix +++ b/local.nix @@ -60,7 +60,7 @@ hix.pro ({config, lib, ...}: { "lens-regex-pcre ^>= 1.1" "optparse-applicative ^>= 0.17" "path ^>= 0.9" - "path-io ^>= 1.7" + "path-io >= 1.7 && < 1.9" "random ^>= 1.2" "transformers" "unix" @@ -74,7 +74,7 @@ hix.pro ({config, lib, ...}: { "exon ^>= 1.4" "hedgehog >= 1.1 && < 1.3" "path ^>= 0.9" - "path-io ^>= 1.7" + "path-io >= 1.7 && < 1.9" "tasty ^>= 1.4" "tasty-hedgehog >= 1.3 && < 1.5" "transformers" diff --git a/ops/overrides.nix b/ops/overrides.nix index 77a790fd..23a55489 100644 --- a/ops/overrides.nix +++ b/ops/overrides.nix @@ -58,28 +58,6 @@ mkDerivation { } ; } -; - incipit-base = { - meta = { - sha256 = "02fdppamn00m94xqi4zhm6sl1ndg6lhn24m74w24pq84h44mynl6"; - ver = "0.5.0.0"; - }; - drv = { mkDerivation, base, bytestring, containers, data-default, lib -, stm, text -}: -mkDerivation { - pname = "incipit-base"; - version = "0.5.0.0"; - src = /nix/store/yldscjmkq00j24nprzf6h950v7n33hp1-source; - libraryHaskellDepends = [ - base bytestring containers data-default stm text - ]; - homepage = "https://github.com/tek/incipit-core#readme"; - description = "A Prelude for Polysemy – Base Reexports"; - license = "BSD-2-Clause-Patent"; -} -; -} ; }; ghc92 = { @@ -141,28 +119,6 @@ mkDerivation { } ; } -; - incipit-base = { - meta = { - sha256 = "02fdppamn00m94xqi4zhm6sl1ndg6lhn24m74w24pq84h44mynl6"; - ver = "0.5.0.0"; - }; - drv = { mkDerivation, base, bytestring, containers, data-default, lib -, stm, text -}: -mkDerivation { - pname = "incipit-base"; - version = "0.5.0.0"; - src = /nix/store/yldscjmkq00j24nprzf6h950v7n33hp1-source; - libraryHaskellDepends = [ - base bytestring containers data-default stm text - ]; - homepage = "https://github.com/tek/incipit-core#readme"; - description = "A Prelude for Polysemy – Base Reexports"; - license = "BSD-2-Clause-Patent"; -} -; -} ; }; ghc94 = { @@ -224,28 +180,6 @@ mkDerivation { } ; } -; - incipit-base = { - meta = { - sha256 = "02fdppamn00m94xqi4zhm6sl1ndg6lhn24m74w24pq84h44mynl6"; - ver = "0.5.0.0"; - }; - drv = { mkDerivation, base, bytestring, containers, data-default, lib -, stm, text -}: -mkDerivation { - pname = "incipit-base"; - version = "0.5.0.0"; - src = /nix/store/yldscjmkq00j24nprzf6h950v7n33hp1-source; - libraryHaskellDepends = [ - base bytestring containers data-default stm text - ]; - homepage = "https://github.com/tek/incipit-core#readme"; - description = "A Prelude for Polysemy – Base Reexports"; - license = "BSD-2-Clause-Patent"; -} -; -} ; }; hls = { @@ -309,28 +243,6 @@ mkDerivation { } ; } -; - incipit-base = { - meta = { - sha256 = "02fdppamn00m94xqi4zhm6sl1ndg6lhn24m74w24pq84h44mynl6"; - ver = "0.5.0.0"; - }; - drv = { mkDerivation, base, bytestring, containers, data-default, lib -, stm, text -}: -mkDerivation { - pname = "incipit-base"; - version = "0.5.0.0"; - src = /nix/store/yldscjmkq00j24nprzf6h950v7n33hp1-source; - libraryHaskellDepends = [ - base bytestring containers data-default stm text - ]; - homepage = "https://github.com/tek/incipit-core#readme"; - description = "A Prelude for Polysemy – Base Reexports"; - license = "BSD-2-Clause-Patent"; -} -; -} ; }; } \ No newline at end of file diff --git a/packages/hix/hix.cabal b/packages/hix/hix.cabal index 9c7d839e..6c2ae811 100644 --- a/packages/hix/hix.cabal +++ b/packages/hix/hix.cabal @@ -99,7 +99,7 @@ library , lens-regex-pcre ==1.1.* , optparse-applicative ==0.17.* , path ==0.9.* - , path-io ==1.7.* + , path-io >=1.7 && <1.9 , random ==1.2.* , transformers , unix @@ -215,7 +215,7 @@ test-suite hix-test , hix , incipit-base ==0.5.* , path ==0.9.* - , path-io ==1.7.* + , path-io >=1.7 && <1.9 , tasty ==1.4.* , tasty-hedgehog >=1.3 && <1.5 , transformers