Merge pull request #108998 from mweinelt/pinnwand

This commit is contained in:
Sandro 2021-01-11 22:57:42 +01:00 committed by GitHub
commit 6bfbb2ddd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions

View file

@ -1,4 +1,4 @@
{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }: { lib, python3, fetchFromGitHub, nixosTests }:
let let
python = python3.override { python = python3.override {
@ -14,14 +14,14 @@ let
}; };
in with python.pkgs; buildPythonApplication rec { in with python.pkgs; buildPythonApplication rec {
pname = "pinnwand"; pname = "pinnwand";
version = "1.2.2"; version = "1.2.3";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "supakeen"; owner = "supakeen";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0cxdpc3lxgzakzgvdyyrn234380dm05svnwr8av5nrjp4nm9s8z4"; sha256 = "1p6agvp136q6km7gjfv8dpjn6x4ap770lqa40ifblyhw13bsrqlh";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,19 +37,9 @@ in with python.pkgs; buildPythonApplication rec {
sqlalchemy sqlalchemy
]; ];
checkInputs = [ pytest ]; checkInputs = [ pytestCheckHook ];
checkPhase = '' __darwinAllowLocalNetworking = true;
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=";
})
];
passthru.tests = nixosTests.pinnwand; passthru.tests = nixosTests.pinnwand;

View file

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "steck"; pname = "steck";
version = "0.6.0"; version = "0.7.0";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "07gc5iwbyprb8nihnjjl2zd06z8p4nl3a3drzh9a8ny35ig1khq0"; sha256 = "1a3l427ibwck9zzzy1sp10hmjgminya08i4r9j4559qzy7lxghs1";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec {
toml toml
]; ];
# tests are not in pypi package
doCheck = false;
passthru.tests = nixosTests.pinnwand; passthru.tests = nixosTests.pinnwand;
meta = with lib; { meta = with lib; {