Merge pull request #108998 from mweinelt/pinnwand

Sandro 6bfbb2dd 5ea52537

Changed files
+10 -17
pkgs
servers
+5 -15
pkgs/servers/pinnwand/default.nix
···
-
{ lib, python3, fetchFromGitHub, nixosTests, fetchpatch }:
+
{ lib, python3, fetchFromGitHub, nixosTests }:
let
python = python3.override {
···
};
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 = [
···
sqlalchemy
];
-
checkInputs = [ pytest ];
-
-
checkPhase = ''
-
pytest
-
'';
+
checkInputs = [ pytestCheckHook ];
-
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;
+5 -2
pkgs/servers/pinnwand/steck.nix
···
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; [
···
termcolor
toml
];
+
+
# tests are not in pypi package
+
doCheck = false;
passthru.tests = nixosTests.pinnwand;