Skip to content
Snippets Groups Projects
Commit d30e7d49 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Remove the bundled Tahoe-LAFS and just require it as a param or nixpkgs attr

parent 17337cc5
No related branches found
No related tags found
1 merge request!196Remove the bundled Tahoe-LAFS and just require it as a param or nixpkgs attr
......@@ -8,14 +8,9 @@
let
pkgs' = pkgs.extend (import ./overlays.nix);
callPackage = pkgs'.python27Packages.callPackage;
tahoe-lafs' = (
if tahoe-lafs != null
then tahoe-lafs
else callPackage ./tahoe-lafs.nix { }
);
tahoe-lafs = if tahoe-lafs == null then pkgs.python2Packages.tahoe-lafs-1_14 else tahoe-lafs;
in
callPackage ./zkapauthorizer.nix {
challenge-bypass-ristretto = callPackage ./python-challenge-bypass-ristretto.nix { };
inherit hypothesisProfile collectCoverage testSuite trialArgs;
tahoe-lafs = tahoe-lafs';
inherit hypothesisProfile collectCoverage testSuite trialArgs tahoe-lafs;
}
{ pkgs ? import <nixpkgs> { } }:
let
nixpkgs = pkgs.path;
args =
{ overlays = [ (import ./overlays.nix) ];
};
in
pkgs.callPackage nixpkgs args
let
pkgs = import <nixpkgs> {};
in
pkgs.fetchFromGitHub {
owner = "tahoe-lafs";
repo = "tahoe-lafs";
rev = "tahoe-lafs-1.14.0";
sha256 = "1ahdiapg57g6icv7p2wbzgkwl9lzdlgrsvbm5485414m7z2d6las";
}
{ python2Packages }:
let
# Manually assemble the tahoe-lafs build inputs because tahoe-lafs 1.14.0
# eliot package runs the eliot test suite which is flaky. Doing this gives
# us a place to insert a `doCheck = false` (at the cost of essentially
# duplicating tahoe-lafs' default.nix). Not ideal but at least we can throw
# it away when we upgrade to the next tahoe-lafs version.
repo = ((import ./tahoe-lafs-repo.nix) + "/nix");
nevow-drv = repo + "/nevow.nix";
nevow = python2Packages.callPackage nevow-drv { };
eliot-drv = repo + "/eliot.nix";
eliot = (python2Packages.callPackage eliot-drv { }).overrideAttrs (old: {
doInstallCheck = false;
});
tahoe-lafs-drv = repo + "/tahoe-lafs.nix";
tahoe-lafs = python2Packages.callPackage tahoe-lafs-drv {
inherit nevow eliot;
};
in
tahoe-lafs
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment