openbabel-unstable: 3.1.1 -> unstable-06-12-23

+10 -9
+9 -7
pkgs/development/libraries/openbabel/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: 1 + { stdenv, lib, fetchFromGitHub, cmake, perl, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "openbabel"; 5 - version = "3.1.1"; 5 + version = "unstable-06-12-23"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "openbabel"; 9 - repo = "openbabel"; 10 - rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}"; 11 - sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; 9 + repo = pname; 10 + rev = "32cf131444c1555c749b356dab44fb9fe275271f"; 11 + hash = "sha256-V0wrZVrojCZ9Knc5H6cPzPoYWVosRZ6Sn4PX+UFEfHY="; 12 12 }; 13 13 14 14 postPatch = '' 15 15 sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12 16 16 ''; 17 17 18 - buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; 18 + buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson ]; 19 19 20 20 nativeBuildInputs = [ cmake pkg-config ]; 21 21 ··· 26 26 "-DPYTHON_BINDINGS=ON" 27 27 ]; 28 28 29 + # Setuptools only accepts PEP 440 version strings. The "unstable" identifier 30 + # can not be used. Instead we pretend to be the 3.2 beta release. 29 31 postFixup = '' 30 32 cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py 31 33 from distutils.core import setup 32 34 33 35 setup( 34 36 name = 'pyopenbabel', 35 - version = '${version}', 37 + version = '3.2b1', 36 38 packages = ['openbabel'], 37 39 package_data = {'openbabel' : ['_openbabel.so']} 38 40 )
+1 -2
pkgs/development/python-modules/openbabel-bindings/default.nix
··· 1 1 { lib, openbabel, python, buildPythonPackage }: 2 2 3 3 buildPythonPackage rec { 4 - pname = "openbabel"; 5 - version = "3.1.1"; 4 + inherit (openbabel) pname version; 6 5 7 6 src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages"; 8 7