lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #42200 from qolii/cryptsetup_2_0_3_libressl_2_7__v2

Cryptsetup: 2.0.2 -> 2.0.3. Also, add upstream libressl-2.7 patch.

authored by

xeji and committed by
GitHub
c4adce71 2bb4088f

+11 -3
+11 -3
pkgs/os-specific/linux/cryptsetup/default.nix
··· 1 - { stdenv, fetchurl, devicemapper, json_c, openssl, libuuid, pkgconfig, popt 1 + { stdenv, fetchurl, fetchpatch, devicemapper, json_c, openssl, libuuid, pkgconfig, popt 2 2 , enablePython ? false, python2 ? null }: 3 3 4 4 assert enablePython -> python2 != null; 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "cryptsetup-2.0.2"; 7 + name = "cryptsetup-2.0.3"; 8 8 9 9 src = fetchurl { 10 10 url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; 11 - sha256 = "15wyjfgcqjf0wy5gxnmjj8aah33csv5v6n1hv9c8sxdzygbhb0ag"; 11 + sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; 12 12 }; 13 + 14 + patches = [ 15 + # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. 16 + (fetchpatch { 17 + url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; 18 + sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; 19 + }) 20 + ]; 13 21 14 22 NIX_LDFLAGS = "-lgcc_s"; 15 23