# HG changeset patch # User Marcin Kuzminski # Date 2016-11-10 16:19:23 # Node ID 5682a2ff63e2d0d10d3e1e4aa81010bff74b5011 # Parent 54363a6a0ea24c539ae7afe0d3c5949537f1eff6 requirements: added ipdb (0.10.1) support. diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1,3 +1,6 @@ +# Generated by pip2nix 0.4.0.dev1 +# See https://github.com/johbo/pip2nix + { Beaker = super.buildPythonPackage { name = "Beaker-1.7.0"; @@ -26,13 +29,13 @@ }; }; Mako = super.buildPythonPackage { - name = "Mako-1.0.4"; + name = "Mako-1.0.6"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; [MarkupSafe]; src = fetchurl { - url = "https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155/Mako-1.0.4.tar.gz"; - md5 = "c5fc31a323dd4990683d2f2da02d4e20"; + url = "https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e/Mako-1.0.6.tar.gz"; + md5 = "a28e22a339080316b2acc352b9ee631c"; }; meta = { license = [ pkgs.lib.licenses.mit ]; @@ -103,6 +106,19 @@ license = [ pkgs.lib.licenses.mit ]; }; }; + backports.shutil-get-terminal-size = super.buildPythonPackage { + name = "backports.shutil-get-terminal-size-1.0.0"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz"; + md5 = "03267762480bd86b50580dc19dff3c66"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; configobj = super.buildPythonPackage { name = "configobj-5.0.6"; buildInputs = with self; []; @@ -116,6 +132,19 @@ license = [ pkgs.lib.licenses.bsdOriginal ]; }; }; + decorator = super.buildPythonPackage { + name = "decorator-4.0.10"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/13/8a/4eed41e338e8dcc13ca41c94b142d4d20c0de684ee5065523fee406ce76f/decorator-4.0.10.tar.gz"; + md5 = "434b57fdc3230c500716c5aff8896100"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal { fullName = "new BSD License"; } ]; + }; + }; dulwich = super.buildPythonPackage { name = "dulwich-0.13.0"; buildInputs = with self; []; @@ -129,6 +158,19 @@ license = [ pkgs.lib.licenses.gpl2Plus ]; }; }; + enum34 = super.buildPythonPackage { + name = "enum34-1.1.6"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"; + md5 = "5f13a0841a61f7fc295c514490d120d0"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; greenlet = super.buildPythonPackage { name = "greenlet-0.4.7"; buildInputs = with self; []; @@ -181,6 +223,45 @@ license = [ pkgs.lib.licenses.zpt21 ]; }; }; + ipdb = super.buildPythonPackage { + name = "ipdb-0.10.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [ipython setuptools]; + src = fetchurl { + url = "https://pypi.python.org/packages/eb/0a/0a37dc19572580336ad3813792c0d18c8d7117c2d66fc63c501f13a7a8f8/ipdb-0.10.1.tar.gz"; + md5 = "4aeab65f633ddc98ebdb5eebf08dc713"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; + ipython = super.buildPythonPackage { + name = "ipython-5.1.0"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [setuptools decorator pickleshare simplegeneric traitlets prompt-toolkit pygments pexpect backports.shutil-get-terminal-size pathlib2 pexpect]; + src = fetchurl { + url = "https://pypi.python.org/packages/89/63/a9292f7cd9d0090a0f995e1167f3f17d5889dcbc9a175261719c513b9848/ipython-5.1.0.tar.gz"; + md5 = "47c8122420f65b58784cb4b9b4af35e3"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; + ipython-genutils = super.buildPythonPackage { + name = "ipython-genutils-0.1.0"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/71/b7/a64c71578521606edbbce15151358598f3dfb72a3431763edc2baf19e71f/ipython_genutils-0.1.0.tar.gz"; + md5 = "9a8afbe0978adbcbfcb3b35b2d015a56"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; mercurial = super.buildPythonPackage { name = "mercurial-3.8.4"; buildInputs = with self; []; @@ -220,6 +301,71 @@ license = [ pkgs.lib.licenses.asl20 ]; }; }; + pathlib2 = super.buildPythonPackage { + name = "pathlib2-2.1.0"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [six]; + src = fetchurl { + url = "https://pypi.python.org/packages/c9/27/8448b10d8440c08efeff0794adf7d0ed27adb98372c70c7b38f3947d4749/pathlib2-2.1.0.tar.gz"; + md5 = "38e4f58b4d69dfcb9edb49a54a8b28d2"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; + pexpect = super.buildPythonPackage { + name = "pexpect-4.2.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [ptyprocess]; + src = fetchurl { + url = "https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98/pexpect-4.2.1.tar.gz"; + md5 = "3694410001a99dff83f0b500a1ca1c95"; + }; + meta = { + license = [ pkgs.lib.licenses.isc { fullName = "ISC License (ISCL)"; } ]; + }; + }; + pickleshare = super.buildPythonPackage { + name = "pickleshare-0.7.4"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [pathlib2]; + src = fetchurl { + url = "https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz"; + md5 = "6a9e5dd8dfc023031f6b7b3f824cab12"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; + prompt-toolkit = super.buildPythonPackage { + name = "prompt-toolkit-1.0.9"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [six wcwidth]; + src = fetchurl { + url = "https://pypi.python.org/packages/83/14/5ac258da6c530eca02852ee25c7a9ff3ca78287bb4c198d0d0055845d856/prompt_toolkit-1.0.9.tar.gz"; + md5 = "a39f91a54308fb7446b1a421c11f227c"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; + ptyprocess = super.buildPythonPackage { + name = "ptyprocess-0.5.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/db/d7/b465161910f3d1cef593c5e002bff67e0384898f597f1a7fdc8db4c02bf6/ptyprocess-0.5.1.tar.gz"; + md5 = "94e537122914cc9ec9c1eadcd36e73a1"; + }; + meta = { + license = [ ]; + }; + }; py = super.buildPythonPackage { name = "py-1.4.29"; buildInputs = with self; []; @@ -233,6 +379,19 @@ license = [ pkgs.lib.licenses.mit ]; }; }; + pygments = super.buildPythonPackage { + name = "pygments-2.1.3"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz"; + md5 = "ed3fba2467c8afcda4d317e4ef2c6150"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; pyramid = super.buildPythonPackage { name = "pyramid-1.6.1"; buildInputs = with self; []; @@ -334,6 +493,19 @@ license = [ pkgs.lib.licenses.mit ]; }; }; + simplegeneric = super.buildPythonPackage { + name = "simplegeneric-0.8.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip"; + md5 = "f9c1fab00fd981be588fc32759f474e3"; + }; + meta = { + license = [ pkgs.lib.licenses.zpt21 ]; + }; + }; simplejson = super.buildPythonPackage { name = "simplejson-3.7.2"; buildInputs = with self; []; @@ -344,7 +516,7 @@ md5 = "a5fc7d05d4cb38492285553def5d4b46"; }; meta = { - license = [ pkgs.lib.licenses.mit pkgs.lib.licenses.afl21 ]; + license = [ { fullName = "Academic Free License (AFL)"; } pkgs.lib.licenses.mit ]; }; }; six = super.buildPythonPackage { @@ -386,6 +558,19 @@ license = [ pkgs.lib.licenses.lgpl21Plus ]; }; }; + traitlets = super.buildPythonPackage { + name = "traitlets-4.3.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [ipython-genutils six decorator enum34]; + src = fetchurl { + url = "https://pypi.python.org/packages/b1/d6/5b5aa6d5c474691909b91493da1e8972e309c9f01ecfe4aeafd272eb3234/traitlets-4.3.1.tar.gz"; + md5 = "dd0b1b6e5d31ce446d55a4b5e5083c98"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; translationstring = super.buildPythonPackage { name = "translationstring-1.3"; buildInputs = with self; []; @@ -425,6 +610,19 @@ license = [ pkgs.lib.licenses.zpt21 ]; }; }; + wcwidth = super.buildPythonPackage { + name = "wcwidth-0.1.7"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz"; + md5 = "b3b6a0a08f0c8a34d1de8cf44150a4ad"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; wheel = super.buildPythonPackage { name = "wheel-0.29.0"; buildInputs = with self; []; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,7 @@ configobj==5.0.6 dulwich==0.13.0 hgsubversion==1.8.6 infrae.cache==1.0.1 +ipdb==0.10.1 mercurial==3.8.4 msgpack-python==0.4.6 py==1.4.29 diff --git a/shell.nix b/shell.nix --- a/shell.nix +++ b/shell.nix @@ -1,12 +1,11 @@ { pkgs ? import {} -, doCheck ? false +, doCheck ? false }: let + vcsserver = import ./default.nix { - inherit - doCheck - pkgs; + inherit pkgs doCheck; }; vcs-pythonPackages = vcsserver.pythonPackages; @@ -17,6 +16,12 @@ in vcsserver.override (attrs: { # make development a little bit more convenient. src = null; + buildInputs = + attrs.buildInputs ++ + (with vcs-pythonPackages; [ + ipdb + ]); + # Somewhat snappier setup of the development environment # TODO: think of supporting a stable path again, so that multiple shells # can share it.