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

qrencode: merge with libqrencode #53149

Merged
merged 2 commits into from Jan 2, 2019
Merged

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jan 1, 2019

Motivation for this change

Closes: #53133

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 nox --run "nox-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.

cc @jameysharp @yegortimoshenko @adolfogc

@jtojnar jtojnar added this to To do in Picking up garbage via automation Jan 1, 2019
@jtojnar jtojnar moved this from To do to In progress in Picking up garbage Jan 1, 2019
@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 1, 2019

Hmm, @Ma27 was faster.

@jtojnar
Copy link
Contributor Author

jtojnar commented Jan 1, 2019

Apparently, the tests do not run in make check, we need to invoke tests/test_basic.sh.

@jtojnar jtojnar mentioned this pull request Jan 1, 2019
10 tasks
@jameysharp
Copy link
Contributor

Looks great to me, thanks!

@jtojnar jtojnar merged commit b2b921b into NixOS:master Jan 2, 2019
Picking up garbage automation moved this from In progress to Done Jan 2, 2019
@jtojnar jtojnar deleted the qrencode-cleanup branch January 2, 2019 01:18
testHaskellDepends = [ base hspec ];
description = "Library to generate images";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libqrencode;};
Copy link
Member

Choose a reason for hiding this comment

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

I was under the impression that pkgs/development/haskell-modules/hackage-packages.nix shouldn't be edited by hand. This seems to me like it will break the qr-imager Haskell package the next time @peti runs hackage2nix (which happens more-or-less weekly?).

I think an issue should be created on https://github.com/NixOS/cabal2nix that aliases libqrencode to qrencode.

Here's the cabal file in question that is specifically checking for libqrencode:
http://hackage.haskell.org/package/qr-imager-2.0.0.2/src/qr-imager.cabal

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think that cabal2nix finds the correct package through https://github.com/peti/distribution-nixpkgs

Copy link
Member

Choose a reason for hiding this comment

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

Oh nice, thanks for the info @jtojnar, I didn't know about https://github.com/peti/distribution-nixpkgs!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants