Skip to content

cryptsetup: 2.1.0 -> 2.3.3#91017

Merged
jtojnar merged 2 commits intoNixOS:stagingfrom
mmilata:cryptsetup-2.3.3
Jul 2, 2020
Merged

cryptsetup: 2.1.0 -> 2.3.3#91017
jtojnar merged 2 commits intoNixOS:stagingfrom
mmilata:cryptsetup-2.3.3

Conversation

@mmilata
Copy link
Member

@mmilata mmilata commented Jun 18, 2020

Changes:

The python bindings were removed in 2.1.0.

Successfully booted my 20.03 on LUKS-encrypted root using this package.

Motivation for this change

Release notes told me:

All users of cryptsetup 2.x should upgrade to this version.

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.

@mmilata
Copy link
Member Author

mmilata commented Jun 18, 2020

@ofborg test installer

@mmilata
pythonPackages.blivet: drop cryptsetup dependency
2c23cba 
The python bindings were dropped in cryptsetup-2.1.0:
https://gitlab.com/cryptsetup/cryptsetup/-/blob/master/docs/v2.1.0-ReleaseNotes#L63

However this did not cause the blivet build to fail nor did anyone
notice (cryptsetup-2.1.0 was introduced in nixos-19.09).
@mmilata mmilata requested review from FRidh and jonringer as code owners June 18, 2020 14:02
@ofborg ofborg bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 18, 2020
@mmilata
Copy link
Member Author

mmilata commented Jun 18, 2020

Added 2c23cba that removes cryptsetup as a dependency of blivet since it breaks evaluation and the blivet cryptsetup support hasn't worked since nixos-19.09. cc @aszlig

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jun 18, 2020
@mmilata mmilata added the 8.has: package (update) This PR updates a package to a newer version label Jun 18, 2020
@mmilata mmilata mentioned this pull request Jun 19, 2020
Merged
10 tasks
@jtojnar jtojnar requested review from AmineChikhaoui and andir June 21, 2020 21:12
@jtojnar
Copy link
Member

jtojnar commented Jun 21, 2020

@GrahamcOfBorg test installer.encryptedFSWithKeyfile installer.luksroot installer.luksroot-format2 installer.luksroot-format1

@jtojnar jtojnar merged commit 7e5bfbc into NixOS:staging Jul 2, 2020
@mmilata mmilata deleted the cryptsetup-2.3.3 branch July 2, 2020 16:28
@jtojnar
Copy link
Member

jtojnar commented Jul 2, 2020

Tests passed and no further comments so let's just merge this.

Thanks.

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

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@AmineChikhaoui AmineChikhaoui Awaiting requested review from AmineChikhaoui

@andir andir Awaiting requested review from andir

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mmilata @jtojnar