about summary refs log tree commit diff
path: root/pkgs/tools/backup
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-04-10 11:17:52 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-04-10 11:17:52 +0200
commit30f14243c33f1b386273d08a4776aa679c42143d (patch)
treebd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/tools/backup
parent50fccad5828fb459760fd7578951bb961a18c0fc (diff)
parent2463e0917318581da94e7ba92703b63128c40424 (diff)
downloadnixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.gz
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.bz2
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.lz
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.xz
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.tar.zst
nixlib-30f14243c33f1b386273d08a4776aa679c42143d.zip
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r--pkgs/tools/backup/partimage/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index 009dc90576b3..18e8bb400253 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, bzip2, zlib, newt, openssl, pkgconfig, slang
+{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang
 , automake, autoconf, libtool, gettext
 }:
 stdenv.mkDerivation {
@@ -17,6 +17,12 @@ stdenv.mkDerivation {
 
   patches = [
     ./gentoos-zlib.patch
+    (fetchpatch {
+      name = "no-SSLv2.patch";
+      url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk"
+        + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e";
+      sha256 = "1zfixa6g1nb1hqfzn2wvyvxsr38gm7908zfml2iaqnwy6iz6jd8v";
+    })
   ];
 
   meta = {