fix(lix): Drop fetchGit-locked patch as it is included upstream
Some checks failed
Build all the nodes / ap01 (pull_request) Successful in 1m2s
Build all the nodes / netcore01 (pull_request) Successful in 33s
Build all the nodes / netcore02 (pull_request) Successful in 43s
Build the shell / build-shell (pull_request) Successful in 40s
Build all the nodes / build01 (pull_request) Failing after 3m11s
Build all the nodes / bridge01 (pull_request) Successful in 4m59s
Build all the nodes / cof02 (pull_request) Successful in 4m57s
Build all the nodes / vault01 (pull_request) Successful in 4m5s
Build all the nodes / web02 (pull_request) Successful in 4m11s
Build all the nodes / hypervisor03 (pull_request) Successful in 4m52s
Build all the nodes / hypervisor01 (pull_request) Successful in 4m59s
Build all the nodes / rescue01 (pull_request) Successful in 4m29s
Build all the nodes / geo02 (pull_request) Successful in 5m1s
Build all the nodes / geo01 (pull_request) Successful in 5m8s
Build all the nodes / compute01 (pull_request) Successful in 5m11s
Build all the nodes / hypervisor02 (pull_request) Successful in 4m59s
Build all the nodes / web03 (pull_request) Successful in 4m10s
Check meta / check_dns (pull_request) Successful in 23s
Build all the nodes / web01 (pull_request) Successful in 4m17s
Check workflows / check_workflows (pull_request) Successful in 26s
Build all the nodes / tower01 (pull_request) Successful in 4m18s
Check meta / check_meta (pull_request) Successful in 28s
Build all the nodes / storage01 (pull_request) Successful in 4m22s
Build all the nodes / zulip01 (pull_request) Successful in 4m10s
Build all the nodes / iso (pull_request) Successful in 4m44s
Build all the nodes / Jaccess01 (pull_request) Successful in 35s
Build all the nodes / lab-router01 (pull_request) Successful in 4m41s
Run pre-commit on all files / pre-commit (push) Successful in 40s
Build all the nodes / Jaccess04 (pull_request) Successful in 32s
Build all the nodes / krz01 (pull_request) Successful in 4m45s
Run pre-commit on all files / pre-commit (pull_request) Successful in 44s
Some checks failed
Build all the nodes / ap01 (pull_request) Successful in 1m2s
Build all the nodes / netcore01 (pull_request) Successful in 33s
Build all the nodes / netcore02 (pull_request) Successful in 43s
Build the shell / build-shell (pull_request) Successful in 40s
Build all the nodes / build01 (pull_request) Failing after 3m11s
Build all the nodes / bridge01 (pull_request) Successful in 4m59s
Build all the nodes / cof02 (pull_request) Successful in 4m57s
Build all the nodes / vault01 (pull_request) Successful in 4m5s
Build all the nodes / web02 (pull_request) Successful in 4m11s
Build all the nodes / hypervisor03 (pull_request) Successful in 4m52s
Build all the nodes / hypervisor01 (pull_request) Successful in 4m59s
Build all the nodes / rescue01 (pull_request) Successful in 4m29s
Build all the nodes / geo02 (pull_request) Successful in 5m1s
Build all the nodes / geo01 (pull_request) Successful in 5m8s
Build all the nodes / compute01 (pull_request) Successful in 5m11s
Build all the nodes / hypervisor02 (pull_request) Successful in 4m59s
Build all the nodes / web03 (pull_request) Successful in 4m10s
Check meta / check_dns (pull_request) Successful in 23s
Build all the nodes / web01 (pull_request) Successful in 4m17s
Check workflows / check_workflows (pull_request) Successful in 26s
Build all the nodes / tower01 (pull_request) Successful in 4m18s
Check meta / check_meta (pull_request) Successful in 28s
Build all the nodes / storage01 (pull_request) Successful in 4m22s
Build all the nodes / zulip01 (pull_request) Successful in 4m10s
Build all the nodes / iso (pull_request) Successful in 4m44s
Build all the nodes / Jaccess01 (pull_request) Successful in 35s
Build all the nodes / lab-router01 (pull_request) Successful in 4m41s
Run pre-commit on all files / pre-commit (push) Successful in 40s
Build all the nodes / Jaccess04 (pull_request) Successful in 32s
Build all the nodes / krz01 (pull_request) Successful in 4m45s
Run pre-commit on all files / pre-commit (pull_request) Successful in 44s
This commit is contained in:
parent
07a3435f90
commit
05a7477a8e
2 changed files with 0 additions and 87 deletions
|
@ -18,7 +18,6 @@ with {
|
|||
|
||||
lix = [
|
||||
(local ./lix/01-disable-installChecks.patch)
|
||||
(local ./lix/02-fetchGit-locked.patch)
|
||||
];
|
||||
|
||||
lon = [
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
diff --git i/lix/libexpr/primops/fetchTree.cc w/lix/libexpr/primops/fetchTree.cc
|
||||
index 93b08ecc9..6d04ce24b 100644
|
||||
--- i/lix/libexpr/primops/fetchTree.cc
|
||||
+++ w/lix/libexpr/primops/fetchTree.cc
|
||||
@@ -168,6 +168,11 @@ static void fetchTree(
|
||||
"attribute 'name' isn’t supported in call to 'fetchTree'"
|
||||
).atPos(pos).debugThrow();
|
||||
|
||||
+ // HACK: When using `fetchGit`, locking with only the hash should happen
|
||||
+ // as we don't care about flake hallucinations about `lastModified`
|
||||
+ if (type == "git" && attrs.contains("narHash"))
|
||||
+ attrs["type"] = "git-locked";
|
||||
+
|
||||
input = fetchers::Input::fromAttrs(std::move(attrs));
|
||||
} else {
|
||||
auto url = state.coerceToString(pos, *args[0], context,
|
||||
diff --git i/lix/libfetchers/builtin-fetchers.hh w/lix/libfetchers/builtin-fetchers.hh
|
||||
index d3be7f7f2..d1389b8ba 100644
|
||||
--- i/lix/libfetchers/builtin-fetchers.hh
|
||||
+++ w/lix/libfetchers/builtin-fetchers.hh
|
||||
@@ -10,6 +10,7 @@ std::unique_ptr<InputScheme> makePathInputScheme();
|
||||
std::unique_ptr<InputScheme> makeFileInputScheme();
|
||||
std::unique_ptr<InputScheme> makeTarballInputScheme();
|
||||
std::unique_ptr<InputScheme> makeGitInputScheme();
|
||||
+std::unique_ptr<InputScheme> makeGitLockedInputScheme();
|
||||
std::unique_ptr<InputScheme> makeMercurialInputScheme();
|
||||
std::unique_ptr<InputScheme> makeGitHubInputScheme();
|
||||
std::unique_ptr<InputScheme> makeGitLabInputScheme();
|
||||
diff --git i/lix/libfetchers/fetchers.cc w/lix/libfetchers/fetchers.cc
|
||||
index 0dc9f5e0c..91cd9332d 100644
|
||||
--- i/lix/libfetchers/fetchers.cc
|
||||
+++ w/lix/libfetchers/fetchers.cc
|
||||
@@ -22,6 +22,7 @@ void initLibFetchers()
|
||||
registerInputScheme(makeTarballInputScheme());
|
||||
registerInputScheme(makeFileInputScheme());
|
||||
registerInputScheme(makeGitInputScheme());
|
||||
+ registerInputScheme(makeGitLockedInputScheme());
|
||||
registerInputScheme(makeMercurialInputScheme());
|
||||
registerInputScheme(makeGitHubInputScheme());
|
||||
registerInputScheme(makeGitLabInputScheme());
|
||||
diff --git i/lix/libfetchers/git.cc w/lix/libfetchers/git.cc
|
||||
index 21fa1904d..f9573eacd 100644
|
||||
--- i/lix/libfetchers/git.cc
|
||||
+++ w/lix/libfetchers/git.cc
|
||||
@@ -812,4 +812,40 @@ std::unique_ptr<InputScheme> makeGitInputScheme()
|
||||
return std::make_unique<GitInputScheme>();
|
||||
}
|
||||
|
||||
+struct GitLockedInputScheme : GitInputScheme {
|
||||
+
|
||||
+ std::optional<Input> inputFromAttrs(const Attrs & attrs) const override
|
||||
+ {
|
||||
+ if (maybeGetStrAttr(attrs, "type") != "git-locked") return {};
|
||||
+
|
||||
+ for (auto & [name, value] : attrs)
|
||||
+ if (name != "type" && name != "url" && name != "ref" && name != "rev" && name != "shallow" && name != "submodules" && name != "lastModified" && name != "revCount" && name != "narHash" && name != "allRefs" && name != "name" && name != "dirtyRev" && name != "dirtyShortRev")
|
||||
+ throw Error("unsupported Git input attribute '%s'", name);
|
||||
+
|
||||
+ parseURL(getStrAttr(attrs, "url"));
|
||||
+ maybeGetBoolAttr(attrs, "shallow");
|
||||
+ maybeGetBoolAttr(attrs, "submodules");
|
||||
+ maybeGetBoolAttr(attrs, "allRefs");
|
||||
+
|
||||
+ if (auto ref = maybeGetStrAttr(attrs, "ref")) {
|
||||
+ if (std::regex_search(*ref, badGitRefRegex))
|
||||
+ throw BadURL("invalid Git branch/tag name '%s'", *ref);
|
||||
+ }
|
||||
+
|
||||
+ Input input;
|
||||
+ input.attrs = attrs;
|
||||
+ return input;
|
||||
+ }
|
||||
+
|
||||
+ bool hasAllInfo(const Input & input) const override {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+};
|
||||
+
|
||||
+std::unique_ptr<InputScheme> makeGitLockedInputScheme()
|
||||
+{
|
||||
+ return std::make_unique<GitLockedInputScheme>();
|
||||
+}
|
||||
+
|
||||
}
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue