JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91017 from mmilata/cryptsetup-2.3.3

Browse Source
This commit is contained in:
Jan Tojnar 2020-07-02 18:27:56 +02:00 committed by GitHub
commit 7e5bfbc85e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/blivet/default.nix
View File

@ -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";
@ -30,7 +27,7 @@ in buildPythonPackage rec {
'';
propagatedBuildInputs = [
pykickstart pyparted pyblock pyudev libselinux cryptsetupWithPython
pykickstart pyparted pyblock pyudev libselinux
six
];

20
pkgs/os-specific/linux/cryptsetup/default.nix
View File

@ -1,17 +1,15 @@
{ 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
@ -19,9 +17,6 @@ stdenv.mkDerivation rec {
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.
@ -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;