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

glimpse: init at 0.2.0 #103288

Merged
merged 1 commit into from Jan 30, 2021
Merged

glimpse: init at 0.2.0 #103288

merged 1 commit into from Jan 30, 2021

Conversation

erictapen
Copy link
Member

Motivation for this change

Closes #77157

Succeeds #81563

Pinging @grahamc @jtojnar as they already started reviewing #81563.

Thanks to @ashkitten @lourkeur for previous work.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@erictapen erictapen force-pushed the glimpse-0.2.0 branch 2 times, most recently from 0ba253e to 02213e5 Compare November 10, 2020 21:21
@erictapen
Copy link
Member Author

Just pushed some more changes to plugins.nix. I replaced references to nonexistent registry.gimp.org with it's archive and made sure, that nixpkgs#glimpse-with-plugins builds.

@erictapen
Copy link
Member Author

@jtojnar The more I think about it the lesser I am convinced that maintaining a separate glimpsePlugins set is reasonable atm. The duplication of efforts is already observable. Also I'm not convinced that we'll see glimpse-exclusive or gimp-exclusive plugins anytime in the near future.

Maybe gimpPlugins could globally expose an overridable function similar to pluginDerivation with an optional argument to the gimp/glimpse package? So in glimpsePlugins we could say something like

{
  # simple case for just swapping gimp with glimpse
  gap = gimpPlugins.gap.override { gimpPackage = glimpse; };

  # complex case where overriding makes no sense and an entirely new plugin is constructed.
  fourier = gimpPlugins.buildGimpPlugin {
    pname = "fourier";
    version = "0.4.3";
    gimpPackage = glimpse;
    postPatch = ...;
  };
}

Another way could be to keep gimpPlugins as it is and use overrideAttrs for every gimpPlugin, but I guess that could turn out messy.

What do you think? I have not much insight into this topic, so I guessed I'd ask you first before trying to implement it.

@erictapen erictapen marked this pull request as draft November 11, 2020 13:10
@jtojnar
Copy link
Contributor

jtojnar commented Nov 11, 2020

Pushed aa96bd2 to #103361, which should allow gimpPlugins.overrideScope (final: prev: { gimp = glimpse; }). But not sure how much sense it makes since Glimpse is expected to diverge from GIMP.

@erictapen
Copy link
Member Author

Thanks, I think that does the job. Much less code now.

Depends now on #103361

@erictapen erictapen marked this pull request as ready for review November 11, 2020 16:31
@ofborg ofborg bot requested a review from jtojnar November 11, 2020 16:36
@erictapen
Copy link
Member Author

@jtojnar as you already did quite a bit ot review work, would you mind taking another look on this PR? Or maybe @ashkitten as the original author? Would be nice to get this merged eventually.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 18, 2021

@erictapen please fix the merge conflict.

@erictapen
Copy link
Member Author

Fixed the conflict. Took me a while, but glimpse (as well as gimp) need autoconf 2.69.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

I would appreciate if @jtojnar could take another look at this.

Seems fine from my side.

@erictapen
Copy link
Member Author

Multiple people eyeballed this PR and I'm going to maintain all of its code anyway. So without further objections I'll merge this in two days.

Co-authored-by: Louis Bettens <louis@bettens.info>
Co-authored-by: ash lea <example@thisismyactual.email>
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 26, 2021

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 103288 run on x86_64-darwin 1

2 packages failed to build and are new build failures:
  • glimpse: log was empty
  • (glimpsePlugins.gimp): log was empty
1 package built:
  • glimpsePlugins.gmic
error: --- Error ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- nixbuilder for '/nix/store/0vbvca424p055qyr7qqgibrjrjcwrg0b-python-2.7.18-env.drv' failed with exit code 2; last 1 log lines:                                                                    cannot create directory `/nix/store/k0azjfpdlcdx2rv3akdyxsf3zzxw86p6-python-2.7.18-env/': No such file or directory at /nix/store/gn7c8979lw55dg9np9gly7ylhiakbdim-builder.pl line 235.   error: --- Error ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- nix1 dependencies of derivation '/nix/store/vlqm8d2y02cpainvfj96yxnq8g4xq7m4-glimpse-0.2.0.drv' failed to build 

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 103288 run on x86_64-linux 1

4 packages marked as broken and skipped:
  • gimpPlugins.exposureBlend
  • gimpPlugins.texturize
  • glimpsePlugins.exposureBlend
  • glimpsePlugins.texturize
18 packages built:
  • gimp-with-plugins
  • gimpPlugins.fourier
  • gimpPlugins.gap
  • gimpPlugins.gimplensfun
  • gimpPlugins.lightning
  • gimpPlugins.lqrPlugin
  • gimpPlugins.resynthesizer
  • gimpPlugins.waveletSharpen
  • glimpse (glimpsePlugins.gimp)
  • glimpse-with-plugins
  • glimpsePlugins.fourier
  • glimpsePlugins.gap
  • glimpsePlugins.gimplensfun
  • glimpsePlugins.gmic
  • glimpsePlugins.lightning
  • glimpsePlugins.lqrPlugin
  • glimpsePlugins.resynthesizer
  • glimpsePlugins.waveletSharpen

@erictapen erictapen merged commit ef54752 into NixOS:master Jan 30, 2021
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.

package request: Glimpse (re-branding of GIMP)
3 participants