!rGlCMuXgAhgEpdvJUz:nixos.org

NixOS KDE

202 Members
56 Servers

Load older messages


SenderMessageTime
7 Aug 2025
@emilazy:matrix.orgemilylet me try it15:53:32
@k900:0upti.meK900Oh, it also fails to rebase randomly if someone touches flake.nix or .editorconfig or whatever at nixpkgs root15:53:42
@k900:0upti.meK900Because as far as the old history is concerned THAT'S THE THING15:53:57
@emilazy:matrix.orgemilywell it's just a one-time merge and we shouldn't be using the normal Git merge algo for it anyway (that's what subtree merges are for in the first place)15:54:20
@emilazy:matrix.orgemilybut let me see if I can reproduce15:54:22
@emilazy:matrix.orgemilyI'm pretty nak on rewriting the entire history unless we absolutely have to15:54:34
@k900:0upti.meK900Honestly I'm very tempted to just yeet the history at this point especially since like 90% of it is garbage15:54:40
@k900:0upti.meK900...oh no15:55:20
@k900:0upti.meK900OH NO.15:55:22
@emilazy:matrix.orgemily I will be super unhappy if you break my blame 15:55:23
@k900:0upti.meK900We have a problem15:55:31
@k900:0upti.meK900There's actual Calamares source code in that history15:56:17
@k900:0upti.meK900Which is very much GPL15:56:24
@k900:0upti.meK900And we are not relicensing it15:56:27
@k900:0upti.meK900But we probably don't actually want it to be in our history15:56:38
@k900:0upti.meK900For obvious reasons15:56:40
@emilazy:matrix.orgemilyI don't see why15:56:52
@emilazy:matrix.orgemilythe files are tagged appropriately at the relevant point in the history15:56:56
@k900:0upti.meK900But also like that history is objectively garbage15:57:32
@k900:0upti.meK900Because none of that code matters15:57:35
@k900:0upti.meK900And it's only there because vlinkz had no idea how to calamares15:57:44
@emilazy:matrix.orgemily I will be really unhappy if you break my git blame and git bisect. 15:58:03
@k900:0upti.meK900I wonder if git blame even works15:58:27
@k900:0upti.meK900Without the history rewrite15:58:33
@k900:0upti.meK900Also I can 100% promise you that history won't be bisectable anyway15:58:48
@k900:0upti.meK900Because the specific changes on the installer will be specific to nixpkgs revisions15:59:05
@k900:0upti.meK900And none of that will linearize properly15:59:12
@emilazy:matrix.orgemilyimage.png
Download image.png
16:01:38
@emilazy:matrix.orgemilylol okay16:01:41
@emilazy:matrix.orgemilyI guess I'm fine with rewriting then. though it'd be nice to add the package prefix if we're going to be doing that16:02:58

Show newer messages


Back to Room ListRoom Version: 9