Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'

Conflicts:
	nixpkgs/nixos/modules/misc/documentation.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
	nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
	nixpkgs/pkgs/servers/mail/mailman/web.nix
	nixpkgs/pkgs/top-level/aliases.nix
	nixpkgs/pkgs/top-level/all-packages.nix
	nixpkgs/pkgs/top-level/impure.nix

1 files changed, 57 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libodb-sqlite/default.nix b/nixpkgs/pkgs/development/libraries/libodb-sqlite/default.nix
new file mode 100644
index 000000000000..467ae914087f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libodb-sqlite/default.nix
@@ -0,0 +1,57 @@
+{ lib, stdenv
+, build2
+, fetchurl
+, libodb
+, sqlite
+, enableShared ? !stdenv.hostPlatform.isStatic
+, enableStatic ? !enableShared
+}:
+stdenv.mkDerivation rec {
+  pname = "libodb-sqlite";
+  version = "2.5.0-b.21";
+
+  outputs = [ "out" "dev" "doc" ];
+
+  src = fetchurl {
+    url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
+    sha256 = "sha256-dxU8HyzowFGNYCrZIKrZEZDGi9zo3G0x3/L7nfQKo0Y=";
+  };
+
+  nativeBuildInputs = [
+    build2
+  ];
+  buildInputs = [
+    libodb
+  ];
+  propagatedBuildInputs = [
+    sqlite
+  ];
+
+  build2ConfigureFlags = [
+    "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
+  ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "SQLite ODB runtime library";
+    longDescription = ''
+      ODB is an object-relational mapping (ORM) system for C++. It provides
+      tools, APIs, and library support that allow you to persist C++ objects
+      to a relational database (RDBMS) without having to deal with tables,
+      columns, or SQL and without manually writing any of the mapping code.
+      For more information see:
+
+      http://www.codesynthesis.com/products/odb/
+
+      This package contains the SQLite ODB runtime library. Every application
+      that includes code generated for the SQLite database will need to link
+      to this library.
+    '';
+    homepage = "https://www.codesynthesis.com/products/odb/";
+    changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ r-burns ];
+    platforms = platforms.all;
+  };
+}