From 98c8b2fd00b3823988d4d253ad5600ed56bd80f7 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Wed, 8 Jul 2020 14:53:38 -0400 Subject: [PATCH] Revert changes obsoleted by #3338. --- .circleci/config.yml | 2 +- nix/tahoe-lafs.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ffb0eb4d8..d0f596fc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -329,7 +329,7 @@ jobs: - image: "nixorg/nix:circleci" environment: - NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-20.03-small.tar.gz" + NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.09-small.tar.gz" steps: - "checkout" diff --git a/nix/tahoe-lafs.nix b/nix/tahoe-lafs.nix index d82c97db7..ae5c05f70 100644 --- a/nix/tahoe-lafs.nix +++ b/nix/tahoe-lafs.nix @@ -4,7 +4,7 @@ , setuptools, setuptoolsTrial, pyasn1, zope_interface , service-identity, pyyaml, magic-wormhole, treq, appdirs , beautifulsoup4, eliot, autobahn, cryptography -, html5lib, future +, html5lib }: python.pkgs.buildPythonPackage rec { version = "1.14.0.dev";