From 28fe9047eff74f96d38263476d7eed468fc1810c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 5 Aug 2018 17:21:31 +0200 Subject: [PATCH 1/3] pybitmessage: 0.6.2 -> 0.6.3.2 --- .../networking/instant-messengers/pybitmessage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 654c343caa8b5..d2e1ad0d9bb3b 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "pybitmessage-${version}"; - version = "0.6.2"; + version = "0.6.3.2"; src = fetchFromGitHub { owner = "bitmessage"; repo = "PyBitmessage"; - rev = "v${version}"; - sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; + rev = version; + sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; From 3bddc85171223c2fcd6989d6344b3e330cb61c26 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 5 Aug 2018 22:29:57 +0200 Subject: [PATCH 2/3] pybitmessage: specify python version 2 pybitmessage does not support python3 yet --- .../networking/instant-messengers/pybitmessage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index d2e1ad0d9bb3b..586b3006c266b 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, openssl }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "pybitmessage-${version}"; version = "0.6.3.2"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output From 26e939e22cba4885c2edbb66d33d24d30177175b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 5 Aug 2018 22:32:32 +0200 Subject: [PATCH 3/3] pybitmessage: use `pname` instead of `name` --- .../networking/instant-messengers/pybitmessage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 586b3006c266b..3f6b23d70a056 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, openssl }: python2Packages.buildPythonApplication rec { - name = "pybitmessage-${version}"; + pname = "pybitmessage"; version = "0.6.3.2";