M-Labs/it-infra
M-Labs/it-infra
8
0
Fork 6
Code Issues 11 Pull Requests 1 Releases Wiki Activity

update networked derivations nix patch #7

New Issue
Closed
opened 2020-09-14 15:44:56 +08:00 by sb10q · 1 comment
sb10q commented 2020-09-14 15:44:56 +08:00
Owner
Copy Link

no longer applies

patching file src/libstore/build.cc
Hunk #1 succeeded at 809 with fuzz 2.
Hunk #2 succeeded at 1186 with fuzz 1.
Hunk #3 succeeded at 1210 with fuzz 2 (offset 6 lines).
Hunk #4 FAILED at 1998.
Hunk #5 FAILED at 2164.
Hunk #6 FAILED at 2372.
Hunk #7 FAILED at 2584.
Hunk #8 FAILED at 3195.
5 out of 8 hunks FAILED -- saving rejects to file src/libstore/build.cc.rej
no longer applies ```text patching file src/libstore/build.cc Hunk #1 succeeded at 809 with fuzz 2. Hunk #2 succeeded at 1186 with fuzz 1. Hunk #3 succeeded at 1210 with fuzz 2 (offset 6 lines). Hunk #4 FAILED at 1998. Hunk #5 FAILED at 2164. Hunk #6 FAILED at 2372. Hunk #7 FAILED at 2584. Hunk #8 FAILED at 3195. 5 out of 8 hunks FAILED -- saving rejects to file src/libstore/build.cc.rej ```
sb10q closed this issue 2020-10-06 09:32:24 +08:00
sb10q commented 2020-10-31 17:12:22 +08:00
Author
Owner
Copy Link

Broke again on 20.09

applying patch /nix/store/ib7kg5j5gdhmavq6l5sar6pjz07r7rj6-nix-3-networked-derivations.patch
can't find file to patch at input line 14
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From d7fc00b5770a7d194c0ba9e70a4cdb2ece621d5b Mon Sep 17 00:00:00 2001
|From: Astro <astro@spaceboyz.net>
|Date: Mon, 5 Oct 2020 14:18:59 +0200
|Subject: [PATCH] networked derivations
|
|---
| src/libstore/build.cc | 19 ++++++++++++++-----
| 1 file changed, 14 insertions(+), 5 deletions(-)
|
|diff --git a/src/libstore/build.cc b/src/libstore/build.cc
|index 0499273a4..40fe4e859 100644
|--- a/src/libstore/build.cc
|+++ b/src/libstore/build.cc
--------------------------

build.cc has been split into several parts in src/libstore/build/

Broke again on 20.09 ```text applying patch /nix/store/ib7kg5j5gdhmavq6l5sar6pjz07r7rj6-nix-3-networked-derivations.patch can't find file to patch at input line 14 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From d7fc00b5770a7d194c0ba9e70a4cdb2ece621d5b Mon Sep 17 00:00:00 2001 |From: Astro <astro@spaceboyz.net> |Date: Mon, 5 Oct 2020 14:18:59 +0200 |Subject: [PATCH] networked derivations | |--- | src/libstore/build.cc | 19 ++++++++++++++----- | 1 file changed, 14 insertions(+), 5 deletions(-) | |diff --git a/src/libstore/build.cc b/src/libstore/build.cc |index 0499273a4..40fe4e859 100644 |--- a/src/libstore/build.cc |+++ b/src/libstore/build.cc -------------------------- ``` ``build.cc`` has been split into several parts in ``src/libstore/build/``
sb10q reopened this issue 2020-10-31 17:12:22 +08:00
sb10q closed this issue 2020-11-06 15:03:20 +08:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/it-infra#7
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?