| 29 Nov 2022 |
Artturin | In reply to @sandro:supersandro.de Also python3Packages is still not building. Didn't someone try to fix that already? yeah me | 16:28:51 |
Artturin | https://github.com/NixOS/nixpkgs/pull/166029 | 16:28:54 |
Artturin | but this introduces more attrs | 16:29:09 |
Artturin | we could also do something like this https://github.com/Artturin/ofborg/commit/5fcea25bc6e213ae2f91dda95b3ad6e813bd1a28 | 16:30:45 |
Sandro | In reply to @artturin:matrix.org but this introduces more attrs so we would boost the rebuild count artificially? | 16:35:30 |
Artturin | yeah | 16:35:41 |
Artturin | better now but still needs refinement https://github.com/NixOS/ofborg/compare/released...Artturin:ofborg:buildpython3packages | 17:36:11 |
Artturin | would be better if the move and .flatten were not there | 17:36:58 |
Artturin | i think | 17:43:51 |
| 30 Nov 2022 |
cole-h | I would be very unhappy to merge that (not that I don't appreciate your work and that this issue exists).
I don't want to hard-code a specific python version that will have to be kept in sync. It also carries the possibility of being incorrect when e.g. targeting a staging after 3.11 has merged into it. Or even a previous release that only has 3.10 but not 3.11 and we bump the alias to 3.11 in Nixpkgs and ofborg.
I don't have any better ideas at the moment, though... | 00:06:48 |
Artturin | Have it as a passthru attribute in python3 and then get it in ofborg perhaps | 01:42:57 |
| 1 Dec 2022 |
| hexa changed their display name from hexa to hexa (22.11 now). | 13:09:00 |
| hexa changed their display name from hexa (22.11 now) to hexa. | 14:38:48 |
| 2 Dec 2022 |
Sandro | The log viewer should somehow separate logs for each package. It is usually quite hard to find the build failure for dependencies of the changed package. | 20:10:06 |
cole-h | I have very little experience with javascript and web development as a whole, so you're welcome to file an issue at https://github.com/samueldr/ofborg-viewer (some day, I'll figure out how to transfer that to the ofborg org), but I at least will likely never attempt to fix that. | 20:11:47 |
Artturin | https://github.com/NixOS/ofborg/pull/625 | 20:41:43 |
Artturin | supersedes https://github.com/NixOS/ofborg/pull/615 | 20:42:21 |
cole-h | How does --force handle files that aren't affected by the checkout (i.e. dirty files, but not the ones that might prevent checking it out)? | 20:43:24 |
Artturin | -f, --force
When switching branches, proceed even if the index or the working tree differs from HEAD, and even if
there are untracked files in the way. This is used to throw away local changes and any untracked files or
directories that are in the way.
When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are
ignored.
| 20:43:59 |
Artturin | $ gst
forcecheckout...origin/forcecheckout
M ofborg/src/acl.rs | 1 +
M ofborg/src/clone.rs | 1 +
$ gd
ofborg/src/acl.rs
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
────────────────────┐
8: pub struct Acl { │
────────────────────┘
8 ⋮ 8 │impl Acl {
9 ⋮ 9 │ pub fn new(repos: Vec<String>, mut trusted_users: Option<Vec<String>>) -> Acl {
10 ⋮ 10 │ if let Some(ref mut users) = trusted_users {
⋮ 11 │ aaaaaa
11 ⋮ 12 │ users.iter_mut().map(|x| *x = x.to_lowercase()).last();
12 ⋮ 13 │ }
13 ⋮ 14 │
ofborg/src/clone.rs
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
─────────────────────────────┐
149: pub trait GitClonable { │
─────────────────────────────┘
149⋮ 149│ let result = Command::new("git")
150⋮ 150│ .arg("checkout")
151⋮ 151│ // we don't care if its dirty
⋮ 152│ // kjdsfjksf
152⋮ 153│ .arg("--force")
153⋮ 154│ .arg(git_ref)
154⋮ 155│ .current_dir(self.clone_to())
$ git checkout released --force
Found existing alias for "git checkout". You should use: "gco"
Switched to branch 'released'
Your branch is up to date with 'upstream/released'.
$ gst
released...upstream/released
Nothing to commit, working tree clean
| 20:45:05 |
Artturin | throws them away | 20:46:41 |
Artturin | this pr can be closed https://github.com/NixOS/ofborg/pull/607 | 20:50:52 |
| 3 Dec 2022 |
cole-h | In reply to @artturin:matrix.org cole-h: it's weekend again so a reminder ping https://github.com/NixOS/ofborg/pull/624 In the process of deploying a revert of this for the moment. Somehow, hyper 0.14 snuck in, which breaks things. I'll work on getting that fixed. | 21:13:36 |
Artturin | how did it break things? | 21:15:29 |
cole-h | https://gist.github.com/cole-h/ec63ba3a6c546812104c0b15acd50c06 | 21:15:58 |
cole-h | Looks like it may be as simple as enabling the tokio1 compat feature for async-std (dunno why that never made a difference in the past). Testing on eval-6 and then I'll probably just push that change to released and retry deploying all of them. | 21:52:57 |
cole-h | Yeah, that worked. Pushed and redeployed. | 22:11:29 |
| 4 Dec 2022 |
Artturin | 👍️thanks | 01:17:50 |
hexa | https://gist.github.com/GrahamcOfBorg/c21ad00a82b739fed9b29ac8471dea94 | 01:29:12 |
hexa | ofborg eval fails because nix version is too old 😄 | 01:29:19 |