From 4fa90144af9cddc85ba48040a2a12a9c2b2418c6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 17:17:24 -0600 Subject: [PATCH 1/6] darcsver: Upgrade from 1.7.2 -> 1.7.4 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 331978e9c9d..b7e5589fd43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1249,11 +1249,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); darcsver = buildPythonPackage (rec { - name = "darcsver-1.7.2"; + name = "darcsver-1.7.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; - md5 = "94ca7e8c9ea0f69c0f3fc6f9fc88f65a"; + sha256 = "1yb1c3jxqvy4r3qiwvnb86qi5plw6018h15r3yk5ji3nk54qdcb6"; }; buildInputs = [ pythonPackages.mock ]; From 888c0116de8840ccaaae9d86e6584a8e737720f4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 17:18:21 -0600 Subject: [PATCH 2/6] pycryptopp: Upgrade from 0.5.29 -> 0.6.0.1206569328141510525648634803928199668821045408958 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b7e5589fd43..4b7b1232a3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4765,11 +4765,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pycryptopp = buildPythonPackage (rec { - name = "pycryptopp-0.5.29"; + name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; - sha256 = "d504775b73d30fb05a3237f83c4e9e1ff3312cbba90a4a23e6cbb7d32219502b"; + sha256 = "0n90h1yg7bfvlbhnc54xb6dbqm286ykaksyg04kxlhyjgf8mhq8i"; }; # Prefer crypto++ library from the Nix store over the one that's included From 6b8aaab78a99de2935b91f292bf797e276e04345 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 17:19:18 -0600 Subject: [PATCH 3/6] twisted: Upgrade from 10.2.0 -> 13.2.0 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b7b1232a3a..7d6e867388f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6784,11 +6784,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); twisted = buildPythonPackage rec { - name = "twisted-10.2.0"; + name = "twisted-13.2.0"; src = fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-10.2.0.tar.bz2; - sha256 = "110c30z622jn14yany1sxfaqj5qx20n9rc9zqacxlwma30fdcbjn"; + url = "https://pypi.python.org/packages/source/T/Twisted/Twisted-13.2.0.tar.bz2"; + sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; }; propagatedBuildInputs = [ zope_interface ]; @@ -6809,7 +6809,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { and licensed under the MIT license. ''; - license = "MIT"; + license = pkgs.lib.licenses.mit; maintainers = [ ]; }; From f9c97afff87421e8370b2d5ac3cf4a911c96e441 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 17:19:44 -0600 Subject: [PATCH 4/6] zfec: Upgrade from 1.4.7 -> 1.4.24 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d6e867388f..8426581cf18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7222,11 +7222,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { zfec = buildPythonPackage (rec { - name = "zfec-1.4.7"; + name = "zfec-1.4.24"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz"; - sha256 = "3335c9054f45e2c59188400e892634b68761b29d06f3cafe525c60484902d379"; + sha256 = "1ks94zlpy7n8sb8380gf90gx85qy0p9073wi1wngg6mccxp9xsg3"; }; buildInputs = [ setuptoolsDarcs ]; From c916c9bc2a9a9beb1192a6a36d94f49a97f84df3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 18:48:12 -0600 Subject: [PATCH 5/6] pysqlite: Upgrade from 2.5.5 -> 2.6.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8426581cf18..cf8d970dfd0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5329,11 +5329,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { pysqlite = buildPythonPackage (rec { - name = "pysqlite-2.5.5"; + name = "pysqlite-2.6.3"; src = fetchurl { - url = "http://pysqlite.googlecode.com/files/${name}.tar.gz"; - sha256 = "ef7ca7f44893790e1a7084b10ea083770e138689406fddc7076d12d6bff4d44f"; + url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz"; + sha256 = "13djzgnbi71znjjyaw4nybg6smilgszcid646j5qav7mdchkb77y"; }; # Since the `.egg' file is zipped, the `NEEDED' of the `.so' files From 268ffe1144eb0207fa22a230e1393bfee41eb6b4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 10 Jan 2014 17:21:45 -0600 Subject: [PATCH 6/6] tahoe-lafs: Upgrade from 1.9.2 -> 1.10.0 Remove patches which do not apply to the newer version. --- .../networking/p2p/tahoe-lafs/default.nix | 35 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 38adea8af8f..8796dbd076e 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow -, simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial +, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial , setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }: # FAILURES: The "running build_ext" phase fails to compile Twisted @@ -8,34 +8,18 @@ # some loss of functionality because of it. let - name = "tahoe-lafs-1.9.2"; + name = "tahoe-lafs-1.10.0"; in buildPythonPackage { inherit name; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2"; - sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2"; + sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw"; }; - # The patch doesn't apply cleanly to the current version. - patches = [ /* ./test-timeout.patch */ ]; - configurePhase = '' - echo "forcing the use of \`setuptools' 0.6c9 rather than an unreleased version" - for i in *setup.py - do - sed -i "$i" -es'/0.6c12dev/0.6c9/g' - done - - # `find_exe()' returns a list like ['.../bin/python' - # '.../bin/twistd'], which doesn't work when `twistd' is not a - # Python script (e.g., when it's a script produced by - # `wrapProgram'). - sed -i "src/allmydata/scripts/startstop_node.py" \ - -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g" - sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -50,9 +34,9 @@ buildPythonPackage { buildInputs = [ unzip ] ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2 - # The `backup' command requires `pysqlite'. + # The `backup' command requires `sqlite3'. propagatedBuildInputs = - [ twisted foolscap nevow simplejson zfec pycryptopp pysqlite + [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock ]; @@ -61,11 +45,6 @@ buildPythonPackage { postInstall = '' # Install the documentation. - - # FIXME: Inkscape segfaults when run from here. Setting $HOME to - # something writable doesn't help; providing $FONTCONFIG_FILE doesn't - # help either. So we just don't run `make' under `docs/'. - mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; @@ -88,7 +67,7 @@ buildPythonPackage { homepage = http://allmydata.org/; - license = [ "GPLv2+" /* or */ "TGPPLv1+" ]; + license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9db2276f87..655c30cf73f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8922,7 +8922,7 @@ let tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs { inherit (pythonPackages) twisted foolscap simplejson nevow zfec - pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs + pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs numpy pyasn1 mock; };