LASzip{,2}: rename to laszip{,_2}

This commit is contained in:
Zitrone 2024-06-12 08:01:50 +02:00 committed by Zitrone
parent 6f35d8d794
commit ad99f94c46
No known key found for this signature in database
GPG Key ID: 54767E8E66ABED22
9 changed files with 17 additions and 17 deletions

View File

@ -11,7 +11,7 @@
, flann
, gdal
, gmp
, LASzip
, laszip
, mpfr
, pdal
, pcl
@ -48,7 +48,7 @@ mkDerivation rec {
flann
gdal
gmp
LASzip
laszip
mpfr
pdal
pcl

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation (finalAttrs: {
version = "3.4.3";
pname = "LASzip";
pname = "laszip";
src = fetchFromGitHub {
owner = "LASzip";

View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
version = "2.2.0";
pname = "LASzip";
pname = "laszip";
src = fetchFromGitHub {
owner = "LASzip";
repo = "LASzip";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA=";
};
@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.michelk ];
platforms = platforms.unix;
};
}
})

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libLAS";
@ -35,13 +35,13 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost libgeotiff libtiff LASzip2 ];
buildInputs = [ boost libgeotiff libtiff laszip_2 ];
cmakeFlags = [
"-DWITH_LASZIP=ON"
# libLAS is currently not compatible with LASzip 3,
# see https://github.com/libLAS/libLAS/issues/144.
"-DLASZIP_INCLUDE_DIR=${LASzip2}/include"
"-DLASZIP_INCLUDE_DIR=${laszip_2}/include"
"-DCMAKE_EXE_LINKER_FLAGS=-pthread"
];

View File

@ -10,7 +10,7 @@
, curl
, gdal
, hdf5-cpp
, LASzip
, laszip
, libe57format
, libgeotiff
, libtiff
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
curl
gdal
hdf5-cpp
LASzip
laszip
libgeotiff
libtiff
libxml2

View File

@ -7,7 +7,7 @@
scikit-build-core,
pybind11,
cmake,
LASzip,
laszip,
ninja,
pythonOlder,
}:
@ -48,7 +48,7 @@ buildPythonPackage rec {
dontUseCmakeConfigure = true;
buildInputs = [ LASzip ];
buildInputs = [ laszip ];
# There are no tests
doCheck = false;

View File

@ -640,6 +640,8 @@ mapAliases ({
### L ###
larynx = piper-tts; # Added 2023-05-09
LASzip = laszip; # Added 2024-06-12
LASzip2 = laszip_2; # Added 2024-06-12
latinmodern-math = lmmath;
ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26
ledger_agent = ledger-agent; # Added 2024-01-07

View File

@ -21648,9 +21648,6 @@ with pkgs;
LAStools = callPackage ../development/libraries/LAStools { };
LASzip = callPackage ../development/libraries/LASzip { };
LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { };
laurel = callPackage ../servers/monitoring/laurel/default.nix { };
lcm = callPackage ../development/libraries/lcm { };

View File

@ -6533,6 +6533,7 @@ self: super: with self; {
laszip = callPackage ../development/python-modules/laszip {
inherit (pkgs) cmake ninja;
inherit (pkgs.__splicedPackages) laszip;
};
latex2mathml = callPackage ../development/python-modules/latex2mathml { };