Skip to content
Snippets Groups Projects
Commit 3f725dae authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

The Nix packaging for PrivacyPass from 19.redeem-from-issuer

parent a77dbe6d
No related branches found
No related tags found
1 merge request!30The Nix packaging for PrivacyPass from 19.redeem-from-issuer
self: super: { self: super: {
openssl = self.openssl_1_1; openssl = self.openssl_1_1;
ristretto = super.callPackage ./ristretto.nix { };
python27 = super.python27.override { python27 = super.python27.override {
packageOverrides = python-self: python-super: { packageOverrides = python-self: python-super: {
# new tahoe-lafs dependency # new tahoe-lafs dependency
...@@ -16,6 +18,10 @@ self: super: { ...@@ -16,6 +18,10 @@ self: super: {
# tahoe-lafs in nixpkgs is packaged as an application! so we have to # tahoe-lafs in nixpkgs is packaged as an application! so we have to
# re-package it ourselves as a library. # re-package it ourselves as a library.
tahoe-lafs = python-super.callPackage ./tahoe-lafs.nix { }; tahoe-lafs = python-super.callPackage ./tahoe-lafs.nix { };
# we depend on the privacypass python library, a set of bindings to the
# challenge-bypass-ristretto Rust library
privacypass = python-super.callPackage ./privacypass.nix { };
}; };
}; };
} }
{ fetchFromGitHub }:
fetchFromGitHub {
owner = "LeastAuthority";
repo = "privacypass";
rev = "5126376574ac126d2cdcd0612ef0ed65ef7bca6e";
sha256 = "sha256:1b53315qf3yp9mzrx7nmmqj9gia211yhrzg31jp8ny10w6vgbxmn";
fetchSubmodules = true;
}
{ fetchFromGitHub, callPackage }:
let
src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
privacypass = callPackage "${src}" { };
in
privacypass.overrideAttrs (old: {
patches = [
./remove-setuptools-scm.patch
];
})
diff --git a/setup.py b/setup.py
index 70927ff..9bf414d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
packages=['privacypass', 'privacypass.tests'],
zip_safe=False,
platforms='any',
- setup_requires=['milksnake', 'setuptools_scm'],
+ setup_requires=['milksnake'],
install_requires=['milksnake', 'cffi', 'attrs'],
extras_require={
"tests": [
@@ -29,7 +29,6 @@ setup(
"hypothesis",
],
},
- use_scm_version=True,
url='https://github.com/',
milksnake_tasks=[
build_native
{ fetchFromGitHub, callPackage }:
let
src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
in
callPackage "${src}/ristretto.nix" { }
{ buildPythonPackage, sphinx, circleci-cli { buildPythonPackage, sphinx, circleci-cli
, attrs, zope_interface, twisted, tahoe-lafs , attrs, zope_interface, twisted, tahoe-lafs, privacypass
, fixtures, testtools, hypothesis, pyflakes, treq, coverage , fixtures, testtools, hypothesis, pyflakes, treq, coverage
}: }:
buildPythonPackage rec { buildPythonPackage rec {
...@@ -20,6 +20,7 @@ buildPythonPackage rec { ...@@ -20,6 +20,7 @@ buildPythonPackage rec {
zope_interface zope_interface
twisted twisted
tahoe-lafs tahoe-lafs
privacypass
]; ];
checkInputs = [ checkInputs = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment