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

xxdiff: drop the old qt4 version in favour of qt5 #67498

Merged
merged 1 commit into from Sep 9, 2019

Conversation

peterhoeg
Copy link
Member

Motivation for this change

We have been carrying the qt5 version for a long time (which works fine), so let's just drop the old qt4 variant. Also use the proper qt5 mkDerivation.

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @pSub @7c6f434c

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build xxdiff xxdiff-tip

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build xxdiff

@peterhoeg
Copy link
Member Author

@GrahamcOfBorg build xxdiff

@7c6f434c
Copy link
Member

What's going on with the source?

@peterhoeg
Copy link
Member Author

What's going on with the source?

Do you mind trying to do nix-prefetch-url on your side? When I do it here, I get the same sum as as in the PR.

@7c6f434c
Copy link
Member

Wait, nix-prefetch-url on what? The new expression uses fetchFromBitbucket, which unpacks.

Local build produces the same hash mismatch error as ofBorg.

@peterhoeg
Copy link
Member Author

Wait, nix-prefetch-url on what? The new expression uses fetchFromBitbucket, which unpacks.
Local build produces the same hash mismatch error as ofBorg.

That's so strange - it works perfectly fine here.

@7c6f434c
Copy link
Member

And if you GC the output of xxdiff.src, does everything still build afterwards?

@peterhoeg
Copy link
Member Author

And if you GC the output

You're a star! That did it.

@7c6f434c
Copy link
Member

Why build-time sourceRoot is any different from doing cd src in preConfigure?

@peterhoeg
Copy link
Member Author

Why build-time sourceRoot is any different from doing cd src in preConfigure?

Because if we set sourceRoot, only the src directory gets copied over to the build directory so we no longer have access to the README that needs copying in at install time. Additionally, we would have to patch the make files to not place the output in ../bin.

@7c6f434c
Copy link
Member

7c6f434c commented Aug 30, 2019 via email

@peterhoeg
Copy link
Member Author

This is not what is defined in setup.sh

Which setup.sh?

and not what happens in practice if I set sourceRoot to be source/src

The README file is outside the source directory after it has been unpacked/copied over, but we can still get to it via ${src}/README.

Additionally, we would have to patch the make files to not place the output in ../bin.
Ah right, writing outside sourceRoot is a problem as it is still read-only. But I guess this is what the comment should say, because right now it looks strange.

I've cleaned it up. Let me know what you think.

@7c6f434c
Copy link
Member

7c6f434c commented Sep 9, 2019

This is not what is defined in setup.sh

Which setup.sh?

pkgs/stdenv/generic/setup.sh

and not what happens in practice if I set sourceRoot to be source/src

The README file is outside the source directory after it has been unpacked/copied over, but we can still get to it via ${src}/README.

Actually, ../README also works, but whatever you consider cleaner.

Unpack phase copies entire ${src}, but then only ./${sourceRoot} is made writeable.

I've cleaned it up. Let me know what you think.

Nice, thanks.

@peterhoeg peterhoeg merged commit 65fb1a0 into NixOS:master Sep 9, 2019
@peterhoeg peterhoeg deleted the f/xxdiff branch September 9, 2019 06:44
@peterhoeg
Copy link
Member Author

Unpack phase copies entire ${src}, but then only ./${sourceRoot} is made writeable.

I must have missed something then. I'm sure I tried the ../README.md bit as well. Oh well. It works, everybody is happy! Thanks man!

@peterhoeg peterhoeg restored the f/xxdiff branch September 9, 2019 09:25
@peterhoeg peterhoeg deleted the f/xxdiff branch September 13, 2019 09:52
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

2 participants