diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 510067755873..0bfcfba4e323 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -15,11 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-SRtl8FPMI0VBz0hzmyvtGYPO3mdnm60gu2zlStb5r98="; }; - phases = [ - "installPhase" - "fixupPhase" - "installCheckPhase" - ]; + dontUnpack = true; strictDeps = true; diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index 395efce61d3b..26692e8ae380 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "lasuite-meet-frontend"; - version = "0.1.36"; + version = "0.1.40"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-0GfbB1Kk2AdqQtwIiAdyfDS/V7le6DhmBugp1ukWRLc="; + hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE="; }; sourceRoot = "source/src/frontend"; @@ -21,7 +21,7 @@ buildNpmPackage rec { npmDeps = fetchNpmDeps { inherit version src; sourceRoot = "source/src/frontend"; - hash = "sha256-EHBfmP94hGx4gpvVZi4hHpJc7edq+cybkum3foL+dAk="; + hash = "sha256-RtzLa0SPd76/8ml8R55Hx1MMwFcfDIt6wtcjKAGMDuI="; }; buildPhase = '' diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 1a98c493ddb8..8ea69995ee86 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -13,14 +13,14 @@ in python.pkgs.buildPythonApplication rec { pname = "lasuite-meet"; - version = "0.1.36"; + version = "0.1.40"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-0GfbB1Kk2AdqQtwIiAdyfDS/V7le6DhmBugp1ukWRLc="; + hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE="; }; sourceRoot = "source/src/backend"; diff --git a/pkgs/by-name/se/seafile-client/package.nix b/pkgs/by-name/se/seafile-client/package.nix index 5176360e215b..ad7d29ff1629 100644 --- a/pkgs/by-name/se/seafile-client/package.nix +++ b/pkgs/by-name/se/seafile-client/package.nix @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.10)' + ''; + nativeBuildInputs = [ libuuid pkg-config diff --git a/pkgs/development/python-modules/geoarrow-c/default.nix b/pkgs/development/python-modules/geoarrow-c/default.nix index c6832a88715a..ae46efd013bb 100644 --- a/pkgs/development/python-modules/geoarrow-c/default.nix +++ b/pkgs/development/python-modules/geoarrow-c/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { pname = "geoarrow-c"; - version = "0.1.3"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,17 +21,29 @@ buildPythonPackage rec { repo = "geoarrow-c"; owner = "geoarrow"; tag = "geoarrow-c-python-${version}"; - hash = "sha256-kQCD3Vptl7GtRFigr4darvdtwnaHRLZWvBBpZ0xHMgM="; + hash = "sha256-cSvFCIMHuwDh83DT3R3V86S+RjPzhqcnTaFXqKL43Ns="; }; sourceRoot = "${src.name}/python/geoarrow-c"; + preConfigure = '' + export CFLAGS="-I../../src/src/geoarrow" + ''; + build-system = [ cython setuptools setuptools-scm ]; + # upstream needs a bootstrap.py file to copy some source around to build the project. + # This file is executed by setup.py, so at build time, when sources are readonly! + # So we execute this file at patch time instead, and remove it to prevent setup.py to execute it again. + postPatch = '' + python ./bootstrap.py + rm -v ./bootstrap.py + ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/geoarrow-pandas/default.nix b/pkgs/development/python-modules/geoarrow-pandas/default.nix index 3ade7c417748..13ce64540391 100644 --- a/pkgs/development/python-modules/geoarrow-pandas/default.nix +++ b/pkgs/development/python-modules/geoarrow-pandas/default.nix @@ -7,6 +7,7 @@ pandas, pyarrow, geoarrow-pyarrow, + geoarrow-types, setuptools-scm, }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { dependencies = [ geoarrow-pyarrow + geoarrow-types pandas pyarrow ]; @@ -49,5 +51,9 @@ buildPythonPackage rec { cpcloud ]; teams = [ lib.teams.geospatial ]; + # its removal upstream is in question + # https://github.com/geoarrow/geoarrow-python/issues/75 + # please unbreak it if the author decides to release a new version + broken = true; }; } diff --git a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix index 371c6b2614e1..87ac659eeacb 100644 --- a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix +++ b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix @@ -9,6 +9,7 @@ pyarrow-hotfix, numpy, pandas, + geoarrow-types, geopandas, pyogrio, pyproj, @@ -16,7 +17,7 @@ }: buildPythonPackage rec { pname = "geoarrow-pyarrow"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { repo = "geoarrow-python"; owner = "geoarrow"; tag = "geoarrow-pyarrow-${version}"; - hash = "sha256-Ni+GKTRhRDRHip1us3OZPuUhHQCNU7Nap865T/+CU8Y="; + hash = "sha256-tgeWrVpGIyRqRGk1y9OdS/eYMJjt80sXHt6VCx8RWys="; }; sourceRoot = "${src.name}/geoarrow-pyarrow"; @@ -57,6 +58,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ + geoarrow-types numpy pandas geopandas diff --git a/pkgs/development/python-modules/geoarrow-types/default.nix b/pkgs/development/python-modules/geoarrow-types/default.nix index e0b2fdb36387..6b142da9cfba 100644 --- a/pkgs/development/python-modules/geoarrow-types/default.nix +++ b/pkgs/development/python-modules/geoarrow-types/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "geoarrow-types"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "geoarrow-python"; owner = "geoarrow"; tag = "geoarrow-types-${version}"; - hash = "sha256-LySb4AsRuSirDJ73MAPpnMwPM2WFfG6X82areR4Y4lI="; + hash = "sha256-ciElwh94ukFyFdOBuQWyOUVpn4jBM1RKfxiBCcM+nmE="; }; sourceRoot = "${src.name}/geoarrow-types"; @@ -29,6 +29,9 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + ]; + + checkInputs = [ pyarrow ];