Merge remote-tracking branch 'upstream/master' into no-stringly-typed-derivation-output

1 files changed, 2 insertions, 10 deletions

diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 46de3960e..3b4eb7ec4 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -30,13 +30,6 @@ struct DerivationOutput
 {
     StorePath path;
     std::optional<FileSystemHash> hash; /* hash used for expected hash computation */
-    DerivationOutput(StorePath && path, std::optional<FileSystemHash> && hash)
-        : path(std::move(path))
-        , hash(std::move(hash))
-    { }
-    DerivationOutput(const DerivationOutput &) = default;
-    DerivationOutput(DerivationOutput &&) = default;
-    DerivationOutput & operator = (const DerivationOutput &) = default;
     void parseHashInfo(FileIngestionMethod & recursive, Hash & hash) const;
 };
 
@@ -58,7 +51,6 @@ struct BasicDerivation
     StringPairs env;
 
     BasicDerivation() { }
-    explicit BasicDerivation(const BasicDerivation & other);
     virtual ~BasicDerivation() { };
 
     /* Return the path corresponding to the output identifier `id' in
@@ -73,6 +65,8 @@ struct BasicDerivation
     /* Return the output paths of a derivation. */
     StorePathSet outputPaths() const;
 
+    /* Return the output names of a derivation. */
+    StringSet outputNames() const;
 };
 
 struct Derivation : BasicDerivation
@@ -84,8 +78,6 @@ struct Derivation : BasicDerivation
         std::map<std::string, StringSet> * actualInputs = nullptr) const;
 
     Derivation() { }
-    Derivation(Derivation && other) = default;
-    explicit Derivation(const Derivation & other);
 };