From 4004d124837d10ce96a0bc33f1eb56bfa98eddcd Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sat, 15 Jun 2024 22:31:23 -0700 Subject: [PATCH 1/2] Change the sqlite missing valid path message to say it's the db I meant to edit https://gerrit.lix.systems/c/lix/+/1161 but apparently clicked the wrong button somehow. Oops. Change-Id: I9b9ba058ec9206d3c8abe125d91dc554cced52fe --- src/libstore/local-store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 5bdf0362d..5e79630c6 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -958,7 +958,7 @@ uint64_t LocalStore::queryValidPathId(State & state, const StorePath & path) { auto use(state.stmts->QueryPathInfo.use()(printStorePath(path))); if (!use.next()) // TODO: I guess if SQLITE got corrupted..? - throw InvalidPath("path '%s' does not exist", printStorePath(path)); + throw InvalidPath("path '%s' does not exist in the Lix database", printStorePath(path)); return use.getInt(0); } From 4e02951335cf5ed9c37c44b81adf7e1f0fae8788 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Sun, 16 Jun 2024 13:34:04 -0700 Subject: [PATCH 2/2] releng: fix broken manifest from 2.90-rc1 Well that is embarrassing. I think the proper thing is to just quickly ship a -rc2, so I will open a backport of this. $ curl https://releases.lix.systems/manifest.nix # This file was generated by releng/create_release.xsh in Lix { aarch64-linux = "/nix/store/mrbknq000af7iaqhk53bnpk1fvfrc1xp-lix-2.90.0-rc1"; aarch64-darwin = "/nix/store/z1bdccwsk34iv491aygh0mm1lgpf7yy1-lix-2.90.0-rc1"; x86_64-darwin = "/nix/store/xqvfpdhzck44v6kyhgi9f8v0xybksb6a-lix-2.90.0-rc1"; x86_64-linux = "/nix/store/h2ml0nx4477r84y82jgm8y80jpr72gqw-lix-release-tarballs"; } Change-Id: I9cf007c850c2faf995a3a9d92457517b8501d1a1 --- releng/create_release.xsh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/releng/create_release.xsh b/releng/create_release.xsh index 874f71a77..358124359 100644 --- a/releng/create_release.xsh +++ b/releng/create_release.xsh @@ -106,17 +106,17 @@ def upload_drv_paths_and_outputs(env: RelengEnvironment, paths: list[str]): raise subprocess.CalledProcessError(rv, proc.args) -def make_manifest(eval_result): - manifest = {vs['system']: vs['outputs']['out'] for vs in eval_result} +def make_manifest(builds_by_system): + def manifest_line(system, out): return f' {system} = "{out}";' manifest_text = textwrap.dedent("""\ # This file was generated by releng/create_release.xsh in Lix {{ - {lines} + {lines} }} - """).format(lines='\n'.join(manifest_line(s, p) for (s, p) in manifest.items())) + """).format(lines='\n'.join(manifest_line(s, p) for (s, p) in builds_by_system.items())) return manifest_text @@ -142,6 +142,18 @@ def sha256_file(f: Path): return hasher.hexdigest() +def extract_builds_by_system(eval_result): + # This could be a dictionary comprehension, but we want to be absolutely + # sure we don't have duplicates. + ret = {} + for attr in eval_result: + if attr['attrPath'][0] != 'build': + continue + assert attr['system'] not in ret + ret[attr['system']] = attr['outputs']['out'] + return ret + + def make_artifacts_dir(eval_result, d: Path): d.mkdir(exist_ok=True, parents=True) version_dir = d / 'lix' / f'lix-{VERSION}' @@ -150,12 +162,14 @@ def make_artifacts_dir(eval_result, d: Path): tarballs_drv = next(p for p in eval_result if p['attr'] == 'tarballs') cp --no-preserve=mode -r @(tarballs_drv['outputs']['out'])/* @(version_dir) + builds_by_system = extract_builds_by_system(eval_result) + # FIXME: upgrade-nix searches for manifest.nix at root, which is rather annoying with open(d / 'manifest.nix', 'w') as h: - h.write(make_manifest(eval_result)) + h.write(make_manifest(builds_by_system)) with open(version_dir / 'manifest.nix', 'w') as h: - h.write(make_manifest(eval_result)) + h.write(make_manifest(builds_by_system)) print('[+] Make sources tarball')