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

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	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/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 60 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/vectorscan/default.nix b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix
new file mode 100644
index 000000000000..20fe3c93b9f1
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ragel
+, util-linux
+, python3
+, boost
+, enableShared ? !stdenv.hostPlatform.isStatic
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vectorscan";
+  version = "5.4.9";
+
+  src = fetchFromGitHub {
+    owner = "VectorCamp";
+    repo = "vectorscan";
+    rev = "vectorscan/${version}";
+    hash = "sha256-V5Qgr8aH1H+ZoJ0IZ52HIDRZq+yIwHjLf3gU/ZhjjlY=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ragel
+    util-linux
+    python3
+  ];
+
+  buildInputs = [
+    boost
+  ];
+
+  cmakeFlags = lib.optional enableShared "-DBUILD_STATIC_AND_SHARED=ON"
+    ++ [ "-DFAT_RUNTIME=${if stdenv.hostPlatform.isLinux then "ON" else "OFF"}" ]
+    ++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
+    ++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
+  ;
+
+  meta = with lib; {
+    description = "A portable fork of the high-performance regular expression matching library";
+    longDescription = ''
+      A fork of Intel's Hyperscan, modified to run on more platforms. Currently
+      ARM NEON/ASIMD is 100% functional, and Power VSX are in development.
+      ARM SVE2 will be implemented when hardware becomes accessible to the
+      developers. More platforms will follow in the future, on demand/request.
+
+      Vectorscan will follow Intel's API and internal algorithms where possible,
+      but will not hesitate to make code changes where it is thought of giving
+      better performance or better portability. In addition, the code will be
+      gradually simplified and made more uniform and all architecture specific
+      code will be abstracted away.
+    '';
+    homepage = "https://www.vectorcamp.gr/vectorscan/";
+    changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG.md";
+    platforms = platforms.unix;
+    license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ];
+    maintainers = with maintainers; [ tnias vlaci ];
+  };
+}