From 49e0be1d4dbb005616d025b9105ed7c5031febe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= Date: Mon, 30 Oct 2017 00:09:00 +0100 Subject: [PATCH 1/2] joker: init at 0.8.6 --- lib/maintainers.nix | 1 + .../interpreters/joker/default.nix | 29 +++++++++++++++++++ pkgs/development/interpreters/joker/deps.nix | 11 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 43 insertions(+) create mode 100644 pkgs/development/interpreters/joker/default.nix create mode 100644 pkgs/development/interpreters/joker/deps.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c3a845c00c..ccdf1e5b7a5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -44,6 +44,7 @@ anderspapitto = "Anders Papitto "; andir = "Andreas Rammhold "; andres = "Andres Loeh "; + andrestylianos = "Andre S. Ramos "; andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix new file mode 100644 index 00000000000..a0302b5530d --- /dev/null +++ b/pkgs/development/interpreters/joker/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "joker-${version}"; + version = "0.8.6"; + + goPackagePath = "github.com/candid82/joker"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "candid82"; + repo = "joker"; + sha256 = "0m6xi1jgss6f4maxqpwjyyhyyc71wy5a7jpm908m49xx80mz5ams"; + }; + + preBuild = "go generate ./..."; + + dontInstallSrc = true; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/candid82/joker; + description = "A small Clojure interpreter and linter written in Go"; + license = licenses.epl10; + platforms = platforms.all; + maintainers = with maintainers; [ andrestylianos ]; + }; +} diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix new file mode 100644 index 00000000000..d5cc0bc44b0 --- /dev/null +++ b/pkgs/development/interpreters/joker/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "6a4bc7b4feaeff8feb63f87d5fb2cf3e3610a559"; + sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 596051f4ea7..ca40870e48c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6451,6 +6451,8 @@ with pkgs; jmeter = callPackage ../applications/networking/jmeter {}; + joker = callPackage ../development/interpreters/joker {}; + davmail = callPackage ../applications/networking/davmail {}; kanif = callPackage ../applications/networking/cluster/kanif { }; From a167ea6875ed48aab6c4e9cfc537a772b7e7484b Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 4 Nov 2017 07:03:06 +0000 Subject: [PATCH 2/2] joker: do not install private generators --- pkgs/development/interpreters/joker/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index a0302b5530d..8906c9c5d24 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -17,6 +17,8 @@ buildGoPackage rec { dontInstallSrc = true; + excludedPackages = "gen"; # Do not install private generators. + goDeps = ./deps.nix; meta = with stdenv.lib; {