Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

1 files changed, 27 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
index 36208fc09a81..1fa8a216e4dd 100644
--- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix
@@ -1,20 +1,25 @@
-{lib, stdenv, fetchFromGitHub, cmake}:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, buildExamples ? false
+}:
 
-stdenv.mkDerivation rec {
-  version = "1.4.3";
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.5.0";
   pname = "nanoflann";
 
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";
-    rev = "v${version}";
-    sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-vPLL6l4sFRi7nvIfdMbBn/gvQ1+1lQHlZbR/2ok0Iw8=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DBUILD_EXAMPLES=OFF"
+    "-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}"
   ];
 
   doCheck = true;
@@ -22,8 +27,22 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://github.com/jlblancoc/nanoflann";
-    license = lib.licenses.bsd2;
     description = "Header only C++ library for approximate nearest neighbor search";
+    longDescription = ''
+      nanoflann is a C++11 header-only library for building KD-Trees of datasets
+      with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and
+      3D rotation groups). No support for approximate NN is provided. nanoflann
+      does not require compiling or installing. You just need to #include
+      <nanoflann.hpp> in your code.
+
+      This library is a fork of the flann library by Marius Muja and David
+      G. Lowe, and born as a child project of MRPT. Following the original
+      license terms, nanoflann is distributed under the BSD license. Please, for
+      bugs use the issues button or fork and open a pull request.
+    '';
+    changelog = "https://github.com/jlblancoc/nanoflann/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.unix;
   };
-}
+})