Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
ZKAPAuthorizer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Administrator
ZKAPAuthorizer
Commits
c30e54e7
Commit
c30e54e7
authored
3 years ago
by
Tom Prince
Browse files
Options
Downloads
Patches
Plain Diff
Use PrivateStorageio fork.
parent
ebf7a3bf
Branches
Branches containing commit
No related tags found
1 merge request
!239
Switch to using mach-nix for python packaging.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
default.nix
+3
-4
3 additions, 4 deletions
default.nix
nix/sources.json
+2
-2
2 additions, 2 deletions
nix/sources.json
setup.cfg
+1
-1
1 addition, 1 deletion
setup.cfg
with
6 additions
and
7 deletions
default.nix
+
3
−
4
View file @
c30e54e7
...
@@ -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
;
};
}
}
This diff is collapsed.
Click to expand it.
nix/sources.json
+
2
−
2
View file @
c30e54e7
...
@@ -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"
:
{
...
...
This diff is collapsed.
Click to expand it.
setup.cfg
+
1
−
1
View file @
c30e54e7
# Generally describe the project
# Generally describe the project
[metadata]
[metadata]
name
=
Z
ero-
K
nowledge
A
ccess
P
ass
A
uthorizer
name
=
z
ero-
k
nowledge
-a
ccess
-p
ass
-a
uthorizer
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment