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

2 files changed, 76 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix b/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix
new file mode 100644
index 000000000000..28d7631e396a
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/ma/mariadb-connector-java/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, maven
+, fetchFromGitHub
+, nix-update-script
+}:
+
+maven.buildMavenPackage rec {
+  pname = "mariadb-connector-java";
+  version = "3.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mariadb-corporation";
+    repo = "mariadb-connector-j";
+    rev = "refs/tags/${version}";
+    hash = "sha256-JuMm01ihgVoKpe8wyuUIDyzSxMODRg7dQpTCyVA/K10=";
+  };
+
+  mvnHash = "sha256-Px4Qxb1tTvRKZum1xfe0mdX+EyimnyyfzrydiaDaYRo=";
+
+  # Disable tests because they require networking
+  mvnParameters = "-DskipTests";
+
+  installPhase = ''
+    runHook preInstall
+    install -m444 -D target/mariadb-java-client-${version}.jar $out/share/java/mariadb-java-client.jar
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases";
+    homepage = "https://mariadb.com/kb/en/about-mariadb-connector-j/";
+    changelog = "https://mariadb.com/kb/en/mariadb-connector-j-release-notes/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ anthonyroussel ];
+    platforms = platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix b/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix
new file mode 100644
index 000000000000..d15f6bf67b62
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/ma/mathjax-node-cli/package.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+, fetchpatch
+}:
+
+buildNpmPackage rec {
+  pname = "mathjax-node-cli";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "mathjax";
+    repo = "mathjax-node-cli";
+    rev = version;
+    hash = "sha256-jFSn/Ftm1iNOAmMadHYfy2jm0H/+hP2XCyyNbJqfhkY=";
+  };
+
+  patches = [
+    # https://github.com/mathjax/mathjax-node-cli/pull/20
+    (fetchpatch {
+      name = "add-package-lock.patch";
+      url = "https://github.com/mathjax/mathjax-node-cli/commit/ac304d896d840dc5004045f012abab40648d20fd.patch";
+      hash = "sha256-kIfxF5II/PHtzBhhMbO2RcEuZQCNFrLeAnL536WBXq8=";
+    })
+  ];
+
+  npmDepsHash = "sha256-gGTRr8CN6aP/T/jUqt4E53DYVaz7ykaoG519+3sPdXo=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "CLI tools for mathjax-node";
+    homepage = "https://github.com/mathjax/mathjax-node-cli";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ colinsane ];
+  };
+}