1 Jul 2025 |
dramforever | you mean like in prePhases? | 15:45:21 |
dramforever | wait how do we find the file then | 15:50:03 |
dramforever | does rustc have a TARGET_SPEC_DIR or something | 15:50:47 |
dramforever | you know what, nevermind, i'm not actually blocked on r-h-f | 15:59:26 |
dramforever | i don't have the string with context problem if i use rust.framepointers | 15:59:48 |
dramforever | * i don't have the string with context problem if i use rust.frame-pointers | 16:02:24 |
Toma | I have opened https://github.com/NixOS/nixpkgs/pull/421558 But I think this is not the way to go, at least not yet.
I don't want to imagine the merge issues with having made a change in 2000 packages, all of them near often-changing hash values and having them be only in staging but not master.
I think we should first have a staging cycle where the useFetchCargoVendor = true is made an actual NOOP (we filter it out from the attrs passed down to mkDerivation) After that, we can do the same thing as my PR above, only targeting master directly and have no rebuilds
Any better ideas?
| 17:31:48 |
Toma | I'd also imagine a similar process for release-25.05, but I guess the merge issues are less severe there | 17:32:46 |
emily | oh god, it gets passed down still? | 17:32:48 |
emily | yes, let's do the staging thing then | 17:33:04 |
emily | and certainly let's backport to 25.05 | 17:33:09 |
emily | and we'll also need to do a merge into staging-next and staging when we land | 17:33:31 |
emily | as in, make it a nop in staging | 17:33:51 |
emily | sorry for not catching that originally | 17:34:00 |
emily | btw, you may want to collapse newlines for the
cargoHash = "foo";
useFetchCargoVendor = true;
otherThing = 123;
case
| 17:34:37 |
emily | (not sure if we have any in tree or not though) | 17:34:40 |
emily | (and actually I guess nixfmt might collapse those already) | 17:34:47 |
Toma | yes | 17:34:52 |
Toma | * yes it does | 17:35:06 |
Toma | Okay, I'll work on the make-NOOP PR then | 17:35:53 |
Toma | https://github.com/NixOS/nixpkgs/pull/421563 | 17:41:39 |
Toma | this minimal change should be fine I think | 17:42:13 |
Toma | Oh it has an eval error, will fix it in a minute | 17:45:43 |
Toma | * Oh it has an eval error, will fix it in a minute
Edit: Done! | 17:47:57 |
| DynamicGoose joined the room. | 20:31:06 |
| DynamicGoose set a profile picture. | 20:35:21 |
2 Jul 2025 |
| @michael.zeagler:matrix.org left the room. | 02:12:23 |
| Markus Theil joined the room. | 13:30:16 |
3 Jul 2025 |
| Robert Rose changed their display name from Robert Rose to Robert Rose - 🌴 04.07. | 20:37:07 |
Toma | I would like to revive some conversation around https://github.com/NixOS/nixpkgs/pull/387337
Currently the implementation creates a new subdirectory for each unique source that can be found in the lockfile
Here's an example of how the final directory layout might look like:
$ ls -A result/
.cargo source-git-0 source-git-1 source-git-2 source-registry-0 Cargo.lock
$ cat result/.cargo/config.toml
[source._vendored-source-registry-0]
directory = "@vendor@/source-registry-0"
[source.crates-io]
replace-with = "_vendored-source-registry-0"
[source._vendored-source-git-0]
directory = "@vendor@/source-git-0"
[source._original-source-git-0]
git = "https://github.com/biomejs/biome"
rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272"
replace-with = "_vendored-source-git-0"
[source._vendored-source-git-1]
directory = "@vendor@/source-git-1"
[source._original-source-git-1]
git = "https://github.com/lionel-/tower-lsp"
branch = "bugfix/patches"
replace-with = "_vendored-source-git-1"
[source._vendored-source-git-2]
directory = "@vendor@/source-git-2"
[source._original-source-git-2]
git = "https://github.com/r-lib/tree-sitter-r"
rev = "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a"
replace-with = "_vendored-source-git-2"
| 22:41:21 |