Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6c34eaf9df10
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0fb7c64f50b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 9, 2019

  1. release.nix: remove firefox-unwrapped from darwin-tested 

    Unfortunately it is broken and I won’t have time to fix right now.
Most likely we will have to wait until the macOS 10.12 update to get
this one working again.
    @matthewbauer
    matthewbauer committed Mar 9, 2019
    Copy the full SHA
    70f1335 View commit details

  2. turses: Fix 

    (cherry picked from commit 308dfc1)
    @infinisil @worldofpeace
    infinisil authored and worldofpeace committed Mar 9, 2019
    Copy the full SHA
    f0fb7c6 View commit details
Showing with 8 additions and 5 deletions.
  1. +7 −4 pkgs/applications/networking/instant-messengers/turses/default.nix
  2. +1 −1 pkgs/top-level/release.nix
11 changes: 7 additions & 4 deletions pkgs/applications/networking/instant-messengers/turses/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{ stdenv, python3Packages }:
{ stdenv, python36Packages }:

with stdenv.lib;
with python3Packages;

# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4
with python36Packages;

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "turses";
version = "0.3.1";

@@ -13,7 +14,9 @@ buildPythonPackage rec {
sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
};

buildInputs = [ mock pytest coverage tox ];
disabled = ! python36Packages.pythonOlder "3.7";

checkInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];

checkPhase = ''
2 changes: 1 addition & 1 deletion pkgs/top-level/release.nix
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ let
jobs.vim.x86_64-darwin

# UI apps
jobs.firefox-unwrapped.x86_64-darwin
# jobs.firefox-unwrapped.x86_64-darwin
jobs.qt5.qtmultimedia.x86_64-darwin
jobs.inkscape.x86_64-darwin
jobs.gimp.x86_64-darwin