about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-11-01T20·32+0100
committerEelco Dolstra <edolstra@gmail.com>2017-11-01T20·32+0100
commit212e72c60913c78eb88e347660144b441ea9f72b (patch)
tree537f05c56a8eca8dc9abbe76ea52061f0ce5f00f
parente026bc3b05ca45c2d855d0a38820034ab4ef3c4c (diff)
Fix build
https://hydra.nixos.org/build/63172338
-rw-r--r--src/libexpr/common-eval-args.hh2
-rw-r--r--src/libexpr/primops/fetchgit.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/common-eval-args.hh b/src/libexpr/common-eval-args.hh
index 09fa406b2cdc..be7fda783783 100644
--- 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
index 879e3656a25a..4b5ead320c81 100644
--- 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}$");