diff --git a/default.nix b/default.nix index a2c5e6c3ba2605fab4c2f64fe1ebf362d07f23c3..18f17fc3146f52eeae9a9e1143dec2c392df370e 100644 --- a/default.nix +++ b/default.nix @@ -7,6 +7,7 @@ in , tahoe-lafs-repo ? sources.tahoe-lafs }: let + lib = pkgs.lib; providers = { _default = "sdist,nixpkgs,wheel"; # mach-nix doesn't provide a good way to depend on mach-nix packages, @@ -26,7 +27,7 @@ in testtools = "wheel"; traceback2 = "wheel"; }; - tahoe-lafs = mach-nix.buildPythonPackage { + tahoe-lafs = mach-nix.buildPythonPackage rec { python = "python27"; name = "tahoe-lafs"; version = "1.16.post999"; @@ -42,7 +43,7 @@ in cat > src/allmydata/_version.py <<EOF # This _version.py is generated by nix. - verstr = "1.16.post999+git-${tahoe-lafs-repo.rev}" + verstr = "${version}+git-${tahoe-lafs-repo.rev}" __version__ = verstr EOF ''; @@ -51,7 +52,6 @@ in in mach-nix.buildPythonApplication rec { python = "python27"; - name = "zero-knowledge-access-pass-authorizer"; src = ./.; inherit providers; # mach-nix does not provide a way to specify dependencies on other @@ -68,7 +68,6 @@ in } ) ]; - format = "setuptools"; # Record some settings here, so downstream nix files can consume them. meta.mach-nix = { inherit python providers; }; } diff --git a/nix/sources.json b/nix/sources.json index 3f1ed6b1ba21db8fd4d9cd4ea95236a75fdb81fc..20ba0e5f75f0f433db41573c231c9cb09805afd8 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -3,12 +3,12 @@ "branch": "merged", "description": "Create highly reproducible python environments", "homepage": "", - "owner": "tp-la", + "owner": "PrivateStorageio", "repo": "mach-nix", "rev": "0872dd81afe9c4a6552604f7d21fe7f2baddf454", "sha256": "0hsbm6rmjjjzxdciirmcxyvrrlz19cbhprd2hfksrv6nnl4c3mc3", "type": "tarball", - "url": "https://github.com/tp-la/mach-nix/archive/0872dd81afe9c4a6552604f7d21fe7f2baddf454.tar.gz", + "url": "https://github.com/PrivateStorageio/mach-nix/archive/0872dd81afe9c4a6552604f7d21fe7f2baddf454.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "niv": { diff --git a/setup.cfg b/setup.cfg index 6b99b460b88f7e7f96e14f84f65be7da50a5bee9..a93d3232ec0b1a051ff259eaedd978881820b4cb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ # Generally describe the project [metadata] -name = Zero-Knowledge Access Pass Authorizer +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. long_description = file: README.rst, CHANGELOG.rst, LICENSE-2.0.txt