Skip to content

Commit 14f78d7

Browse files
committed
Merge branch 'rename-to-build-trace' into derivation-work
2 parents 017fea8 + 68c7e47 commit 14f78d7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

hnix-store-core/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
* `SingleDerivedPath` type with `parseSingleDerivedPath`, `singleDerivedPathToText`
1111

1212
* Changes:
13+
* `DerivationOutput` was renamed to `BuildTraceKey`.
14+
Firstly, this avoided a conflict of this type used by `Realisation` with the `DerivationOutput` used by `Derivation` --- the latter deserves the name more since it is for `Derivation`.
15+
Secondly, I (@Ericson2314) am also working upstream to rename "realisations" to "build trace entries", and the collection of them to a "build trace", and so this brings the naming in line with that.
1316
* `OutputName.unOutputName` now returns `StorePathName` instead of `Text`
1417
* `DerivedPath_Built` constructor now takes `SingleDerivedPath` instead of `StorePath`
1518

hnix-store-remote/src/System/Nix/Store/Remote/Serializer.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ import System.Nix.Hash qualified
159159
import System.Nix.JSON ()
160160
import System.Nix.OutputName (OutputName)
161161
import System.Nix.OutputName qualified
162-
import System.Nix.Realisation (BuildTraceKeyError, Realisation(..), RealisationWithId(..))
162+
import System.Nix.Realisation (BuildTraceKey, BuildTraceKeyError, Realisation(..), RealisationWithId(..))
163163
import System.Nix.Realisation qualified
164164
import System.Nix.Signature (Signature, NarSignature)
165165
import System.Nix.Signature qualified
@@ -1365,7 +1365,7 @@ noop ret = Serializer
13651365

13661366
-- *** Realisation
13671367

1368-
buildTraceKeyTyped :: NixSerializer ReplySError (System.Nix.Realisation.BuildTraceKey OutputName)
1368+
buildTraceKeyTyped :: NixSerializer ReplySError (BuildTraceKey OutputName)
13691369
buildTraceKeyTyped = mapErrorS ReplySError_BuildTraceKey $
13701370
mapPrismSerializer
13711371
AlmostPrism

0 commit comments

Comments
 (0)