From a2e741bd3802b8d9c5f38cb0bd794219a5593ff9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Jan 2021 06:34:19 +0100 Subject: [PATCH 1/2] pinnwand: 1.2.2 -> 1.2.3 --- pkgs/servers/pinnwand/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 31417989c44..807f241fa3e 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, python3, fetchFromGitHub, nixosTests }: let python = python3.override { @@ -14,14 +14,14 @@ let }; in with python.pkgs; buildPythonApplication rec { pname = "pinnwand"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "supakeen"; repo = pname; rev = "v${version}"; - sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; + sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh"; }; nativeBuildInputs = [ @@ -37,19 +37,9 @@ in with python.pkgs; buildPythonApplication rec { sqlalchemy ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - pytest - ''; - - patches = [ - # Use poetry-core instead of poetry. Fixed in 1.2.3 - (fetchpatch { - url = "https://github.com/supakeen/pinnwand/commit/38ff5729c59abb97e4b416d3ca66466528b0eac7.patch"; - sha256 = "F3cZe29z/7glmS3KWzcfmZnhYmC0LrLLS0zHk7WS2rQ="; - }) - ]; + __darwinAllowLocalNetworking = true; passthru.tests = nixosTests.pinnwand; From 00ea65155e64bfe89d875d05c6a348c5b46b5dac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Jan 2021 06:34:42 +0100 Subject: [PATCH 2/2] steck: 0.6.0 -> 0.7.0 --- pkgs/servers/pinnwand/steck.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 90f7d6b49f5..8d44f8160d0 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "steck"; - version = "0.6.0"; + version = "0.7.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; + sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1"; }; propagatedBuildInputs = with python3Packages; [ @@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec { toml ]; + # tests are not in pypi package + doCheck = false; + passthru.tests = nixosTests.pinnwand; meta = with lib; {