about summary refs log tree commit diff
path: root/pkgs/aszlig
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-04 21:43:13 +0200
committeraszlig <aszlig@nix.build>2018-04-04 21:47:45 +0200
commit2eea0f646c2c95232cd7baa70d0e68dd0e13cfd3 (patch)
treeecc01b0893c03e3c2f51b2c319b7137fb6af4e25 /pkgs/aszlig
parentf07b73c18bf128577871c6b9905a676a00be0135 (diff)
Remove my patched version of Gajim everywhere
The config.patch doesn't apply for Gajim 1.0 anymore anyway, so let's
throw everything away, including my custom config in order to start with
a new abomination.

With the new approach, I'm going to patch the configuration defaults
*directly* into Gajim, because one of the problems with the old approach
was that whenever specifics about a configuration value has changed, I
didn't get noticed by a patch failure.

So in the end the config I was ending up was a big mess.

I'm going to start this with a new unpatched version and someday get to
a patched version that I'm staisfied with... hopefully ;-)

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig')
-rw-r--r--pkgs/aszlig/default.nix3
-rw-r--r--pkgs/aszlig/gajim/default.nix33
2 files changed, 1 insertions, 35 deletions
diff --git a/pkgs/aszlig/default.nix b/pkgs/aszlig/default.nix
index acc2256b..d2bbeb77 100644
--- a/pkgs/aszlig/default.nix
+++ b/pkgs/aszlig/default.nix
@@ -1,9 +1,8 @@
-{ callPackage, callPackage_i686, boost155, gajim, vim_configurable, xournal }:
+{ callPackage, callPackage_i686, vim_configurable, xournal }:
 
 {
   aacolorize = callPackage ./aacolorize { };
   axbo = callPackage ./axbo { };
-  gajim = callPackage ./gajim { inherit gajim; };
   git-detach = callPackage ./git-detach { };
   grandpa = callPackage ./grandpa { };
   librxtx_java = callPackage ./librxtx-java { };
diff --git a/pkgs/aszlig/gajim/default.nix b/pkgs/aszlig/gajim/default.nix
deleted file mode 100644
index 840aa9a1..00000000
--- a/pkgs/aszlig/gajim/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ 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
-      '';
-    };
-  };
-}) // {
-  meta = gajim.meta // { platforms = [ "x86_64-linux" ]; };
-}