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: 52a62d34994a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 688d1fa4073b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 4, 2020

  1. stig: fix build

    @marsam
    marsam committed Apr 4, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    pradyunsg Pradyun Gedam
    GPG key ID: FF99710C4332258E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5b17f17 View commit details

Commits on Apr 6, 2020

  1. Merge pull request #84301 from marsam/fix-stig 

    stig: fix build
    @marsam
    marsam authored Apr 6, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    pradyunsg Pradyun Gedam
    GPG key ID: FF99710C4332258E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    688d1fa View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/applications/networking/p2p/stig/default.nix
6 changes: 4 additions & 2 deletions pkgs/applications/networking/p2p/stig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "urwidtrees>=1.0.3dev0" "urwidtrees"
'';

buildInputs = with python3.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
urwid
urwidtrees
aiohttp
@@ -43,8 +43,10 @@ python3.pkgs.buildPythonApplication rec {
pytest
];

# test_string__month_day_hour_minute_second fails on darwin
checkPhase = ''
pytest tests
LC_ALL=en_US.utf8 pytest tests \
--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second
'';

meta = with lib; {