From 762f053f26eae78aff5914decfec35ed4f3ac971 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@private.storage>
Date: Wed, 20 Oct 2021 14:44:13 -0600
Subject: [PATCH] Address review comments.
---
default.nix | 6 +++++-
setup.cfg | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/default.nix b/default.nix
index 688bf8d..7f9b277 100644
--- a/default.nix
+++ b/default.nix
@@ -56,7 +56,7 @@ in
};
zkapauthorizer = mach-nix.buildPythonApplication rec {
inherit python providers;
- src = ./.;
+ src = lib.cleanSource ./.;
# mach-nix does not provide a way to specify dependencies on other
# mach-nix packages, that incorporates the requirements and overlays
# of that package.
@@ -81,6 +81,10 @@ in
packagesExtra = [ zkapauthorizer tahoe-lafs ];
};
in
+ # Since we use this derivation in `environment.systemPackages`,
+ # we create a derivation that has just the executables we use,
+ # to avoid polluting the system PATH with all the executables
+ # from our dependencies.
pkgs.runCommandNoCC "privatestorage" {}
''
mkdir -p $out/bin
diff --git a/setup.cfg b/setup.cfg
index a93d323..0c4f044 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,7 @@
# Generally describe the project
[metadata]
+# See https://packaging.python.org/guides/distributing-packages-using-setuptools/#name
+# for requiremnts of a valid project name.
name = zero-knowledge-access-pass-authorizer
version = attr: _zkapauthorizer.__version__
description = A `Tahoe-LAFS`_ storage-system plugin which authorizes storage operations based on privacy-respecting tokens.
--
GitLab