From 1fda68913effdc4dc5b8bbffaac616ff4cbb40b0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 7 Jan 2020 14:16:54 -0500
Subject: [PATCH] Bump to a version of privacypass which declares its milksnake
dep correctly
---
privacypass-repo.nix | 16 +++++++++-------
privacypass.nix | 4 ++--
remove-setuptools-scm.patch | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/privacypass-repo.nix b/privacypass-repo.nix
index 6b0c64c..a37cce7 100644
--- a/privacypass-repo.nix
+++ b/privacypass-repo.nix
@@ -1,7 +1,9 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "LeastAuthority";
- repo = "privacypass";
- rev = "45855401e163f8e622bd93a5c5bce13de8c8510a";
- sha256 = "sha256:15wv8vas6x8cdicylp0m632c916p7qxq1k4lnchr8c92lldp0rv7";
-}
+let
+ pkgs = import <nixpkgs> {};
+in
+ pkgs.fetchFromGitHub {
+ owner = "LeastAuthority";
+ repo = "privacypass";
+ rev = "17ee180eda6dc9ff30d86b9666ee5c0d511434dc";
+ sha256 = "0yz2pdm3q8z7cs0cl8aw3k6x6rb9zq088bvis3f6vaaidzd061h6";
+ }
\ No newline at end of file
diff --git a/privacypass.nix b/privacypass.nix
index ae73e27..5b03288 100644
--- a/privacypass.nix
+++ b/privacypass.nix
@@ -1,6 +1,6 @@
-{ fetchFromGitHub, callPackage }:
+{ callPackage }:
let
- src = import ./privacypass-repo.nix { inherit fetchFromGitHub; };
+ src = import ./privacypass-repo.nix;
privacypass = callPackage "${src}" { };
in
privacypass.overrideAttrs (old: {
diff --git a/remove-setuptools-scm.patch b/remove-setuptools-scm.patch
index 42e5d94..1ec1586 100644
--- a/remove-setuptools-scm.patch
+++ b/remove-setuptools-scm.patch
@@ -1,5 +1,5 @@
diff --git a/setup.py b/setup.py
-index 70927ff..9bf414d 100644
+index 6da2d4d..32262dd 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
@@ -8,7 +8,7 @@ index 70927ff..9bf414d 100644
platforms='any',
- setup_requires=['milksnake', 'setuptools_scm'],
+ setup_requires=['milksnake'],
- install_requires=['milksnake', 'cffi', 'attrs'],
+ install_requires=['cffi', 'attrs'],
extras_require={
"tests": [
@@ -29,7 +29,6 @@ setup(
--
GitLab