From 136f1553e5d9066993daa583948fa0b19d337486 Mon Sep 17 00:00:00 2001 From: Borodin Gregory Date: Mon, 7 Oct 2024 00:08:19 +0200 Subject: [PATCH 1/4] Fix patch path --- common/lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib.nix b/common/lib.nix index c9a62bd..518081f 100644 --- a/common/lib.nix +++ b/common/lib.nix @@ -150,7 +150,7 @@ let prePatch = lib.strings.concatMapStrings - (patch_path: "patch -p1 --batch -u -i ${./patch-process-manager.txt}") + (patch_path: "patch -p1 --batch -u -i ${patch_path}") patches; preBuild = '' From 85b4668202d9bf213227ddb142f4c889af4ec4eb Mon Sep 17 00:00:00 2001 From: Borodin Gregory Date: Mon, 7 Oct 2024 00:13:33 +0200 Subject: [PATCH 2/4] Fix all tags --- gen/lib.py | 25 ++++++++++++------------- tags/release_2.19.0/default.nix | 10 +++++----- tags/release_2.19.1/default.nix | 10 +++++----- tags/release_2.19.1rc0/default.nix | 10 +++++----- tags/release_2.19.1rc1/default.nix | 10 +++++----- tags/release_2.19.2/default.nix | 10 +++++----- tags/release_2.19.2rc0/default.nix | 10 +++++----- tags/release_2.19.3/default.nix | 10 +++++----- tags/release_2.19.3rc0/default.nix | 10 +++++----- tags/release_2.19.3rc1/default.nix | 10 +++++----- tags/release_2.20.0.dev0/default.nix | 10 +++++----- tags/release_2.20.0.dev1/default.nix | 10 +++++----- tags/release_2.20.0.dev2/default.nix | 10 +++++----- tags/release_2.20.0.dev3/default.nix | 10 +++++----- tags/release_2.20.0.dev4/default.nix | 10 +++++----- tags/release_2.20.0.dev5/default.nix | 10 +++++----- tags/release_2.20.0.dev6/default.nix | 10 +++++----- tags/release_2.20.0.dev7/default.nix | 10 +++++----- tags/release_2.20.0/default.nix | 10 +++++----- tags/release_2.20.0a0/default.nix | 10 +++++----- tags/release_2.20.0rc0/default.nix | 10 +++++----- tags/release_2.20.0rc1/default.nix | 10 +++++----- tags/release_2.20.0rc2/default.nix | 10 +++++----- tags/release_2.20.0rc3/default.nix | 10 +++++----- tags/release_2.20.0rc4/default.nix | 10 +++++----- tags/release_2.20.1/default.nix | 10 +++++----- tags/release_2.20.1rc0/default.nix | 10 +++++----- tags/release_2.20.2/default.nix | 10 +++++----- tags/release_2.20.2rc0/default.nix | 10 +++++----- tags/release_2.20.3/default.nix | 10 +++++----- tags/release_2.20.3rc1/default.nix | 10 +++++----- tags/release_2.20.4/default.nix | 10 +++++----- tags/release_2.20.4rc0/default.nix | 10 +++++----- tags/release_2.21.0.dev0/default.nix | 10 +++++----- tags/release_2.21.0.dev1/default.nix | 10 +++++----- tags/release_2.21.0.dev2/default.nix | 10 +++++----- tags/release_2.21.0.dev3/default.nix | 10 +++++----- tags/release_2.21.0.dev4/default.nix | 10 +++++----- tags/release_2.21.0.dev5/default.nix | 10 +++++----- tags/release_2.21.0.dev6/default.nix | 10 +++++----- tags/release_2.21.0/default.nix | 10 +++++----- tags/release_2.21.0a0/default.nix | 10 +++++----- tags/release_2.21.0a1/default.nix | 10 +++++----- tags/release_2.21.0rc0/default.nix | 10 +++++----- tags/release_2.21.1/default.nix | 10 +++++----- tags/release_2.21.1rc1/default.nix | 10 +++++----- tags/release_2.21.2rc0/default.nix | 10 +++++----- tags/release_2.21.2rc1/default.nix | 10 +++++----- tags/release_2.22.0.dev0/default.nix | 10 +++++----- tags/release_2.22.0.dev1/default.nix | 10 +++++----- tags/release_2.22.0.dev2/default.nix | 10 +++++----- tags/release_2.22.0.dev3/default.nix | 10 +++++----- tags/release_2.22.0/default.nix | 12 ++++++------ tags/release_2.22.0a0/default.nix | 10 +++++----- tags/release_2.22.0rc0/default.nix | 10 +++++----- tags/release_2.22.0rc2/default.nix | 10 +++++----- tags/release_2.22.0rc3/default.nix | 10 +++++----- tags/release_2.22.1rc0/default.nix | 12 ++++++------ tags/release_2.23.0.dev0/default.nix | 12 ++++++------ tags/release_2.23.0.dev1/default.nix | 12 ++++++------ tags/release_2.23.0.dev2/default.nix | 12 ++++++------ tags/release_2.23.0.dev3/default.nix | 12 ++++++------ tags/release_2.23.0.dev4/default.nix | 12 ++++++------ tags/release_2.23.0.dev5/default.nix | 12 ++++++------ tags/release_2.23.0.dev6/default.nix | 12 ++++++------ tags/release_2.23.0a0/default.nix | 12 ++++++------ tags/release_2.23.0a1/default.nix | 12 ++++++------ tags/release_2.24.0.dev0/default.nix | 12 ++++++------ 68 files changed, 359 insertions(+), 360 deletions(-) diff --git a/gen/lib.py b/gen/lib.py index c14818b..d8392ac 100644 --- a/gen/lib.py +++ b/gen/lib.py @@ -148,6 +148,17 @@ async def _generate_tag(repo: Repo, version: str, force: bool = False) -> None: template_string = Path("template.nix").read_text("utf-8") output_hashes = await _prefetch_output_hashes(cargo_lock) output_hashes.sort(key=operator.itemgetter(0)) + patches_filenames = [ + *[ + "patch-process-manager.txt", + "patch-jar-tool.txt", + "patch-coursier-fetch.txt", + "patch-process.txt", + "patch-jdk-sh.txt", + ], + *(["patch-process-extra-env-2.22.txt"] if Version(2, 22, 0) <= version_ < Version(2, 23, 0) else []), + *(["patch-process-extra-env.txt"] if Version(2, 23, 0) <= version_ else []), + ] result = string.Template(template_string).safe_substitute( version=version, args=f"python -m gen tag {version}", @@ -156,19 +167,7 @@ async def _generate_tag(repo: Repo, version: str, force: bool = False) -> None: cargo_lock_url=f"https://raw.githubusercontent.com/pantsbuild/pants/{tag}/src/rust/engine/Cargo.lock", rust_toolchain_url=f"https://raw.githubusercontent.com/pantsbuild/pants/{tag}/src/rust/engine/rust-toolchain", output_hashes="\n ".join(f'"{pname}" = "{hash_}";' for pname, hash_ in output_hashes), - patches="\n ".join( - [ - *[ - "./patch-process-manager.txt", - "./patch-jar-tool.txt", - "./patch-coursier-fetch.txt", - "./patch-process.txt", - "./patch-jdk-sh.txt", - ], - *(["./patch-process-extra-env-2.22.txt"] if Version(2, 22, 0) <= version_ < Version(2, 23, 0) else []), - *(["./patch-process-extra-env.txt"] if Version(2, 23, 0) <= version_ else []), - ] - ), + patches="\n ".join(f"../../common/{filename}" for filename in patches_filenames), ) (tag_dir / "default.nix").write_text(result) diff --git a/tags/release_2.19.0/default.nix b/tags/release_2.19.0/default.nix index f034cb4..89f3814 100644 --- a/tags/release_2.19.0/default.nix +++ b/tags/release_2.19.0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.1/default.nix b/tags/release_2.19.1/default.nix index eba184c..94e2004 100644 --- a/tags/release_2.19.1/default.nix +++ b/tags/release_2.19.1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.1rc0/default.nix b/tags/release_2.19.1rc0/default.nix index 32a4700..133d63f 100644 --- a/tags/release_2.19.1rc0/default.nix +++ b/tags/release_2.19.1rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.1rc1/default.nix b/tags/release_2.19.1rc1/default.nix index 226c181..ca154b0 100644 --- a/tags/release_2.19.1rc1/default.nix +++ b/tags/release_2.19.1rc1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.2/default.nix b/tags/release_2.19.2/default.nix index 7d04903..b4757e8 100644 --- a/tags/release_2.19.2/default.nix +++ b/tags/release_2.19.2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.2rc0/default.nix b/tags/release_2.19.2rc0/default.nix index 50a40f0..59b4471 100644 --- a/tags/release_2.19.2rc0/default.nix +++ b/tags/release_2.19.2rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.3/default.nix b/tags/release_2.19.3/default.nix index 64cd5c7..fc102a5 100644 --- a/tags/release_2.19.3/default.nix +++ b/tags/release_2.19.3/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.3rc0/default.nix b/tags/release_2.19.3rc0/default.nix index 3e0c46a..6089e99 100644 --- a/tags/release_2.19.3rc0/default.nix +++ b/tags/release_2.19.3rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.19.3rc1/default.nix b/tags/release_2.19.3rc1/default.nix index 563b956..13f5327 100644 --- a/tags/release_2.19.3rc1/default.nix +++ b/tags/release_2.19.3rc1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev0/default.nix b/tags/release_2.20.0.dev0/default.nix index e9d782f..fc4ba00 100644 --- a/tags/release_2.20.0.dev0/default.nix +++ b/tags/release_2.20.0.dev0/default.nix @@ -24,11 +24,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev1/default.nix b/tags/release_2.20.0.dev1/default.nix index 390d9a0..3e58591 100644 --- a/tags/release_2.20.0.dev1/default.nix +++ b/tags/release_2.20.0.dev1/default.nix @@ -24,11 +24,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev2/default.nix b/tags/release_2.20.0.dev2/default.nix index 7047071..62658a0 100644 --- a/tags/release_2.20.0.dev2/default.nix +++ b/tags/release_2.20.0.dev2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev3/default.nix b/tags/release_2.20.0.dev3/default.nix index c042c27..54537a1 100644 --- a/tags/release_2.20.0.dev3/default.nix +++ b/tags/release_2.20.0.dev3/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev4/default.nix b/tags/release_2.20.0.dev4/default.nix index ee04e44..ce58972 100644 --- a/tags/release_2.20.0.dev4/default.nix +++ b/tags/release_2.20.0.dev4/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev5/default.nix b/tags/release_2.20.0.dev5/default.nix index 67ebe86..df6cd53 100644 --- a/tags/release_2.20.0.dev5/default.nix +++ b/tags/release_2.20.0.dev5/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev6/default.nix b/tags/release_2.20.0.dev6/default.nix index 98ad717..40c894e 100644 --- a/tags/release_2.20.0.dev6/default.nix +++ b/tags/release_2.20.0.dev6/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0.dev7/default.nix b/tags/release_2.20.0.dev7/default.nix index 125f3c2..afacc6e 100644 --- a/tags/release_2.20.0.dev7/default.nix +++ b/tags/release_2.20.0.dev7/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0/default.nix b/tags/release_2.20.0/default.nix index f1fac4b..c73b10e 100644 --- a/tags/release_2.20.0/default.nix +++ b/tags/release_2.20.0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0a0/default.nix b/tags/release_2.20.0a0/default.nix index daee328..af4d6d4 100644 --- a/tags/release_2.20.0a0/default.nix +++ b/tags/release_2.20.0a0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0rc0/default.nix b/tags/release_2.20.0rc0/default.nix index 68fd086..45d7beb 100644 --- a/tags/release_2.20.0rc0/default.nix +++ b/tags/release_2.20.0rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0rc1/default.nix b/tags/release_2.20.0rc1/default.nix index 7c805d4..3e7a846 100644 --- a/tags/release_2.20.0rc1/default.nix +++ b/tags/release_2.20.0rc1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0rc2/default.nix b/tags/release_2.20.0rc2/default.nix index 82482e5..c677bb0 100644 --- a/tags/release_2.20.0rc2/default.nix +++ b/tags/release_2.20.0rc2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0rc3/default.nix b/tags/release_2.20.0rc3/default.nix index b61b5f6..3d8c01c 100644 --- a/tags/release_2.20.0rc3/default.nix +++ b/tags/release_2.20.0rc3/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.0rc4/default.nix b/tags/release_2.20.0rc4/default.nix index e2778fc..f99b87d 100644 --- a/tags/release_2.20.0rc4/default.nix +++ b/tags/release_2.20.0rc4/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.1/default.nix b/tags/release_2.20.1/default.nix index 02cd020..2e3e5b3 100644 --- a/tags/release_2.20.1/default.nix +++ b/tags/release_2.20.1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.1rc0/default.nix b/tags/release_2.20.1rc0/default.nix index 10a92ba..d9baf82 100644 --- a/tags/release_2.20.1rc0/default.nix +++ b/tags/release_2.20.1rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.2/default.nix b/tags/release_2.20.2/default.nix index 2496046..24d6f1f 100644 --- a/tags/release_2.20.2/default.nix +++ b/tags/release_2.20.2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.2rc0/default.nix b/tags/release_2.20.2rc0/default.nix index 654f94e..11f1b0c 100644 --- a/tags/release_2.20.2rc0/default.nix +++ b/tags/release_2.20.2rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.3/default.nix b/tags/release_2.20.3/default.nix index cb13378..78f895b 100644 --- a/tags/release_2.20.3/default.nix +++ b/tags/release_2.20.3/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.3rc1/default.nix b/tags/release_2.20.3rc1/default.nix index 3cac677..d2c618a 100644 --- a/tags/release_2.20.3rc1/default.nix +++ b/tags/release_2.20.3rc1/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.4/default.nix b/tags/release_2.20.4/default.nix index ba19884..7f69688 100644 --- a/tags/release_2.20.4/default.nix +++ b/tags/release_2.20.4/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.20.4rc0/default.nix b/tags/release_2.20.4rc0/default.nix index 10e3153..f13b67e 100644 --- a/tags/release_2.20.4rc0/default.nix +++ b/tags/release_2.20.4rc0/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev0/default.nix b/tags/release_2.21.0.dev0/default.nix index 711e49a..e1694fd 100644 --- a/tags/release_2.21.0.dev0/default.nix +++ b/tags/release_2.21.0.dev0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev1/default.nix b/tags/release_2.21.0.dev1/default.nix index 5c169d7..7f76bf3 100644 --- a/tags/release_2.21.0.dev1/default.nix +++ b/tags/release_2.21.0.dev1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev2/default.nix b/tags/release_2.21.0.dev2/default.nix index 14808f7..c58f14b 100644 --- a/tags/release_2.21.0.dev2/default.nix +++ b/tags/release_2.21.0.dev2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev3/default.nix b/tags/release_2.21.0.dev3/default.nix index e3a0e0a..cb5084c 100644 --- a/tags/release_2.21.0.dev3/default.nix +++ b/tags/release_2.21.0.dev3/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev4/default.nix b/tags/release_2.21.0.dev4/default.nix index db3fb5d..b3fdcc6 100644 --- a/tags/release_2.21.0.dev4/default.nix +++ b/tags/release_2.21.0.dev4/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev5/default.nix b/tags/release_2.21.0.dev5/default.nix index 2515202..2cfb814 100644 --- a/tags/release_2.21.0.dev5/default.nix +++ b/tags/release_2.21.0.dev5/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0.dev6/default.nix b/tags/release_2.21.0.dev6/default.nix index a8a24e2..b99c0a8 100644 --- a/tags/release_2.21.0.dev6/default.nix +++ b/tags/release_2.21.0.dev6/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0/default.nix b/tags/release_2.21.0/default.nix index 18f8f17..924cc7e 100644 --- a/tags/release_2.21.0/default.nix +++ b/tags/release_2.21.0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0a0/default.nix b/tags/release_2.21.0a0/default.nix index 02cd924..35f8fc2 100644 --- a/tags/release_2.21.0a0/default.nix +++ b/tags/release_2.21.0a0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0a1/default.nix b/tags/release_2.21.0a1/default.nix index 973c220..e13394f 100644 --- a/tags/release_2.21.0a1/default.nix +++ b/tags/release_2.21.0a1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.0rc0/default.nix b/tags/release_2.21.0rc0/default.nix index 8bf1aee..c21362b 100644 --- a/tags/release_2.21.0rc0/default.nix +++ b/tags/release_2.21.0rc0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.1/default.nix b/tags/release_2.21.1/default.nix index 2780210..520fcee 100644 --- a/tags/release_2.21.1/default.nix +++ b/tags/release_2.21.1/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.1rc1/default.nix b/tags/release_2.21.1rc1/default.nix index 219e01c..3fbb41f 100644 --- a/tags/release_2.21.1rc1/default.nix +++ b/tags/release_2.21.1rc1/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.2rc0/default.nix b/tags/release_2.21.2rc0/default.nix index 43ea3a2..5a34542 100644 --- a/tags/release_2.21.2rc0/default.nix +++ b/tags/release_2.21.2rc0/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.21.2rc1/default.nix b/tags/release_2.21.2rc1/default.nix index 068594c..cda4b1f 100644 --- a/tags/release_2.21.2rc1/default.nix +++ b/tags/release_2.21.2rc1/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0.dev0/default.nix b/tags/release_2.22.0.dev0/default.nix index 61e2cc4..04ba434 100644 --- a/tags/release_2.22.0.dev0/default.nix +++ b/tags/release_2.22.0.dev0/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0.dev1/default.nix b/tags/release_2.22.0.dev1/default.nix index b323e37..85e87e1 100644 --- a/tags/release_2.22.0.dev1/default.nix +++ b/tags/release_2.22.0.dev1/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0.dev2/default.nix b/tags/release_2.22.0.dev2/default.nix index 9dfa705..95a5af7 100644 --- a/tags/release_2.22.0.dev2/default.nix +++ b/tags/release_2.22.0.dev2/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0.dev3/default.nix b/tags/release_2.22.0.dev3/default.nix index 0f2a920..cfddfe6 100644 --- a/tags/release_2.22.0.dev3/default.nix +++ b/tags/release_2.22.0.dev3/default.nix @@ -25,11 +25,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0/default.nix b/tags/release_2.22.0/default.nix index 21c7090..3a8664f 100644 --- a/tags/release_2.22.0/default.nix +++ b/tags/release_2.22.0/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0a0/default.nix b/tags/release_2.22.0a0/default.nix index d7a7fdc..16beebe 100644 --- a/tags/release_2.22.0a0/default.nix +++ b/tags/release_2.22.0a0/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0rc0/default.nix b/tags/release_2.22.0rc0/default.nix index 1c2e20d..6b5b7e0 100644 --- a/tags/release_2.22.0rc0/default.nix +++ b/tags/release_2.22.0rc0/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0rc2/default.nix b/tags/release_2.22.0rc2/default.nix index 3b6b064..77f03cc 100644 --- a/tags/release_2.22.0rc2/default.nix +++ b/tags/release_2.22.0rc2/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.0rc3/default.nix b/tags/release_2.22.0rc3/default.nix index 4add700..f1bbae7 100644 --- a/tags/release_2.22.0rc3/default.nix +++ b/tags/release_2.22.0rc3/default.nix @@ -23,11 +23,11 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt ]; in lib.makePants { diff --git a/tags/release_2.22.1rc0/default.nix b/tags/release_2.22.1rc0/default.nix index a9738c8..d8e661f 100644 --- a/tags/release_2.22.1rc0/default.nix +++ b/tags/release_2.22.1rc0/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev0/default.nix b/tags/release_2.23.0.dev0/default.nix index ddaef89..30a0e72 100644 --- a/tags/release_2.23.0.dev0/default.nix +++ b/tags/release_2.23.0.dev0/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev1/default.nix b/tags/release_2.23.0.dev1/default.nix index fbdcdc9..0223459 100644 --- a/tags/release_2.23.0.dev1/default.nix +++ b/tags/release_2.23.0.dev1/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev2/default.nix b/tags/release_2.23.0.dev2/default.nix index afe02b2..834fab0 100644 --- a/tags/release_2.23.0.dev2/default.nix +++ b/tags/release_2.23.0.dev2/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev3/default.nix b/tags/release_2.23.0.dev3/default.nix index 9694f84..f4efbe4 100644 --- a/tags/release_2.23.0.dev3/default.nix +++ b/tags/release_2.23.0.dev3/default.nix @@ -23,12 +23,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev4/default.nix b/tags/release_2.23.0.dev4/default.nix index 86d94dc..c068b48 100644 --- a/tags/release_2.23.0.dev4/default.nix +++ b/tags/release_2.23.0.dev4/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev5/default.nix b/tags/release_2.23.0.dev5/default.nix index 2b143e9..9816698 100644 --- a/tags/release_2.23.0.dev5/default.nix +++ b/tags/release_2.23.0.dev5/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0.dev6/default.nix b/tags/release_2.23.0.dev6/default.nix index 75a8b76..251780d 100644 --- a/tags/release_2.23.0.dev6/default.nix +++ b/tags/release_2.23.0.dev6/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0a0/default.nix b/tags/release_2.23.0a0/default.nix index 46fbe5d..691b84a 100644 --- a/tags/release_2.23.0a0/default.nix +++ b/tags/release_2.23.0a0/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.23.0a1/default.nix b/tags/release_2.23.0a1/default.nix index 927c801..a2fe19f 100644 --- a/tags/release_2.23.0a1/default.nix +++ b/tags/release_2.23.0a1/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env-2.22.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env-2.22.txt ]; in lib.makePants { diff --git a/tags/release_2.24.0.dev0/default.nix b/tags/release_2.24.0.dev0/default.nix index f9481a3..aede840 100644 --- a/tags/release_2.24.0.dev0/default.nix +++ b/tags/release_2.24.0.dev0/default.nix @@ -24,12 +24,12 @@ let }; }; patches = [ - ./patch-process-manager.txt - ./patch-jar-tool.txt - ./patch-coursier-fetch.txt - ./patch-process.txt - ./patch-jdk-sh.txt - ./patch-process-extra-env.txt + ../../common/patch-process-manager.txt + ../../common/patch-jar-tool.txt + ../../common/patch-coursier-fetch.txt + ../../common/patch-process.txt + ../../common/patch-jdk-sh.txt + ../../common/patch-process-extra-env.txt ]; in lib.makePants { From 13eba0af10d3996c96ab4eb8404d23e56a605c67 Mon Sep 17 00:00:00 2001 From: Borodin Gregory Date: Mon, 7 Oct 2024 00:16:36 +0200 Subject: [PATCH 3/4] --no-pantsd --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0dbb1c..ec80164 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: name: pants-nix authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: nix build '.#"release_2.21.0"' - - run: touch pants.toml && nix shell '.#"release_2.21.0"' --command pants --version + - run: touch pants.toml && nix shell '.#"release_2.21.0"' --command pants --no-pantsd --version build-2-22: runs-on: ubuntu-latest steps: @@ -26,4 +26,4 @@ jobs: name: pants-nix authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - run: nix build '.#"release_2.22.0"' - - run: touch pants.toml && nix shell '.#"release_2.22.0"' --command pants --version + - run: touch pants.toml && nix shell '.#"release_2.22.0"' --command pants --no-pantsd --version From ad29598f1c28a8b72a73af81670b92bde6a4075c Mon Sep 17 00:00:00 2001 From: Borodin Gregory Date: Mon, 7 Oct 2024 00:34:55 +0200 Subject: [PATCH 4/4] Add flake cache --- flake.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/flake.nix b/flake.nix index 5f3c959..52daa62 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,12 @@ { + nixConfig = { + extra-substituters = [ + "https://pants-nix.cachix.org" + ]; + extra-trusted-public-keys = [ + "pants-nix.cachix.org-1:qbtCBNLKjk4XIuZPquG8oQuEILiIFsd/pI9nkJ4W2OQ=" + ]; + }; description = "A very basic flake"; inputs = {