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

Jump to bottom

veracrypt: 1.23-Hotfix-2 -> 1.24-Hotfix1 #72409

Merged
merged 1 commit into from Nov 3, 2019
Merged

veracrypt: 1.23-Hotfix-2 -> 1.24-Hotfix1 #72409

merged 1 commit into from Nov 3, 2019

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Nov 1, 2019 •
edited

Motivation for this change

Update to latest

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 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 @

@ofborg ofborg bot requested a review from dsferruzza November 1, 2019 09:06
c0bw3b
c0bw3b requested changes Nov 1, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

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

Could you also remove unzip from build inputs?
It was added for zip source archive but we're back to fetching bzip2

pkgs/applications/misc/veracrypt/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/veracrypt/default.nix Outdated Show resolved Hide resolved
c0bw3b
c0bw3b reviewed Nov 2, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

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

Builds and runs on my end (nixos).
The ofBorg's aarch64 failure is a regression though. Fortunately it's already been investigated and fixed upstream.
We just need to fetchpatch this:
https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch

@prusnak prusnak force-pushed the veracrypt branch 2 times, most recently from 5821041 to 081bab0 Compare November 2, 2019 14:40
@prusnak
Copy link
Member Author

prusnak commented Nov 2, 2019

@c0bw3b applied in 081bab04ef6409076ee3cfc55f80f4e2522535df

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 2, 2019

@GrahamcOfBorg build veracrypt

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 2, 2019

Ugh now it's /build/src/Crypto/jitterentropy-base-user.h:52:16: error: conflicting declaration 'typedef uint64 __u64'
So apparently this needs 2 patches, the other one being
https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch

(sorry for all the iterations)

@prusnak
Copy link
Member Author

prusnak commented Nov 3, 2019

No worries, applied in 17e7fb2

@prusnak
Copy link
Member Author

prusnak commented Nov 3, 2019

@GrahamcOfBorg build veracrypt

c0bw3b
c0bw3b approved these changes Nov 3, 2019
View reviewed changes
Copy link
Contributor

@c0bw3b c0bw3b left a comment

Choose a reason for hiding this comment

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

Builds and runs on nixos
-> benchmarks, creating & mounting a volume

I'll just wait for ofBorg builds to finish to merge.

@c0bw3b c0bw3b merged commit 21b48a2 into NixOS:master Nov 3, 2019
@prusnak prusnak deleted the veracrypt branch November 3, 2019 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c0bw3b c0bw3b c0bw3b approved these changes

@dsferruzza dsferruzza Awaiting requested review from dsferruzza

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@prusnak @c0bw3b