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

eid-mw: 4.4.16 -> 4.4.27 #92252

Merged
merged 1 commit into from Jul 6, 2020
Merged

eid-mw: 4.4.16 -> 4.4.27 #92252

merged 1 commit into from Jul 6, 2020

Conversation

chvp
Copy link
Member

@chvp chvp commented Jul 4, 2020

Motivation for this change

Version bump.

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.

Comment on lines 13 to 15
src = fetchFromGitHub {
sha256 = "1q82fw63xzrnrgh1wyh457hal6vfdl6swqfq7l6kviywiwlzx7kd";
rev = "v${version}";
repo = "eid-mw";
owner = "Fedict";
src = fetchurl {
url = "https://dist.eid.belgium.be/continuous/sources/eid-mw-${version}-v${version}.tar.gz";
sha256 = "02dbwgnkzpxkc4avs7zcrrwbjn2v59g5ffpb6vcfi80ybimw9hm6";
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this moving away from GitHub, since it seems to have this version?

https://github.com/Fedict/eid-mw/releases/tag/v4.4.27

Also, it already seems to have a newer release?

https://github.com/Fedict/eid-mw/releases/tag/v5.0.5

Copy link
Member Author

@chvp chvp Jul 5, 2020

Choose a reason for hiding this comment

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

dist.eid.belgium.be/ is the official release channel, where the releases are also signed. It seemed more appropriate to me. The 5.x releases seem to be unstable releases: they aren't mentioned on https://eid.belgium.be/en and in https://dist.eid.belgium.be/continuous/sources they have a commit hash in the released tarballs. They also failed to build. The AUR also has the same version: https://aur.archlinux.org/packages/eid-mw/ (they also use the official release channel there).

Copy link
Contributor

Choose a reason for hiding this comment

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

dist.eid.belgium.be/ is the official release channel, where the releases are also signed. It seemed more appropriate to me.

I see, thanks! For now it would probably be be better to continue using GitHub as an upstream until something like #43233 lands. Someone might forget to GPG-verify the source tarball on version bumps. Until then GitHub gives better accountability (easy to get diffs). For 4.4.27 it doesn't matter anyway, because the git tag is signed by one of the developers.

The 5.x releases seem to be unstable releases: they aren't mentioned on https://eid.belgium.be/en and in https://dist.eid.belgium.be/continuous/sources they have a commit hash in the released tarballs.

Ok, so then we should use 4.4.27.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, I'll edit it later tonight.

Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

Thank you for contributing to nixpkgs 👍 . Could you change the src attribute to use fetchFromGitHub again? I also added another suggestion to replace a use of sed by substituteInPlace.

buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
preConfigure = ''
mkdir openssl
ln -s ${openssl.out}/lib openssl
ln -s ${openssl.bin}/bin openssl
ln -s ${openssl.dev}/include openssl
export SSL_PREFIX=$(realpath openssl)
sed -i "s%c_rehash%openssl rehash%g" plugins_tools/eid-viewer/Makefile.in
Copy link
Contributor

Choose a reason for hiding this comment

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

For simple substitutions that do not rely on regular expressions, substituteInPlace is more canonical:

Suggested change
sed -i "s%c_rehash%openssl rehash%g" plugins_tools/eid-viewer/Makefile.in
substituteInPlace plugins_tools/eid-viewer/Makefile.in \
--replace "c_rehash" "openssl rehash"

Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks a lot!

Result of nixpkgs-review pr 92252 1

1 package built:
- eid-mw

Tested running the application in a sandbox: ✔️

@danieldk danieldk merged commit a07576a into NixOS:master Jul 6, 2020
@chvp chvp deleted the pr/update-eid-mw branch July 6, 2020 19:41
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