Skip to content

Commit 6419877

Browse files
committed
Skip store dir in realisation test literal
It doesn't matter and isn't in the JSON anyways.
1 parent 8896f32 commit 6419877

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

hnix-store-json/hnix-store-json.cabal

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ library
4848
, constraints-extras
4949
, containers
5050
, crypton
51-
, data-default-class
5251
, dependent-sum
5352
, deriving-aeson >= 0.2
5453
, monoidal-containers
@@ -86,7 +85,6 @@ test-suite json
8685
, constraints-extras
8786
, containers
8887
, crypton
89-
, data-default-class
9088
, dependent-sum
9189
, hspec
9290
, some

hnix-store-json/tests/RealisationSpec.hs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module RealisationSpec where
44

55
import Data.Aeson (eitherDecode, encode)
66
import Data.ByteString.Lazy qualified as BSL
7-
import Data.Default.Class (Default(def))
87
import Data.List (isInfixOf)
98
import Data.Map qualified
109
import Data.Set qualified
@@ -35,8 +34,7 @@ sampleRealisation0 :: Realisation
3534
sampleRealisation0 = Realisation
3635
{ realisationOutPath =
3736
forceRight
38-
$ System.Nix.StorePath.parsePath
39-
def
37+
$ System.Nix.StorePath.parseBasePath
4038
"/nix/store/cdips4lakfk1qbf1x68fq18wnn3r5r14-builder.sh"
4139
, realisationSignatures = mempty
4240
, realisationDependencies = mempty
@@ -46,9 +44,8 @@ sampleRealisation1 :: Realisation
4644
sampleRealisation1 = Realisation
4745
{ realisationOutPath =
4846
forceRight
49-
$ System.Nix.StorePath.parsePath
50-
def
51-
"/nix/store/5rwxzi7pal3qhpsyfc16gzkh939q1np6-curl-7.82.0.drv"
47+
$ System.Nix.StorePath.parseBasePath
48+
"5rwxzi7pal3qhpsyfc16gzkh939q1np6-curl-7.82.0.drv"
5249
, realisationSignatures =
5350
Data.Set.fromList
5451
$ forceRight
@@ -60,9 +57,8 @@ sampleRealisation1 = Realisation
6057
Data.Map.fromList
6158
[ ( sampleDerivationOutput
6259
, forceRight
63-
$ System.Nix.StorePath.parsePathFromText
64-
def
65-
"/nix/store/9472ijanf79nlkb5n1yh57s7867p1930-testFixed"
60+
$ System.Nix.StorePath.parseBasePathFromText
61+
"9472ijanf79nlkb5n1yh57s7867p1930-testFixed"
6662
)
6763
]
6864
}

0 commit comments

Comments
 (0)