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

Conflicts:
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 25 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/by-name/yj/yj/package.nix b/nixpkgs/pkgs/by-name/yj/yj/package.nix
new file mode 100644
index 000000000000..ae4597619583
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/yj/yj/package.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "yj";
+  version = "5.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sclevine";
+    repo = "yj";
+    rev = "v${version}";
+    hash = "sha256-lsn5lxtix5W7po6nzvGcHmifbyhrtHgvaKYT7RPPCOg=";
+  };
+
+  vendorHash = "sha256-NeSOoL9wtFzq6ba8ghseB6D+Qq8Z5holQExcAUbtYrs=";
+
+  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+
+  meta = with lib; {
+    description = "Convert YAML <=> TOML <=> JSON <=> HCL";
+    license = licenses.asl20;
+    mainProgram = "yj";
+    maintainers = with maintainers; [ Profpatsch ];
+    homepage = "https://github.com/sclevine/yj";
+  };
+}