Sender | Message | Time |
---|---|---|
10 Jan 2025 | ||
https://wiki.nixos.org/wiki/MatrixRooms also does not list one, so I guess not 😄 | 10:32:14 | |
So I'll just ask here (also it's probably more of a stdenv question than a Ruby-specific question):
Now to allow the override I tried setting gemset as an attribute on the stdenv args and then reference it as | 10:39:34 | |
* So I'll just ask here (also it's probably more of a stdenv question than a Ruby-specific question):
Now to allow the override I tried setting gemset as an attribute on the stdenv args and then reference it as | 10:40:16 | |
Looks like GHA are struggling right now... | 10:50:51 | |
ok for my usecase it's not relevant anymore, but would be interesting to know nonetheless 😄 | 11:06:59 | |
how would I go about submitting an update to a package (ares) that needs a new dependency (librashader)? I submitted a PR to package librashader, but updating ares depends on that being merged, so should I just wait or is there a way to submit a PR that depends on another PR? | 16:18:23 | |
You can just put both in one PR | 16:18:56 | |
ah, okay - should I just close my existing one or is it better to edit it? | 16:30:18 | |
up to you | 16:37:39 | |
you can do stacked PRs in GitHub only if you can push branches directly to the repo :( | 16:37:55 | |
(by directing one PR at another PR's branch; when the other PR is merged the target branch gets updated) | 16:38:06 | |
Isn’t there some weirdness with that if you aren’t targeting master with the first PR? We ran into that with the Darwin SDK stuff IIRC. | 17:19:44 | |
I think that was because the PR was from your fork | 17:22:17 | |
we just had a mirror branch set up but it turned out to not be enough | 17:22:23 | |
but maybe staging could matter too? | 17:22:27 | |
22:15:41 | ||
22:43:10 | ||
11 Jan 2025 | ||
04:07:51 | ||
11:36:33 | ||
15:06:32 | ||
i need some help with jj, I want to rebase some work to staging, I thought I could just do jj rebase -d staging , but that gives me Error: Commit 302c5392f503 is immutable . I tried a bunch of things, but I didn't figure out the correct thing. What do I need to do? | 16:11:26 | |
302c5392f503 is my local master bookmark where my work is on top | 16:12:44 | |
i'm guessing that master is not merged into staging, so it's trying to include that in the rebase | 16:13:03 | |
perhaps pass -s <base commit of your work> . by default it will infer the stack to rebase from your current branch of work | 16:13:18 | |
you probably need -s to be more specific about which change to rebase | 16:13:16 | |
which if you haven't pushed may not be accurate | 16:13:26 | |
I would also suggest -d 'fork_point(master, staging)' when possible, so that you can test on a revision close to master that still merges into staging | 16:13:44 | |
(this is the equivalent of the git merge-base suggestion in CONTRIBUTING.md ) | 16:13:53 | |
woah there's a fork_point function in there? | 16:14:08 | |
i had written my own merge_base revset alias for that lol | 16:16:38 |