Merge remote-tracking branch 'upstream/master' into errors-phase-2

1 files changed, 32 insertions, 0 deletions

diff --git a/src/libstore/names.hh b/src/libstore/names.hh
new file mode 100644
index 000000000..00e14b8c7
--- /dev/null
+++ b/src/libstore/names.hh
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <memory>
+
+#include "types.hh"
+#include <regex>
+
+namespace nix {
+
+struct DrvName
+{
+    string fullName;
+    string name;
+    string version;
+    unsigned int hits;
+
+    DrvName();
+    DrvName(std::string_view s);
+    bool matches(DrvName & n);
+
+private:
+    std::unique_ptr<std::regex> regex;
+};
+
+typedef list<DrvName> DrvNames;
+
+string nextComponent(string::const_iterator & p,
+    const string::const_iterator end);
+int compareVersions(const string & v1, const string & v2);
+DrvNames drvNamesFromArgs(const Strings & opArgs);
+
+}