Skip to content

cryptsetup: 2.1.0 -> 2.3.3 #91017

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.

Sign up for GitHub

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

Merged
jtojnar merged 2 commits into from
Jul 2, 2020
Merged

cryptsetup: 2.1.0 -> 2.3.3 #91017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6053264
cryptsetup: 2.1.0 -> 2.3.3
mmilata Jun 17, 2020
2c23cba
pythonPackages.blivet: drop cryptsetup dependency
mmilata Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkgs/development/python-modules/blivet/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
, pyudev, six, libselinux, cryptsetup, multipath-tools, lsof, utillinux
, pyudev, six, libselinux, multipath-tools, lsof, utillinux
}:

let
pyenable = { enablePython = true; };
cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec {
buildPythonPackage rec {
pname = "blivet";
version = "0.67";

Expand All @@ -30,7 +27,7 @@ in buildPythonPackage rec {
'';

propagatedBuildInputs = [
pykickstart pyparted pyblock pyudev libselinux cryptsetupWithPython
pykickstart pyparted pyblock pyudev libselinux
six
];

Expand Down
20 changes: 7 additions & 13 deletions pkgs/os-specific/linux/cryptsetup/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
{ stdenv, fetchurl, lvm2, json_c
, openssl, libuuid, pkgconfig, popt
, enablePython ? false, python2 ? null }:

assert enablePython -> python2 != null;
, openssl, libuuid, pkgconfig, popt }:

stdenv.mkDerivation rec {
name = "cryptsetup-2.1.0";
pname = "cryptsetup";
version = "2.3.3";

outputs = [ "out" "dev" "man" ];

src = fetchurl {
url = "mirror://kernel/linux/utils/cryptsetup/v2.1/${name}.tar.xz";
sha256 = "15y8n547garz0x5kqv09gscdsrz0c0y1y6c5cp8pccwg3xsb5vm3";
url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz";
sha256 = "1pw2bq4nv2z3xyycckxkbp7dp9kkp2n6bspna3plryg277z4zjiv";
};

# Disable 4 test cases that fail in a sandbox
patches = [ ./disable-failing-tests.patch ];

postPatch = ''
patchShebangs tests
${stdenv.lib.optionalString enablePython ''
patchShebangs ./python/pycryptsetup-test.py
''}

# O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs)
# and on several filesystem types (btrfs, zfs) without sandboxing.
Expand All @@ -34,11 +29,10 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-cryptsetup-reencrypt"
"--with-crypto_backend=openssl"
] ++ stdenv.lib.optional enablePython "--enable-python";
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lvm2 json_c openssl libuuid popt ]
++ stdenv.lib.optional enablePython python2;
buildInputs = [ lvm2 json_c openssl libuuid popt ];

doCheck = true;

Expand Down