diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c630aba24253a8c8d855e2de81b9ac69ba3e28a..735831e3fce2f6b39fb0fa35b7caf8af32e51382 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -227,7 +227,7 @@ workflows: matrix: parameters: tahoe-lafs-source: - - "tahoe-lafs-1.17.0" + - "tahoe-lafs" - "macos-tests": matrix: diff --git a/default.nix b/default.nix index 5202fa637b934a198f538fa367a9873e323a5d50..877d3a698fd933495ac7c1826b826eaca931e12c 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ in { pkgs ? import sources.release2105 {} , pypiData ? sources.pypi-deps-db , mach-nix ? import sources.mach-nix { inherit pkgs pypiData; } -, tahoe-lafs-source ? "tahoe-lafs-1.17.0" +, tahoe-lafs-source ? "tahoe-lafs" , tahoe-lafs-repo ? sources.${tahoe-lafs-source} }: let diff --git a/nix/sources.json b/nix/sources.json index a8da3eca759cde9e58f6528e1c53f518a6aaa239..fdde626e48c8f4c98f24532a65da6829345b6f6e 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -41,7 +41,7 @@ "url": "https://releases.nixos.org/nixos/21.05/nixos-21.05.3740.ce7a1190a0f/nixexprs.tar.xz", "url_template": "https://releases.nixos.org/nixos/21.05/nixos-21.05.3740.ce7a1190a0f/nixexprs.tar.xz" }, - "tahoe-lafs-1.17.0": { + "tahoe-lafs": { "branch": "master", "description": "The Tahoe-LAFS decentralized secure filesystem.", "homepage": "https://tahoe-lafs.org/", diff --git a/shell.nix b/shell.nix index 46c096c1229e4345de1edc0c7d95d22a4b9a7b9a..0f661ebc3692fbf6bfe199abc0cbd8fbd6feaa8e 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,7 @@ let sources = import nix/sources.nix; in { pkgs ? import sources.release2105 {} -, tahoe-lafs-source ? "tahoe-lafs-1.17.0" +, tahoe-lafs-source ? "tahoe-lafs" }: let tests = pkgs.callPackage ./tests.nix { diff --git a/tests.nix b/tests.nix index 6bbd41ba7e53105ba3f17cfb08cfaa5b8f76c1d8..c985ce0f41b39c886b67788243835d2ee8605808 100644 --- a/tests.nix +++ b/tests.nix @@ -4,7 +4,7 @@ in { pkgs ? import sources.release2105 {} , pypiData ? sources.pypi-deps-db , mach-nix ? import sources.mach-nix { inherit pkgs pypiData; } -, tahoe-lafs-source ? "tahoe-lafs-1.17.0" +, tahoe-lafs-source ? "tahoe-lafs" , tahoe-lafs-repo ? sources.${tahoe-lafs-source} , privatestorage ? import ./. { inherit pkgs pypiData mach-nix;