Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .buildkite/pipeline.yml

This file was deleted.

5 changes: 0 additions & 5 deletions cabal

This file was deleted.

122 changes: 57 additions & 65 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
index-state: 2020-05-15T00:00:00Z
-- Custom repository for cardano haskell packages, see CONTRIBUTING for more
repository cardano-haskell-packages
url: https://chap.intersectmbo.org/
secure: True
root-keys:
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
443abb7fb497a134c343faf52f0b659bd7999bc06b7f63fa76dc99d631f9bea1
a86a1f6ce86c449c46666bda44268677abf29b5b2d2eb5ec7af903ec2f117a82
bcec67e8e99cabfa7764d75ad9b158d72bfacf70ca1d0ec8bc6b4406d1bf8413
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- See CONTRIBUTING for information about these, including some Nix commands
-- you need to run if you change them
index-state:
, hackage.haskell.org 2025-04-16T18:30:40Z
, cardano-haskell-packages 2025-04-29T14:14:35Z

packages:
cardano-shell
Expand All @@ -19,75 +35,51 @@ package cardano-shell
package cardano-launcher
tests: True

-- See <https://github.com/IntersectMBO/cardano-api/pull/554/files>
-- disable c++ nonsense on bitvec, to make it compile. The windows linker/loader
-- chokes on c++ dependencies.
package bitvec
flags: -simd

-- ---------------------------------------------------------

-- The iohk-monitoring requires async-timer >= 0.2.0.0 but does not
-- list this constraint in it's cabal file.
constraints: async-timer >= 0.2.0.0
-- constraints: async-timer >= 0.2.0.0

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-sl-x509
tag: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49
--sha256: 1aw7ns8lv51fjf45k8yzils2j7a6bqzy8hn65kb3z0dn1qsm8x88

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 316c854d1d3089f480708ad5cd5ecf8a74423ddd
--sha256: 1srbl3jrkmpwypdz0yrx4nmah3qcsr93dp48zx2bamg51c4hcsyj

source-repository-package
type: git
location: https://github.com/input-output-hk/cardano-prelude
tag: 316c854d1d3089f480708ad5cd5ecf8a74423ddd
--sha256: 1srbl3jrkmpwypdz0yrx4nmah3qcsr93dp48zx2bamg51c4hcsyj
subdir: test

source-repository-package
type: git
location: http://github.com/well-typed/canonical-json
tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f
--sha256: 02fzn1xskis1lc1pkz0j92v6ipd89ww0k2p3dvwpm3yap5dpnm7k

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 1361bb92814c65e5964732777fc7f8ec9ebdccfe
--sha256: 1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy
subdir: Win32-network

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: efa4b5ecd7f0a13124616b12679cd42517cd905a
--sha256: 0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf
subdir: iohk-monitoring

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: efa4b5ecd7f0a13124616b12679cd42517cd905a
--sha256: 0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf
subdir: contra-tracer

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: efa4b5ecd7f0a13124616b12679cd42517cd905a
--sha256: 0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf
subdir: tracer-transformers

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: efa4b5ecd7f0a13124616b12679cd42517cd905a
--sha256: 0h1h5ifl5d7dl3y6fym9pjd6rfrbh5rbyxs0xw5las503pibv2bf
subdir: tracer-transformers

source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network
tag: 1361bb92814c65e5964732777fc7f8ec9ebdccfe
--sha256: 1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy
subdir: Win32-network
tag: a91add165152fa36f08e95fafe7da24f1dba4690
--sha256: 1ia8vlqghis92cla8qmqa6kh8f3jn29b01fshyk5hmgy5373s684

-- source-repository-package
-- type: git
-- location: https://github.com/input-output-hk/cardano-prelude
-- tag: c7fc9fba236972c27a55e0f3d34c2758cf616bfc
-- --sha256: 0sg1hhnifqxfc5n5f9ikbxyrjlg77hynbhsql0h4smqniw29dbwk
-- subdir:
-- cardano-prelude
-- cardano-prelude-test

-- source-repository-package
-- type: git
-- location: http://github.com/well-typed/canonical-json
-- tag: ddfe3593b80b5ceb88842bb7a6f2268df75d2c2f
-- --sha256: 02fzn1xskis1lc1pkz0j92v6ipd89ww0k2p3dvwpm3yap5dpnm7k

-- source-repository-package
-- type: git
-- location: https://github.com/input-output-hk/Win32-network
-- tag: 3825d3abf75f83f406c1f7161883c438dac7277d
-- --sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx

-- source-repository-package
-- type: git
-- location: https://github.com/input-output-hk/iohk-monitoring-framework
-- tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
-- --sha256: 0298dpl29gxzs9as9ha6y0w18hqwc00ipa3hzkxv7nlfrjjz8hmz
-- subdir:
-- iohk-monitoring
-- contra-tracer
-- tracer-transformers
5 changes: 2 additions & 3 deletions cardano-launcher/app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

module Main where

import Cardano.Prelude hiding (option)
import Cardano.Prelude
import qualified Prelude

-- Yes, we should use these seldomly but here it seems quite acceptable.
Expand All @@ -14,7 +14,6 @@ import Data.Text.Lazy.Builder (fromString, fromText)

import Distribution.System (OS (Windows), buildOS)
import System.Environment (setEnv)
import System.Exit (exitWith)
import System.IO.Silently (hSilence)
import System.Process (proc, waitForProcess, withCreateProcess)

Expand All @@ -23,7 +22,7 @@ import Formatting.Buildable (Buildable (..))

import Options.Applicative (Parser, ParserInfo, auto, execParser,
fullDesc, header, help, helper, info,
long, metavar, option, optional, progDesc)
long, metavar, option, progDesc)

