summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-08-27 21:19:28 +0100
committerGitHub <noreply@github.com>2018-08-27 21:19:28 +0100
commitbc8ed357f25346011371f2976724be1672f8c8bd (patch)
tree66e215d0bbc5a047edeea7af71f99fe0988a982d
parent440b09e22814c38012464286348dc55d51834ad8 (diff)
parentb691bf4629e36651e2809f8afdad2b0f78a94c4d (diff)
downloadnixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar.gz
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar.bz2
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar.lz
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar.xz
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.tar.zst
nixlib-bc8ed357f25346011371f2976724be1672f8c8bd.zip
Merge pull request #45385 from arch1tect0r/update-cryptsetup
cryptsetup: 2.0.3 -> 2.0.4
-rw-r--r--pkgs/os-specific/linux/cryptsetup/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 5211fd2a61bf..178fc7d91408 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -5,21 +5,15 @@
 assert enablePython -> python2 != null;
 
 stdenv.mkDerivation rec {
-  name = "cryptsetup-2.0.3";
+  name = "cryptsetup-2.0.4";
+
+  outputs = [ "out" "dev" "man" ];
 
   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";
-    })
-  ];
-
   postPatch = ''
     patchShebangs tests
   '';