From 23d9cff19831c44c76d40916bb5e1d659c4eee7a Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 31 Dec 2021 16:30:22 -0500
Subject: [PATCH] stick with tahoe-lafs as the niv source name
We only have one version of tahoe-lafs here right now anyway, so the
identifier isn't ambiguous without a version number, and there are probably
more changes required to really support more than one version at a time.
---
.circleci/config.yml | 2 +-
default.nix | 2 +-
nix/sources.json | 2 +-
shell.nix | 2 +-
tests.nix | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c630ab..735831e 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 5202fa6..877d3a6 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 a8da3ec..fdde626 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 46c096c..0f661eb 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 6bbd41b..c985ce0 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;
--
GitLab