Fix build

edolstra · edolstra · commit 212e72c60913 · 2017-11-01T21:32:30.000+01:00
https://hydra.nixos.org/build/63172338
diff --git a/src/libexpr/common-eval-args.hh b/src/libexpr/common-eval-args.hh
@@ -6,7 +6,7 @@ namespace nix {
 
 class Store;
 class EvalState;
-struct Bindings;
+class Bindings;
 
 struct MixEvalArgs : virtual Args
 {
diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc
@@ -56,7 +56,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
         }
     }
 
-    if (!ref) ref = "master";
+    if (!ref) ref = "master"s;
 
     if (rev != "") {
         std::regex revRegex("^[0-9a-fA-F]{40}$");

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace nix {`
`6`	`6`
`7`	`7`	`class Store;`
`8`	`8`	`class EvalState;`
`9`		`-struct Bindings;`
	`9`	`+class Bindings;`
`10`	`10`
`11`	`11`	`struct MixEvalArgs : virtual Args`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (!ref) ref = "master";`
	`59`	`+ if (!ref) ref = "master"s;`
`60`	`60`
`61`	`61`	`if (rev != "") {`
`62`	`62`	`std::regex revRegex("^[0-9a-fA-F]{40}$");`