diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 282af77b9af2..265454f3a06b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4628,6 +4628,13 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + chrjabs = { + email = "contact@christophjabs.info"; + github = "chrjabs"; + githubId = 98587286; + name = "Christoph Jabs"; + keys = [ { fingerprint = "47D6 1FEB CD86 F3EC D2E3 D68A 83D0 74F3 48B2 FD9D"; } ]; + }; chrpinedo = { github = "chrpinedo"; githubId = 2324630; diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index bf1c6c45982c..940dbfe3273d 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -6,17 +6,16 @@ pypblib, pytestCheckHook, }: - buildPythonPackage rec { pname = "python-sat"; - version = "0.1.7.dev1"; + version = "0.1.8.dev17"; format = "setuptools"; src = fetchFromGitHub { owner = "pysathq"; repo = "pysat"; - rev = version; - hash = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI="; + rev = "a04763de6dafb8d3a0d7f1b231fc0d30be1de4c0"; # upstream does not tag releases + hash = "sha256-FG6oAAI8XKXumj6Ys2QjjYcRp1TpwkUZzyfpkdq5V6E="; }; propagatedBuildInputs = [ @@ -26,23 +25,18 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/pysathq/pysat/pull/102 - postPatch = '' - # Fix for case-insensitive filesystem - cat >>solvers/patches/cadical.patch <