diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 92920818db1b..2c029b764b04 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -2,6 +2,7 @@ buildPythonPackage { name = "ipython-0.10.1"; + namePrefix = ""; src = fetchurl { url = "http://ipython.scipy.org/dist/0.10.1/ipython-0.10.1.tar.gz"; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4e10a2b3be1e..77bc9a2b9dfe 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,48 +1,23 @@ -x@{builderDefsPackage - , python, makeWrapper - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="getmail"; - version="4.20.0"; - name="${baseName}-${version}"; - url="http://pyropus.ca/software/${baseName}/old-versions/${name}.tar.gz"; - hash="17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +buildPythonPackage rec { + name = "getmail-4.20.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; + sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + propagatedBuildInputs = [ pythonPackages.ssl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["installPythonPackage" "patchShebangs" "wrapBinContentsPython"]; - patchShebangs = (a.doPatchShebangs "$out/bin"); - + doCheck = false; + + installCommand = "python setup.py install --prefix=\"\$prefix\""; + meta = { - description = "A program for retrieval of mail"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + description = "A program for retrieving mail"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://pyropus.ca/software/getmail/"; - }; - }; -}) x - +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63cfe630d082..ced195f24e07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -663,9 +663,7 @@ let gengetopt = callPackage ../development/tools/misc/gengetopt { }; - getmail = callPackage ../tools/networking/getmail { - python = pythonFull; - }; + getmail = callPackage ../tools/networking/getmail { }; getopt = callPackage ../tools/misc/getopt { };