Q Upgrade policy, what has been patched, ..

[MangoIV]

Hi, I would like to ask whether this is going to be updated regularly. I'd really like to use it but I fear that this will just fall behind...

Additionally I would like to ask, whether it's possible to not have this as a fork but rather as a curated patchset so it's easier to see what is actually changed without grepping through the history.

Thanks in advance and thank you for making this.

[max-privatevoid]

The current update policy is "I'll merge nixos/master every once in a while or if there's a shiny new feature upstream that I want to use". It might be a good idea to automate this with Hercules CI scheduled effects. Weekly updates sounds good, I think.
Relevant to current state: Upstream seems to be broken on master currently (NixOS/nix#7856), so I'll hold off on updates for a bit until that situation gets resolved.

The original version of this project was a curated patchset (https://git.privatevoid.net/max/nix-super-archived). I switched away from that model because fixing patch conflicts after updating the upstream rev was a tedious task. Taking advantage of Git's conflict resolution capabilities makes this a nicer experience. I'd be okay with changing it back to the patchset style if you know a decent workflow for it. Having a place where all the changes in this fork are documented could be a decent solution to your problem as well.

[MangoIV]

I switched away from that model because fixing patch conflicts after updating the upstream rev was a tedious task

that makes sense, thank you for clarifying

"I'll merge nixos/master every once in a while or if there's a shiny new feature upstream that I want to use"

haha, okay, I'll roll with this >3

Thank you for making this!

[UserSv4]

I'd be okay with changing it back to the patchset style if you know a decent workflow for it.
@max-privatevoid How about something like:

git clone https://git.privatevoid.net/max/nix-super-archived
git clone https://github.com/nixos/nix
git fetch
git restore .
cd nix
for patch in ../nix-super-archived/patches/*
	git reset --hard 4369771870b3945f95e1468a0803696034d506b7 # replace with the latest known commit with no conflicts
	patch -p1 < $patch
	git commit -am "Changes"
	git merge origin/master
	$SHELL # fix the conflicts and then exit the shell
	git diff > $patch.new
end