diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-03 13:52:32 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-03 13:55:31 +0100 |
commit | 6cf7c6a6b0d06d88f2f27daae4febbbdc757841b (patch) | |
tree | dca8cffff0abc310cc7fa1f55e0218f66736c6a1 /src/libexpr/primops | |
parent | ee6ac38848277d80c62fa5c2734ada1b5edc8680 (diff) |
Remove git:// support in NIX_PATH
This didn't support specifying a revision/branch, and was restricted
to git:// URIs (since https:// or ssh:// would be ambiguous).
Diffstat (limited to 'src/libexpr/primops')
-rw-r--r-- | src/libexpr/primops/fetchgit.cc | 9 | ||||
-rw-r--r-- | src/libexpr/primops/fetchgit.hh | 24 |
2 files changed, 8 insertions, 25 deletions
diff --git a/src/libexpr/primops/fetchgit.cc b/src/libexpr/primops/fetchgit.cc index baa48f642..bca68ed72 100644 --- a/src/libexpr/primops/fetchgit.cc +++ b/src/libexpr/primops/fetchgit.cc @@ -1,4 +1,3 @@ -#include "fetchgit.hh" #include "primops.hh" #include "eval-inline.hh" #include "download.hh" @@ -15,6 +14,14 @@ using namespace std::string_literals; namespace nix { +struct GitInfo +{ + Path storePath; + std::string rev; + std::string shortRev; + uint64_t revCount = 0; +}; + GitInfo exportGit(ref<Store> store, const std::string & uri, std::experimental::optional<std::string> ref, const std::string & rev, const std::string & name) diff --git a/src/libexpr/primops/fetchgit.hh b/src/libexpr/primops/fetchgit.hh deleted file mode 100644 index 818ab7102..000000000 --- a/src/libexpr/primops/fetchgit.hh +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include <string> - -#include "util.hh" - -namespace nix { - -class Store; - -struct GitInfo -{ - Path storePath; - std::string rev; - std::string shortRev; - uint64_t revCount = 0; -}; - -GitInfo exportGit(ref<Store> store, const std::string & uri, - std::experimental::optional<std::string> ref = {}, - const std::string & rev = "", - const std::string & name = ""); - -} |