From ad99f94c466c9ac2e15c35c753a7ce2e070c8723 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Wed, 12 Jun 2024 08:01:50 +0200 Subject: [PATCH] LASzip{,2}: rename to laszip{,_2} --- pkgs/applications/graphics/cloudcompare/default.nix | 4 ++-- .../LASzip/default.nix => by-name/la/laszip/package.nix} | 2 +- .../LASzip2.nix => by-name/la/laszip_2/package.nix} | 8 ++++---- pkgs/development/libraries/libLAS/default.nix | 6 +++--- pkgs/development/libraries/pdal/default.nix | 4 ++-- pkgs/development/python-modules/laszip/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 --- pkgs/top-level/python-packages.nix | 1 + 9 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/{development/libraries/LASzip/default.nix => by-name/la/laszip/package.nix} (97%) rename pkgs/{development/libraries/LASzip/LASzip2.nix => by-name/la/laszip_2/package.nix} (84%) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index f66189e0c75c..eac82182f61d 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -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 diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/by-name/la/laszip/package.nix similarity index 97% rename from pkgs/development/libraries/LASzip/default.nix rename to pkgs/by-name/la/laszip/package.nix index ee6e74aa7bc2..65c2e6934a24 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/by-name/la/laszip_2/package.nix similarity index 84% rename from pkgs/development/libraries/LASzip/LASzip2.nix rename to pkgs/by-name/la/laszip_2/package.nix index 4f63dfe8059c..8af9cae261fe 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/by-name/la/laszip_2/package.nix @@ -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; }; -} +}) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 195f77d19231..4b00de811573 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -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" ]; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 86d976531cb3..6e7d1ccabef5 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -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 diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index bd9a89ce2414..97c268d956ba 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -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; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..c4e8770cf3c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..b3d87f4b4b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 483cb05e6996..308a5259c2cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };