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
b2aaa5f8
Commit
b2aaa5f8
authored
5 years ago
by
Jean-Paul Calderone
Browse files
Options
Downloads
Patches
Plain Diff
re-use upstream tahoe-lafs nix packaging instead of duplicating it
parent
1da39c67
No related branches found
Branches containing commit
No related tags found
1 merge request
!70
re-use upstream tahoe-lafs nix packaging instead of duplicating it
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
default.nix
+10
-2
10 additions, 2 deletions
default.nix
overlays.nix
+1
-1
1 addition, 1 deletion
overlays.nix
tahoe-lafs.nix
+8
-47
8 additions, 47 deletions
tahoe-lafs.nix
with
19 additions
and
50 deletions
default.nix
+
10
−
2
View file @
b2aaa5f8
{
pkgs
?
import
./nixpkgs.nix
{
},
hypothesisProfile
?
null
,
collectCoverage
?
false
,
testSuite
?
null
,
trialArgs
?
null
}:
pkgs
.
python27Packages
.
zkapauthorizer
.
override
{
inherit
hypothesisProfile
collectCoverage
testSuite
trialArgs
;
}
{
pkgs
?
import
<
nixpkgs
>
{
}
,
hypothesisProfile
?
null
,
collectCoverage
?
false
,
testSuite
?
null
,
trialArgs
?
null
}:
let
pkgs
'
=
pkgs
.
extend
(
import
./overlays.nix
);
in
pkgs
'
.
python27Packages
.
zkapauthorizer
.
override
{
inherit
hypothesisProfile
collectCoverage
testSuite
trialArgs
;
}
This diff is collapsed.
Click to expand it.
overlays.nix
+
1
−
1
View file @
b2aaa5f8
...
...
@@ -20,7 +20,7 @@ self: super: {
# tahoe-lafs in nixpkgs is packaged as an application! so we have to
# re-package it ourselves as a library.
tahoe-lafs
=
python-self
.
callPackage
./tahoe-lafs.nix
{
};
tahoe-lafs
=
python-self
.
callPackage
((
import
./tahoe-lafs.nix
)
+
"/nix"
)
{
};
# we depend on the privacypass python library, a set of bindings to the
# challenge-bypass-ristretto Rust library
...
...
This diff is collapsed.
Click to expand it.
tahoe-lafs.nix
+
8
−
47
View file @
b2aaa5f8
{
fetchFromGitHub
,
nettools
,
python
,
twisted
,
foolscap
,
nevow
,
zfec
,
setuptools
,
setuptoolsTrial
,
pyasn1
,
zope_interface
,
service-identity
,
pyyaml
,
magic-wormhole
,
treq
,
appdirs
,
beautifulsoup4
,
eliot
,
autobahn
,
cryptography
}:
python
.
pkgs
.
buildPythonPackage
rec
{
version
=
"1.14.0.dev"
;
name
=
"tahoe-lafs-
${
version
}
"
;
src
=
fetchFromGitHub
{
owner
=
"LeastAuthority"
;
let
pkgs
=
import
<
nixpkgs
>
{};
in
pkgs
.
fetchFromGitHub
{
owner
=
"tahoe-lafs"
;
repo
=
"tahoe-lafs"
;
# A branch of master with the storage plugin web resource reuse issue
# resolved. https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3265
rev
=
"1fef61981940bbd63ffc4242c3b589258622d117"
;
sha256
=
"0kgkg7wd0nkj8f5p46341vjkr6nz3kf0fimd44d9kypm4rn8xczv"
;
};
postPatch
=
''
sed -i "src/allmydata/util/iputil.py" \
-es"|_linux_path = '/sbin/ifconfig'|_linux_path = '
${
nettools
}
/bin/ifconfig'|g"
# Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
# that.
for i in $(find src/allmydata/test -type f)
do
sed -i "$i" -e"s/localhost/127.0.0.1/g"
done
''
;
propagatedBuildInputs
=
with
python
.
pkgs
;
[
twisted
foolscap
nevow
zfec
appdirs
setuptoolsTrial
pyasn1
zope_interface
service-identity
pyyaml
magic-wormhole
treq
beautifulsoup4
eliot
autobahn
cryptography
setuptools
];
checkInputs
=
with
python
.
pkgs
;
[
hypothesis
testtools
fixtures
];
checkPhase
=
''
$out/bin/tahoe --version
''
;
}
rev
=
"34aeefd3ddbf28dafbc3477e52461eafa53b545d"
;
sha256
=
"0l8n4njbzgiwmn3qsmvzyzqlb0y9bj9g2jvpdynvsn1ggxrqmvsq"
;
}
\ No newline at end of file
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