cachix 1.3.1 → 1.3.2

raw patch · 3 files changed

+12/−6 lines, 3 files

Files

CHANGELOG.md +4/−0
cachix-deployment/Main.hs +7/−5
cachix.cabal +1/−1

CHANGELOG.md view

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [1.3.2] - 2023-03-17++- Fix build on GHC 9.4+ ## [1.3.1] - 2023-03-09  ### Fixed

cachix-deployment/Main.hs view

@@ -6,6 +6,8 @@ where  import Cachix.API.Error (escalateAs)+import qualified Cachix.API.WebSocketSubprotocol as AgentInformation (AgentInformation (..))+import qualified Cachix.API.WebSocketSubprotocol as DeploymentDetails (DeploymentDetails (..)) import qualified Cachix.API.WebSocketSubprotocol as WSS import qualified Cachix.Client.URI as URI import qualified Cachix.Deploy.Activate as Activate@@ -51,7 +53,7 @@     } <-     escalateAs (FatalError . toS) . Aeson.eitherDecode . toS =<< getContents -  let deploymentID = WSS.id (deploymentDetails :: WSS.DeploymentDetails)+  let deploymentID = DeploymentDetails.id deploymentDetails   let headers = WebSocket.createHeaders agentName agentToken   let port = fromMaybe (URI.Port 80) (URI.getPortFor (URI.getScheme host))   let logWebsocketOptions =@@ -155,9 +157,9 @@    endDeployment activationStatus   where-    storePath = WSS.storePath deploymentDetails-    deploymentID = WSS.id (deploymentDetails :: WSS.DeploymentDetails)-    deploymentIndex = show (WSS.index deploymentDetails)+    storePath = DeploymentDetails.storePath deploymentDetails+    deploymentID = DeploymentDetails.id deploymentDetails+    deploymentIndex = show (DeploymentDetails.index deploymentDetails)      handleAsActivationStatus :: IO Activate.Status -> IO Activate.Status     handleAsActivationStatus action =@@ -219,7 +221,7 @@           { WSS.method = method,             WSS.command = command,             WSS.id = uuid,-            WSS.agent = Just $ WSS.id (agentInformation :: WSS.AgentInformation)+            WSS.agent = Just $ AgentInformation.id agentInformation           }       where         -- TODO: move to WSS

cachix.cabal view

@@ -1,6 +1,6 @@ cabal-version:      2.2 name:               cachix-version:            1.3.1+version:            1.3.2 license:            Apache-2.0 license-file:       LICENSE copyright:          2018 Domen Kozar