diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index f5a39a3b242..aea2d21fd8d 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -164,6 +164,12 @@ let
       deps = [ ncurses ];
     };
 
+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
     gdbm = buildInternalPythonModule {
       moduleName = "gdbm";
       internalName = "gdbm";
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index fcf7420e425..8f6eb949226 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -4,6 +4,12 @@
    * add it to this list. The URL mentioned above is a good source for inspiration.
    */
 
+  artistic2 = {
+    shortName = "Artistic 2.0";
+    fullName = "Artistic 2.0";
+    url = "http://opensource.org/licenses/artistic-license-2.0.php";
+  }
+
   agpl3 = {
     shortName = "AGPLv3";
     fullName = "GNU Affero General Public License version 3 only";
diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch
deleted file mode 100644
index 8ecbc9a81fd..00000000000
--- a/pkgs/tools/misc/file/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
-+++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
-@@ -13,7 +13,7 @@
-     Loads the shared library through ctypes and returns a library
-     L{ctypes.CDLL} instance 
-     """
--    return ctypes.cdll.LoadLibrary(find_library('magic'))
-+    return ctypes.CDLL('libmagic.so')
- 
- _libraries = {}
- _libraries['magic'] = _init()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5cfa7b94353..99aa8a66b7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -894,6 +894,102 @@ pythonPackages = modules // rec {
     propagatedBuildInputs = [ pythonPackages.coverage ];
   };
 
+  cryptacular = buildPythonPackage rec {
+    name = "cryptacular-1.4.1";
+
+    buildInputs = [ coverage nose ];
+    propagatedBuildInputs = [ pbkdf2 modules.crypt ];
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz";
+      md5 = "fe12232ac660185186dd8057d8ca7b0e";
+    };
+
+    # TODO: tests fail: TypeError: object of type 'NoneType' has no len()
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pbkdf2 = buildPythonPackage rec {
+    name = "pbkdf2-1.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz";
+      md5 = "40cda566f61420490206597243dd869f";
+    };
+
+    # ImportError: No module named test
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  bcrypt = buildPythonPackage rec {
+    name = "bcrypt-1.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz";
+      md5 = "c5df008669d17dd6eeb5e2042d5e136f";
+    };
+
+    buildInputs = [ cffi pycparser mock pytest py ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  cffi = buildPythonPackage rec {
+    name = "cffi-0.7.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+      md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
+    };
+
+    buildInputs = [ pkgs.libffi pycparser ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pycparser = buildPythonPackage rec {
+    name = "pycparser-2.10";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pycparser/${name}.tar.gz";
+      md5 = "d87aed98c8a9f386aa56d365fe4d515f";
+    };
+
+    # ImportError: No module named test
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+  pytest = buildPythonPackage rec {
+    name = "pytest-2.3.5";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
+      md5 = "18f150e7be96b5fe3c388b0e817b8087";
+    };
+
+    buildInputs = [ py ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
   cssselect = buildPythonPackage rec {
     name = "cssselect-0.7.1";
     src = fetchurl {
@@ -1229,11 +1325,11 @@ pythonPackages = modules // rec {
 
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.3.4";
+    name = "pyramid-1.4.3";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
-      md5 = "967a04fcb2143b31b279c3013a778a2b";
+      md5 = "28fabf42cf585ecec7a57b5acc1174e3";
     };
 
     buildInputs = [
@@ -1341,6 +1437,176 @@ pythonPackages = modules // rec {
   };
 
 
+  raven = buildPythonPackage rec {
+    name = "raven-3.4.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz";
+      md5 = "6a9264133bf646149ffb9118d81445be";
+    };
+
+    # way too many dependencies to run tests
+    # see https://github.com/getsentry/raven-python/blob/master/setup.py
+    doCheck = false;
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  hypatia = buildPythonPackage rec {
+    name = "hypatia-0.1a6";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz";
+      md5 = "3a67683c578754cd8f23317db6d28ffd";
+    };
+ 
+    buildInputs = [ zope_interface zodb3 ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  zope_copy = buildPythonPackage rec {
+    name = "zope.copy-4.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip";
+      md5 = "36aa2c96dec4cfeea57f54da2b733eb9";
+    };
+ 
+    buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  statsd = buildPythonPackage rec {
+    name = "statsd-2.0.2";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz";
+      md5 = "476ef5b9004f6e2cb25c7da440bb53d0";
+    };
+ 
+    buildInputs = [ ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  pyramid_zodbconn = buildPythonPackage rec {
+    name = "pyramid_zodbconn-0.4";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz";
+      md5 = "22e88cc82cafbbe00274e7378434e5fe";
+    };
+ 
+    buildInputs = [ pyramid mock ];
+    propagatedBuildInputs = [ zodb3 zodburi ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  pyramid_mailer = buildPythonPackage rec {
+    name = "pyramid_mailer-0.13";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz";
+      md5 = "43800c7c894097a23140da58e3638c93";
+    };
+ 
+    buildInputs = [ pyramid transaction ];
+    propagatedBuildInputs = [ repoze_sendmail ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  repoze_sendmail = buildPythonPackage rec {
+    name = "repoze.sendmail-4.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz";
+      md5 = "81d15f1f03cc67d6f56f2091c594ef57";
+    };
+ 
+    buildInputs = [ transaction ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  zodburi = buildPythonPackage rec {
+    name = "zodburi-2.0b1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz";
+      md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2";
+    };
+ 
+    buildInputs = [ zodb3 mock ];
+
+    meta = {
+      maintainers = [ stdenv.lib.maintainers.iElectric ];
+    };
+  };
+
+
+  substanced = buildPythonPackage rec {
+    # no release yet
+    rev = "318a3d6a0324fd43585b8385f456d9d74c212eb8";
+    name = "substanced-${rev}";
+
+    src = fetchgit {
+      inherit rev;
+      url = "https://github.com/Pylons/substanced.git";
+    };
+
+    buildInputs = [ mock ];
+
+    propagatedBuildInputs = [
+      pyramid
+      pytz
+      zodb3
+      venusian
+      colander
+      deform
+      deform_bootstrap
+      magic
+      pyyaml
+      cryptacular
+      hypatia
+      zope_copy
+      zope_component
+      zope_deprecation
+      statsd
+      pyramid_zodbconn
+      pyramid_mailer
+    ];
+
+    meta = with stdenv.lib; {
+      maintainers = [ maintainers.iElectric ];
+    };
+  };
+
+
   repoze_lru = buildPythonPackage rec {
     name = "repoze.lru-0.4";
 
@@ -2454,25 +2720,30 @@ pythonPackages = modules // rec {
   });
 
 
-  magic = pkgs.stdenv.mkDerivation rec {
-    name = "python-${pkgs.file.name}";
+  magic = buildPythonPackage rec {
+    # TODO: wait for release 0.4.3+
+    rev = "9f18d2c125b2f0240caec7096625834624cc4c20";
+    name = "python-magic-${rev}";
 
-    src = pkgs.file.src;
+    src = fetchgit {
+      inherit rev;
+      url = "https://github.com/ahupp/python-magic.git";
+    };
 
-    patches = [ ../tools/misc/file/python.patch ];
-    buildInputs = [ python pkgs.file ];
+    propagatedBuildInputs = [ pkgs.file ];
 
-    configurePhase = "cd python";
-
-    buildPhase = "${python}/bin/${python.executable} setup.py build";
-
-    installPhase = ''
-      ${python}/bin/${python.executable} setup.py install --prefix=$out
+    patchPhase = ''
+      substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')"
     '';
 
+    # TODO: tests are failing
+    #checkPhase = ''
+    #  ${python}/bin/${python.executable} ./test.py
+    #'';
+
     meta = {
-      description = "A Python wrapper around libmagic";
-      homepage = http://www.darwinsys.com/file/;
+      description = "python-magic is a python interface to the libmagic file type identification library";
+      homepage = https://github.com/ahupp/python-magic;
     };
   };