Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdk-pixbuf: rename from gdk_pixbuf #61876

Merged
merged 2 commits into from Jul 24, 2019
Merged

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

@jtojnar mentioned doing this in #56966 (comment)
so I guess that time is now.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
Copy link
Contributor

jtojnar commented May 22, 2019

Cannot review at the moment but the main problem I had with this the last time I attempted this is that gdk_pixbuf appears in patches as a part of projects’ source code very often. And also since gdk-pixbuf is not a valid bash variable, we cannot use it in substituteAll.

@@ -92057,7 +92057,7 @@ self: {
}) {inherit (pkgs) gtk3;};

"gi-gdkpixbuf" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have to change this in hackage2nix here: https://github.com/NixOS/cabal2nix/blob/f4355aa45723abd15b29eb826800839278f91ed9/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs#L50

Fixing it in this file will just make it reappear the next time it's regenerated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ofborg ofborg bot removed the 6.topic: haskell label Jul 1, 2019
@zimbatm
Copy link
Member

zimbatm commented Jul 2, 2019

It would be best to start by making an alias. And keep it like that for one release. That way it will be easier to back-port security fixes.

@worldofpeace
Copy link
Contributor Author

@zimbatm This pr has always included an alias in aliases.nix.

@zimbatm
Copy link
Member

zimbatm commented Jul 3, 2019

I mean one solution would be to merge the alias now, and then do the rename and swap the aliases in the next release.

@worldofpeace
Copy link
Contributor Author

@zimbatm If I were to merge that alias in aliases.nix wouldn't that cause eval-package-list-no-aliases to fail indefinitely until all references to gdk_pixbuf are removed from nixpkgs?

@zimbatm
Copy link
Member

zimbatm commented Jul 22, 2019

@worldofpeace I don't know. Sorry for holding the PR back, I guess renaming things directly will be ok too.

@worldofpeace
Copy link
Contributor Author

@peti would it be appropriate after this is merged to manually update the haskell package set?
I think that's the way to go about this. You'd need to merge NixOS/cabal2nix#424

@peti
Copy link
Member

peti commented Jul 24, 2019

@peti would it be appropriate after this is merged to manually update the haskell package set?

Yes, I think so.

You'd need to merge NixOS/cabal2nix#424

Done.

@worldofpeace worldofpeace merged commit aabb651 into NixOS:staging Jul 24, 2019
@worldofpeace worldofpeace deleted the gdk-pixbuf branch July 24, 2019 20:44
@worldofpeace
Copy link
Contributor Author

@peti Is merged 👍

@FRidh
Copy link
Member

FRidh commented Jul 27, 2019

evaluation of staging is failing:
https://gist.github.com/GrahamcOfBorg/d4200600779484deceb3c72071a9fe87

@worldofpeace
Copy link
Contributor Author

Yeah that's expected, it needs to be manually updated...

@FRidh
Copy link
Member

FRidh commented Jul 27, 2019

What do you mean expected? Failing builds is one thing, but failing evaluation is another. Can we do a simple sed substitute?

@worldofpeace
Copy link
Contributor Author

You can't/shouldn't manually change anything in haskell-packages.nix.
NixOS/cabal2nix#424 was merged so it can be regenerated using the new name, but this change had to happen before that. If I were to just manually change it without that it would have regenerated using the old name.

Since I have no control over the haskell infustructure in nixpkgs and know very little of it, I'm expecting @peti to correct this and why I expected this to happen. I'm waiting for it to be corrected because it's out of my control.

@FRidh
Copy link
Member

FRidh commented Jul 27, 2019

For now we can just do a substitute until. It does no harm and when the next time someone (likely @peti) generates the set it will be fine anyway.

@peti
Copy link
Member

peti commented Jul 27, 2019

I won't re-generate the package set for at least one week or longer as I'm on vacation. Generally speaking, I never re-generate anything in staging where this PR went.

@jtojnar
Copy link
Contributor

jtojnar commented Jul 27, 2019

I would suggest manually seding hackage-packages.nix until then.

@worldofpeace
Copy link
Contributor Author

#65487

@infinisil infinisil mentioned this pull request Aug 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants