Merge commit 'd8fe5e6c'

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 14 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/applications/misc/stog/asy.nix b/nixpkgs/pkgs/applications/misc/stog/asy.nix
new file mode 100644
index 000000000000..58f1cf35f4d4
--- /dev/null
+++ b/nixpkgs/pkgs/applications/misc/stog/asy.nix
@@ -0,0 +1,14 @@
+{ buildDunePackage, stog, ocf_ppx }:
+
+buildDunePackage {
+  pname = "stog_asy";
+
+  inherit (stog) version src;
+
+  buildInputs = [ ocf_ppx ];
+  propagatedBuildInputs = [ stog ];
+
+  meta = stog.meta // {
+    description = "Stog plugin to include Asymptote results in documents";
+  };
+}