Skip to content
Snippets Groups Projects
Commit c30e54e7 authored by Tom Prince's avatar Tom Prince
Browse files

Use PrivateStorageio fork.

parent ebf7a3bf
Branches
No related tags found
1 merge request!239Switch to using mach-nix for python packaging.
...@@ -7,6 +7,7 @@ in ...@@ -7,6 +7,7 @@ in
, tahoe-lafs-repo ? sources.tahoe-lafs , tahoe-lafs-repo ? sources.tahoe-lafs
}: }:
let let
lib = pkgs.lib;
providers = { providers = {
_default = "sdist,nixpkgs,wheel"; _default = "sdist,nixpkgs,wheel";
# mach-nix doesn't provide a good way to depend on mach-nix packages, # mach-nix doesn't provide a good way to depend on mach-nix packages,
...@@ -26,7 +27,7 @@ in ...@@ -26,7 +27,7 @@ in
testtools = "wheel"; testtools = "wheel";
traceback2 = "wheel"; traceback2 = "wheel";
}; };
tahoe-lafs = mach-nix.buildPythonPackage { tahoe-lafs = mach-nix.buildPythonPackage rec {
python = "python27"; python = "python27";
name = "tahoe-lafs"; name = "tahoe-lafs";
version = "1.16.post999"; version = "1.16.post999";
...@@ -42,7 +43,7 @@ in ...@@ -42,7 +43,7 @@ in
cat > src/allmydata/_version.py <<EOF cat > src/allmydata/_version.py <<EOF
# This _version.py is generated by nix. # 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 __version__ = verstr
EOF EOF
''; '';
...@@ -51,7 +52,6 @@ in ...@@ -51,7 +52,6 @@ in
in in
mach-nix.buildPythonApplication rec { mach-nix.buildPythonApplication rec {
python = "python27"; python = "python27";
name = "zero-knowledge-access-pass-authorizer";
src = ./.; src = ./.;
inherit providers; inherit providers;
# mach-nix does not provide a way to specify dependencies on other # mach-nix does not provide a way to specify dependencies on other
...@@ -68,7 +68,6 @@ in ...@@ -68,7 +68,6 @@ in
} }
) )
]; ];
format = "setuptools";
# Record some settings here, so downstream nix files can consume them. # Record some settings here, so downstream nix files can consume them.
meta.mach-nix = { inherit python providers; }; meta.mach-nix = { inherit python providers; };
} }
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
"branch": "merged", "branch": "merged",
"description": "Create highly reproducible python environments", "description": "Create highly reproducible python environments",
"homepage": "", "homepage": "",
"owner": "tp-la", "owner": "PrivateStorageio",
"repo": "mach-nix", "repo": "mach-nix",
"rev": "0872dd81afe9c4a6552604f7d21fe7f2baddf454", "rev": "0872dd81afe9c4a6552604f7d21fe7f2baddf454",
"sha256": "0hsbm6rmjjjzxdciirmcxyvrrlz19cbhprd2hfksrv6nnl4c3mc3", "sha256": "0hsbm6rmjjjzxdciirmcxyvrrlz19cbhprd2hfksrv6nnl4c3mc3",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {
......
# Generally describe the project # Generally describe the project
[metadata] [metadata]
name = Zero-Knowledge Access Pass Authorizer name = zero-knowledge-access-pass-authorizer
version = attr: _zkapauthorizer.__version__ version = attr: _zkapauthorizer.__version__
description = A `Tahoe-LAFS`_ storage-system plugin which authorizes storage operations based on privacy-respecting tokens. 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 long_description = file: README.rst, CHANGELOG.rst, LICENSE-2.0.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment