From 680ee0a45ae747a0a1f85b7d886e3eb8055c44f4 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Tue, 16 Jul 2019 13:51:26 +0100
Subject: [PATCH 1/4] pius: switch to Python 3

pius 3.0.0 requires Python 3.
---
 pkgs/tools/security/pius/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index f82f705fc8ee..fed63390d284 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,7 +1,7 @@
-{ fetchFromGitHub, stdenv, pythonPackages, gnupg, perl }:
+{ fetchFromGitHub, stdenv, python3Packages, gnupg, perl }:
 
 let version = "3.0.0"; in
-pythonPackages.buildPythonApplication {
+python3Packages.buildPythonApplication {
   name = "pius-${version}";
   namePrefix = "";
 
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication {
   '';
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = with pythonPackages; [ six ];
+  propagatedBuildInputs = with python3Packages; [ six ];
 
   meta = {
     homepage = https://www.phildev.net/pius/;

From d914be56a24abce1a06c5952aad50b1f419f5944 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Tue, 16 Jul 2019 13:52:41 +0100
Subject: [PATCH 2/4] pius: dependency on package 'six' is no longer needed

---
 pkgs/tools/security/pius/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index fed63390d284..e9e8c102eaf6 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -19,7 +19,6 @@ python3Packages.buildPythonApplication {
   '';
 
   nativeBuildInputs = [ perl ];
-  propagatedBuildInputs = with python3Packages; [ six ];
 
   meta = {
     homepage = https://www.phildev.net/pius/;

From 97ef23794b57a54b9df4398e0c77946e5dc841bf Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Tue, 16 Jul 2019 13:54:58 +0100
Subject: [PATCH 3/4] pius: use pname+version instead of name

---
 pkgs/tools/security/pius/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index e9e8c102eaf6..6ae69505f066 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -2,8 +2,9 @@
 
 let version = "3.0.0"; in
 python3Packages.buildPythonApplication {
-  name = "pius-${version}";
+  pname = "pius";
   namePrefix = "";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "jaymzh";

From 5e54487080f82505fbd96b0c9a1bf5f0a1f7d0a1 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Tue, 16 Jul 2019 14:28:49 +0100
Subject: [PATCH 4/4] pius: perl should be a runtime dependency, not a
 build-time one

Since 61bc03c017f18e2fe54d209ae8ba8a42033b9564, patch-shebangs
now distinguishes between build-time and runtime dependencies.

Prior to this commit, perl was not being placed in patch-shebangs'
search path when it is run during the fixup phase.
---
 pkgs/tools/security/pius/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 6ae69505f066..5aa4ad47d42b 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication {
     done
   '';
 
-  nativeBuildInputs = [ perl ];
+  buildInputs = [ perl ];
 
   meta = {
     homepage = https://www.phildev.net/pius/;