From 97e440e996e9c418e46af3dbcdba58595b5c11ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 23 Apr 2017 23:55:55 +0200 Subject: pkgs: Add an overridden Gajim with old pycrypto This is for the time being until either NixOS/nixpkgs#21671 has been resolved or the next major version of Gajim has been released, because the latter no longer uses pycrypto. Signed-off-by: aszlig --- pkgs/aszlig/default.nix | 3 ++- pkgs/aszlig/gajim/default.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/aszlig/gajim/default.nix (limited to 'pkgs') diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix index 1d2a3e0b..50a2bcfb 100644 --- a/pkgs/aszlig/default.nix +++ b/pkgs/aszlig/default.nix @@ -1,8 +1,9 @@ -{ callPackage, callPackage_i686, boost155 }: +{ callPackage, callPackage_i686, boost155, gajim }: { aacolorize = callPackage ./aacolorize { }; axbo = callPackage ./axbo { }; + gajim = callPackage ./gajim { inherit gajim; }; git-detach = callPackage ./git-detach { }; grandpa = callPackage ./grandpa { }; nixops = callPackage ./nixops { }; diff --git a/pkgs/aszlig/gajim/default.nix b/pkgs/aszlig/gajim/default.nix new file mode 100644 index 00000000..a6bf4a11 --- /dev/null +++ b/pkgs/aszlig/gajim/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, fetchpatch, gmp, pythonPackages +, gajim +}: + +gajim.override { + pythonPackages = pythonPackages // { + pycrypto = pythonPackages.buildPythonPackage rec { + name = "pycrypto-${version}"; + version = "2.6.1"; + + src = fetchurl { + url = "mirror://pypi/p/pycrypto/${name}.tar.gz"; + sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; + }; + + patches = stdenv.lib.singleton (fetchpatch { + name = "CVE-2013-7459.patch"; + url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git" + + "/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7"; + sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9"; + }); + + buildInputs = [ gmp ]; + + preConfigure = '' + sed -i 's,/usr/include,/no-such-dir,' configure + sed -i "s!,'/usr/include/'!!" setup.py + ''; + }; + }; +} -- cgit 1.4.1