From 795f4b31b9438cc2c070da12b1c949afe0f05ed6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Nov 2018 11:08:47 +0100 Subject: [PATCH] canto-{curses,daemon}: use python3 instead of python34 --- .../networking/feedreaders/canto-curses/default.nix | 6 +++--- .../networking/feedreaders/canto-daemon/default.nix | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 0190d5f9798f..36b4732ca2e7 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }: +{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }: -python34Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "0.9.9"; - name = "canto-curses-${version}"; + pname = "canto-curses"; src = fetchFromGitHub { owner = "themoken"; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index 4b1721278e3d..e700c5634ad6 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchFromGitHub, python34Packages, }: +{ stdenv, fetchFromGitHub, python3Packages, }: -python34Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { version = "0.9.7"; - name = "canto-daemon-${version}"; - namePrefix = ""; + pname = "canto-daemon"; src = fetchFromGitHub { owner = "themoken"; @@ -12,7 +11,7 @@ python34Packages.buildPythonApplication rec { sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n"; }; - propagatedBuildInputs = with python34Packages; [ feedparser ]; + propagatedBuildInputs = with python3Packages; [ feedparser ]; meta = { description = "Daemon for the canto Atom/RSS feed reader";