diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 198e4b209ff10..26da8ec13c338 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -477,11 +477,16 @@ self: super: { matterhorn = doJailbreak super.matterhorn; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - hnix = dontCheck super.hnix; + hnix = dontCheck (super.hnix.override { + # 2023-12-11: Needs older core due to remote + hnix-store-core = self.hnix-store-core_0_6_1_0; + }); # Too strict bounds on algebraic-graphs # https://github.com/haskell-nix/hnix-store/issues/180 - hnix-store-core = doJailbreak super.hnix-store-core; + hnix-store-core_0_6_1_0 = doJailbreak super.hnix-store-core_0_6_1_0; + # 2023-12-11: Needs older core + hnix-store-remote = super.hnix-store-remote.override { hnix-store-core = self.hnix-store-core_0_6_1_0; }; # Fails for non-obvious reasons while attempting to use doctest. focuslist = dontCheck super.focuslist; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bfb638bd8b626..a19d7f6e76867 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -33,7 +33,6 @@ default-package-overrides: # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 - rope-utf16-splay < 0.4.0.0 - - hnix-store-core < 0.7 # 2023-12-07: required by hnix-store-remote 0.6 # 2023-04-22: For dhall < 1.42 compatibility - dhall-nixpkgs == 1.0.9 @@ -67,7 +66,6 @@ extra-packages: - Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0 - Cabal-syntax == 3.10.* # newest version required for cabal-install and other packages - - cachix < 1.4 # 2023-04-02: cachix 1.4{,.1} have known on multi-user Nix systems - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 @@ -113,6 +111,7 @@ extra-packages: - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 + - hnix-store-core < 0.7 # 2023-12-11: required by hnix-store-remote 0.6 - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a92ecbbc74fd8..3310d6e103765 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -58237,58 +58237,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "cachix_1_3_3" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , cachix-api, concurrent-extra, conduit, conduit-concurrent-map - , conduit-extra, conduit-zstd, containers, cookie, cryptonite - , deepseq, dhall, directory, ed25519, either, extra, filepath - , fsnotify, hercules-ci-cnix-store, here, hnix-store-core, hspec - , hspec-discover, http-client, http-client-tls, http-conduit - , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, network-uri, nix, optparse-applicative - , pretty-terminal, prettyprinter, process, protolude, resourcet - , retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary - , text, time, unix, unordered-containers, uri-bytestring, uuid - , vector, versions, websockets, wuss - }: - mkDerivation { - pname = "cachix"; - version = "1.3.3"; - sha256 = "0gnihq7xnd77m5rg14sw49bb0yr5r9qic2dwvk1w5xxfibh2wrib"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring cachix-api - concurrent-extra conduit conduit-concurrent-map conduit-extra - conduit-zstd containers cookie cryptonite deepseq dhall directory - ed25519 either extra filepath fsnotify hercules-ci-cnix-store here - hnix-store-core http-client http-client-tls http-conduit http-types - inline-c-cpp katip lukko lzma-conduit megaparsec memory mmorph - netrc network-uri optparse-applicative pretty-terminal - prettyprinter process protolude resourcet retry safe-exceptions - servant servant-auth servant-auth-client servant-client - servant-client-core servant-conduit stm stm-chans stm-conduit - systemd temporary text time unix unordered-containers - uri-bytestring uuid vector versions websockets wuss - ]; - libraryPkgconfigDepends = [ nix ]; - executableHaskellDepends = [ - aeson async base cachix-api conduit http-conduit katip protolude - safe-exceptions stm stm-chans stm-conduit time uuid websockets wuss - ]; - executableToolDepends = [ hspec-discover ]; - testHaskellDepends = [ - aeson base bytestring cachix-api dhall directory extra here hspec - protolude servant-auth-client servant-client-core temporary - ]; - description = "Command line client for Nix binary cache hosting https://cachix.org"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.domenkozar ]; - }) {inherit (pkgs) nix;}; - "cachix" = callPackage ({ mkDerivation, aeson, ascii-progress, async, base , base64-bytestring, bytestring, cachix-api, concurrent-extra @@ -151097,7 +151045,7 @@ self: { ]; }) {}; - "hnix-store-core" = callPackage + "hnix-store-core_0_6_1_0" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring, cereal , containers, cryptonite, directory, filepath, hashable, hspec @@ -151126,12 +151074,13 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; }) {}; - "hnix-store-core_0_7_0_0" = callPackage + "hnix-store-core" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base , base16-bytestring, base64-bytestring, binary, bytestring , case-insensitive, cereal, containers, cryptonite, directory @@ -151161,7 +151110,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Anton-Latukha lib.maintainers.sorki ]; @@ -262947,7 +262895,6 @@ self: { description = "Generates unique passwords for various websites from a single password"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; - hydraPlatforms = lib.platforms.none; mainProgram = "scat"; }) {}; @@ -265265,7 +265212,6 @@ self: { ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "selda-json" = callPackage