From 0b701f479f1d9690c17e835e6851bb2b99ba2177 Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Mon, 20 Aug 2018 17:42:51 +0300 Subject: [PATCH 1/2] cryptsetup: 2.0.3 -> 2.0.4 --- pkgs/os-specific/linux/cryptsetup/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index fc13d97429c..9bcfbeadca5 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,21 +5,13 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-2.0.3"; + name = "cryptsetup-2.0.4"; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; - sha256 = "1m01wl8njjraz69fsk97l3nqfc32nbpr1la5s1l4mzzmq42clv2d"; + sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; - patches = [ - # NOTE: Patch to support LibreSSL-2.7. It is from upstream, and can be removed when cryptsetup is next updated. - (fetchpatch { - url = "https://gitlab.com/cryptsetup/cryptsetup/commit/5fcf430c8105fbeeb07a8cacbae84f941d2a3d55.patch"; - sha256 = "1d3ycsqszq0frlv9r7kmfdfmnk4qa4b4mv25iivmayvpgc8yja7m"; - }) - ]; - NIX_LDFLAGS = "-lgcc_s"; configureFlags = [ From bf453ad4e567836ec1030fd01ac588196f0b675f Mon Sep 17 00:00:00 2001 From: Markov Dmitry Date: Mon, 20 Aug 2018 17:43:48 +0300 Subject: [PATCH 2/2] Split outputs to out, dev and man --- pkgs/os-specific/linux/cryptsetup/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 9bcfbeadca5..7a38c41bc34 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -7,6 +7,8 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { name = "cryptsetup-2.0.4"; + outputs = [ "out" "dev" "man" ]; + src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.0/${name}.tar.xz"; sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx";