Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c54e2d7856f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: efc8c2cd556f
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. Switch homepage for turses to louipc fork 

    The original repo is gone.

(cherry picked from commit c59d2d3)
    @booxter
    booxter committed Mar 26, 2019
    Copy the full SHA
    ead9621 View commit details

  2. turses: fix crash when starting with existing config file 

    Fixes #57460

(cherry picked from commit 6f525a5)

Conflicts:
	pkgs/applications/networking/instant-messengers/turses/default.nix
    @booxter
    booxter committed Mar 26, 2019
    Copy the full SHA
    9751d10 View commit details

Commits on Mar 27, 2019

  1. Merge pull request #58386 from booxter/release-18.09-turses-fix 

    turses: fix crash when starting with existing config file
    @infinisil
    infinisil authored Mar 27, 2019
    Copy the full SHA
    efc8c2c View commit details
Showing with 10 additions and 3 deletions.
  1. +10 −3 pkgs/applications/networking/instant-messengers/turses/default.nix
13 changes: 10 additions & 3 deletions pkgs/applications/networking/instant-messengers/turses/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python3Packages }:
{ stdenv, fetchpatch, python3Packages }:

with stdenv.lib;
with python3Packages;
@@ -16,14 +16,21 @@ buildPythonPackage rec {
buildInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];

patches = [
(fetchpatch {
url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3";
})
];

checkPhase = ''
TMP_TURSES=`echo turses-$RANDOM`
mkdir $TMP_TURSES
PYTHONPATH=tests:$PYTHONPATH HOME=$TMP_TURSES py.test tests/
rm -rf $TMP_TURSES
'';

patchPhase = ''
postPatch = ''
sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py
sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py
sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py
@@ -32,7 +39,7 @@ buildPythonPackage rec {
'';

meta = with stdenv.lib; {
homepage = https://github.com/alejandrogomez/turses;
homepage = https://github.com/louipc/turses;
description = "A Twitter client for the console";
license = licenses.gpl3;
maintainers = with maintainers; [ garbas ];