From 8aa74b8fa00f4081a8c7140cc0b7316a1766c151 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sat, 19 Jun 2021 10:41:20 +0300 Subject: [PATCH 1/2] maintainers: add lach Signed-off-by: Yaroslav Bolyukin --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8e18d02698e9..74b96e0f525a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5653,6 +5653,16 @@ githubId = 72546287; name = "L3af"; }; + lach = { + email = "iam@lach.pw"; + github = "CertainLach"; + githubId = 6235312; + keys = [{ + longkeyid = "rsa3072/40B5D6948143175F"; + fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; + }]; + name = "Yaroslav Bolyukin"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; From be9ef6c5480ae622fa7c20a3049580cae32ee52b Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sat, 19 Jun 2021 10:44:19 +0300 Subject: [PATCH 2/2] jrsonnet: init at 0.3.8 Signed-off-by: Yaroslav Bolyukin --- .../compilers/jrsonnet/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/jrsonnet/default.nix diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix new file mode 100644 index 000000000000..82e15db66858 --- /dev/null +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jrsonnet"; + version = "0.3.8"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "CertainLach"; + repo = "jrsonnet"; + sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + }; + + postInstall = '' + ln -s $out/bin/jrsonnet $out/bin/jsonnet + ''; + + cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + + meta = { + description = "Purely-functional configuration language that helps you define JSON data"; + maintainers = with lib.maintainers; [ lach ]; + license = lib.licenses.mit; + homepage = "https://github.com/CertainLach/jrsonnet"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac556661c1ad..7e8fdbeeeabf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15766,6 +15766,8 @@ in jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; + jrsonnet = callPackage ../development/compilers/jrsonnet { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };