Merge master into staging-next (35dfa871) · Commits · nix / nixpkgs

pkgs/by-name/ge/gemini-cli-bin/package.nix

+1 −5

Original line number	Diff line number	Diff line
		@@ -15,11 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
		hash = "sha256-SRtl8FPMI0VBz0hzmyvtGYPO3mdnm60gu2zlStb5r98=";
		};

		phases = [
		"installPhase"
		"fixupPhase"
		"installCheckPhase"
		];
		dontUnpack = true;

		strictDeps = true;

+3 −3

Original line number	Diff line number	Diff line
		@@ -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 = ''

+2 −2

Original line number	Diff line number	Diff line
		@@ -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";

+6 −0

Original line number	Diff line number	Diff line
		@@ -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

+14 −2

Original line number	Diff line number	Diff line
		@@ -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 = [