import Cardano.BM.Setup (withTrace)
import qualified Cardano.BM.Trace as Trace
Expand Down
3 changes: 1 addition & 2 deletions cardano-launcher/app/Mocks/Daedalus.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
module Main where

import Cardano.Prelude
import System.Exit (exitWith)

seconds :: Int
seconds = 1000000
Expand All @@ -13,4 +12,4 @@ main = do
putTextLn $ "Starting Daedalus"
threadDelay $ 5 * seconds
putText $ "Exiting for update"
exitWith $ ExitFailure 20
exitWith $ ExitFailure 20
3 changes: 2 additions & 1 deletion cardano-launcher/src/Cardano/Shell/Application.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Control.Exception.Safe (throwM)
import GHC.IO.Handle.Lock (LockMode (..), hTryLock)

import System.Directory (doesFileExist)
import System.IO (writeFile)

--------------------------------------------------------------------------------
-- Types
Expand Down Expand Up @@ -63,7 +64,7 @@ checkIfApplicationIsRunning lockFilePath = do
when (not fileExist) $
writeFile lockFilePath ""

lockfileHandle <- openFile lockFilePath ReadMode
lockfileHandle <- openFile lockFilePath ReadWriteMode
isAlreadyRunning <- hTryLock lockfileHandle ExclusiveLock

-- We need to inform the user if the application version is already running.
Expand Down
1 change: 1 addition & 0 deletions cardano-launcher/src/Cardano/Shell/Environment.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Cardano.Shell.Template (substituteA)
import Data.Yaml (Value (..))
import Prelude (Show (..))
import System.Environment (lookupEnv)
import Data.Text.Lazy (toStrict)

-- | Substitute envrionment variable with value of its name.
--
Expand Down
2 changes: 1 addition & 1 deletion cardano-launcher/src/Cardano/Shell/Launcher.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module Cardano.Shell.Launcher
import Cardano.Prelude hiding (onException)

import Prelude (Show (..))
import Data.Aeson (FromJSON, ToJSON(toJSON), genericParseJSON, genericToJSON, defaultOptions)
import Data.Aeson (genericParseJSON, genericToJSON, defaultOptions)
import Data.Yaml as Y
import qualified System.Process as Process
import Turtle (system)
Expand Down
5 changes: 3 additions & 2 deletions cardano-launcher/src/Cardano/Shell/Update/Lib.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ import Prelude (String)
import System.Directory (doesFileExist, removeFile)
import System.Process (CreateProcess (..), StdStream (..), proc,
waitForProcess, withCreateProcess)
import System.IO (writeFile)

#ifdef mingw32_HOST_OS
import qualified Data.Text as T
import System.Environment (getExecutablePath)
import System.Environment (getExecutablePath, getArgs)
import System.Win32.Process (getCurrentProcessId)
#endif

Expand Down Expand Up @@ -240,7 +241,7 @@ writeWindowsUpdaterRunner runnerPath = do
launcherArgs <- getArgs

selfPid <- getCurrentProcessId
writeFile (toS runnerPath) $ T.unlines
writeFile (toS runnerPath) . T.unpack $ T.unlines
-- What info can this file supply if it fails?
-- How can you make this scream if it fails
-- Checksum of the updater exe?
Expand Down
1 change: 0 additions & 1 deletion cardano-launcher/test/EnvironmentSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module EnvironmentSpec
) where

import Cardano.Prelude
import Data.Char (isAlphaNum)
import qualified Data.HashMap.Strict as HM
import qualified Data.Vector as V
import qualified Data.Yaml as Y
Expand Down
4 changes: 1 addition & 3 deletions cardano-launcher/test/LauncherSMSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ module LauncherSMSpec

import Cardano.Prelude

import Data.TreeDiff (ToExpr (..))

import Test.Hspec (Spec, describe, it)

import Test.QuickCheck (Gen, Property, oneof, (===))
Expand Down Expand Up @@ -165,7 +163,7 @@ launcherSM = StateMachine
, shrinker = mShrinker
, semantics = mSemantics
, mock = mMock
, distribution = Nothing
, cleanup = const (pure ())
}
where
-- | Let's handle just Ping/Pong for now.
Expand Down
2 changes: 1 addition & 1 deletion cardano-launcher/test/TemplateSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ module TemplateSpec
) where

import Cardano.Prelude
import Data.Char (isAlphaNum)
import System.Environment (lookupEnv, setEnv, unsetEnv)
import System.IO.Error (userError)
import Test.Hspec (Spec)
import Test.Hspec.QuickCheck (modifyMaxSuccess, prop)
import Test.QuickCheck (Arbitrary (..), elements, listOf1, suchThat)
import Test.QuickCheck.Monadic (assert, monadicIO, run)
import Data.Text.Lazy (toStrict)

import Cardano.Shell.Template (substituteA)

Expand Down
4 changes: 1 addition & 3 deletions cardano-shell/test/NodeIPCSMSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ module NodeIPCSMSpec

import Cardano.Prelude

import Data.TreeDiff (ToExpr (..))

import Test.Hspec (Spec, describe, it)

import Test.QuickCheck (Gen, Property, arbitrary, generate, oneof,
Expand Down Expand Up @@ -188,7 +186,7 @@ nodeIPCSM serverHandles = StateMachine
, shrinker = mShrinker
, semantics = mSemantics
, mock = mMock
, distribution = Nothing
, cleanup = const (pure ())
}
where
-- | Let's handle just Ping/Pong for now.
Expand Down
31 changes: 0 additions & 31 deletions ci/check-hydra.sh

This file was deleted.

20 changes: 0 additions & 20 deletions ci/check-regenerate-nix.sh

This file was deleted.

Loading