From 6cf7c6a6b0d06d88f2f27daae4febbbdc757841b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Nov 2017 13:52:32 +0100 Subject: 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). --- src/libexpr/primops/fetchgit.cc | 9 ++++++++- src/libexpr/primops/fetchgit.hh | 24 ------------------------ 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 src/libexpr/primops/fetchgit.hh (limited to 'src/libexpr/primops') 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, const std::string & uri, std::experimental::optional 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 - -#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, const std::string & uri, - std::experimental::optional ref = {}, - const std::string & rev = "", - const std::string & name = ""); - -} -- cgit v1.2.3