Merge staging-next into staging (385b5fff) · Commits · nix / nixpkgs

pkgs/by-name/gd/gdal/package.nix

+2 −15

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		stdenv,
		callPackage,
		fetchFromGitHub,
		fetchpatch,

		useMinimalFeatures ? false,
		useArmadillo ? (!useMinimalFeatures),
		@@ -84,27 +83,15 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
		version = "3.11.0";
		version = "3.11.3";

		src = fetchFromGitHub {
		owner = "OSGeo";
		repo = "gdal";
		tag = "v${finalAttrs.version}";
		hash = "sha256-8HcbA9Cj2i6DuqcJGiwqd6GkqbJP9oLdmA34g7kc/ng=";
		hash = "sha256-3C/gJejqfdT5pVNej2KlIdbOKZbYJY7jUFTfLsRoeQk=";
		};

		patches = [
		# https://github.com/OSGeo/gdal/issues/12511
		(fetchpatch {
		url = "https://github.com/OSGeo/gdal/commit/1dd320b086606958fe970457a0640bdc4c4d494a.patch";
		hash = "sha256-SXlNjgR4q7i3PrFfh/wzEFMrSGHQuB+ecXbGJgsROe0=";
		})
		(fetchpatch {
		url = "https://github.com/OSGeo/gdal/commit/6da26aec591656f97fd882b07d37c21aabd06373.patch";
		hash = "sha256-s70j/S9YKGRqxwrabsV3ePeGSsnDh/ouGLtLEm+z0lU=";
		})
		];

		nativeBuildInputs = [
		bison
		cmake

pkgs/by-name/im/immich-cli/package.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "immich-cli";
		version = "2.2.90";
		version = "2.2.92";
		inherit (immich) src pnpmDeps;

		postPatch = ''

pkgs/by-name/im/immich/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		}:
		let
		pnpm = pnpm_10;
		version = "1.142.1";
		version = "1.143.1";

		esbuild' = buildPackages.esbuild.override {
		buildGoModule =
		@@ -108,14 +108,14 @@ let
		owner = "immich-app";
		repo = "immich";
		tag = "v${version}";
		hash = "sha256-u538GWupnkH2K81Uk9yEuHc3pAeVexnJOnhWo7gElL0=";
		hash = "sha256-lP/IrKV2B1Gq43jqVa1hIpx4HOJoiYBDUOvyTJB0t7k=";
		};

		pnpmDeps = pnpm.fetchDeps {
		pname = "immich";
		inherit version src;
		fetcherVersion = 2;
		hash = "sha256-aYG5SpFZxhbz32YAdP39RYwn2GV+mFWhddd4IFuPuz8=";
		hash = "sha256-ShKgfsYc9n+B+NnSaJOSyLb4ev43ZsympYhRgPZtlxs=";
		};

		web = stdenv.mkDerivation {

pkgs/by-name/li/libLAS/package.nix

+29 −13

Original line number	Diff line number	Diff line
		@@ -12,12 +12,12 @@
		fixDarwinDylibNames,
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "libLAS";
		version = "1.8.1";

		src = fetchurl {
		url = "https://download.osgeo.org/liblas/libLAS-${version}.tar.bz2";
		url = "https://download.osgeo.org/liblas/libLAS-${finalAttrs.version}.tar.bz2";
		sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
		};

		@@ -44,41 +44,57 @@ stdenv.mkDerivation rec {
		url = "https://github.com/libLAS/libLAS/commit/e789d43df4500da0c12d2f6d3ac1d031ed835493.patch";
		hash = "sha256-0zI0NvOt9C5BPrfAbgU1N1kj3rZFB7rf0KRj7yemyWI=";
		})
		(fetchpatch {
		name = "set-macos-rpath-to-off-explicitly.patch";
		url = "https://github.com/libLAS/libLAS/commit/ce9bc0da9e5d1eb8527259854aa826df062ed18e.patch";
		hash = "sha256-Rse0p8bNgORNaw/EBbu0i2/iVmikFyeloJL8YkYarn0=";
		})
		(fetchpatch {
		name = "fix-findLASZIP.patch";
		url = "https://github.com/libLAS/libLAS/commit/be77a75f475ec8d59c0dae1c3c896289bcb5a287.patch";
		hash = "sha256-5XDexk3IW7s2/G27GXkWp7cw1WZyQLMk/lTpfOM6PM0=";
		})
		];

		# Disable setting of C++98 standard which was dropped in boost 1.84.0
		postPatch = ''
		substituteInPlace CMakeLists.txt \
		--replace-fail 'set(CMAKE_CXX_FLAGS "''${CMAKE_CXX_FLAGS} -std=c++98 -ansi")' '#'
		''
		# Upstream libLAS still uses cmake_minimum_required(VERSION 2.8.11).
		# This is not compatible with CMake 4, because support for CMake < 3.5 has been removed.
		+ ''
		substituteInPlace CMakeLists.txt \
		--replace-fail 'cmake_minimum_required(VERSION 2.6.0)' 'cmake_minimum_required(VERSION 3.10)'
		'';

		nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

		buildInputs = [
		boost
		libgeotiff
		libtiff
		# libLAS is currently not compatible with LASzip 3,
		# see https://github.com/libLAS/libLAS/issues/144.
		laszip_2
		zlib
		];

		cmakeFlags = [
		"-DWITH_LASZIP=ON"
		# libLAS is currently not compatible with LASzip 3,
		# see https://github.com/libLAS/libLAS/issues/144.
		"-DLASZIP_INCLUDE_DIR=${laszip_2}/include"
		"-DCMAKE_EXE_LINKER_FLAGS=-pthread"
		(lib.cmakeBool "WITH_LASZIP" true)
		(lib.cmakeFeature "CMAKE_EXE_LINKER_FLAGS" "-pthread")
		];

		postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
		install_name_tool -change "@rpath/liblas.3.dylib" "$out/lib/liblas.3.dylib" $out/lib/liblas_c.dylib
		'';

		meta = with lib; {
		meta = {
		description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
		homepage = "https://liblas.org";
		license = licenses.bsd3;
		platforms = platforms.unix;
		maintainers = with maintainers; [ michelk ];
		teams = [ teams.geospatial ];
		license = lib.licenses.bsd3;
		platforms = lib.platforms.unix;
		maintainers = with lib.maintainers; [ michelk ];
		teams = with lib.teams; [ geospatial ];
		};
		}
		})

pkgs/by-name/ma/mapserver/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,13 +30,13 @@

		stdenv.mkDerivation rec {
		pname = "mapserver";
		version = "8.4.0";
		version = "8.4.1";

		src = fetchFromGitHub {
		owner = "MapServer";
		repo = "MapServer";
		rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
		hash = "sha256-XEjRklbvYV7UoVX12iW6s1mS8pzIljla488CQNuFfto=";
		hash = "sha256-Q5PFOA/UGpDbzS0yROBOY6eXSgzx7nzSC+P109FrhvA=";
		};

		nativeBuildInputs = [