From d706fc953d0afe6bd060459f23f5e41a83c63a59 Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:50:31 +0100 Subject: [PATCH 1/4] sort maintainers.nix --- lib/maintainers.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 32ec8be0a688..2d33a34a5630 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -197,8 +197,8 @@ exlevan = "Alexey Levan "; expipiplus1 = "Joe Hermaszewski "; fadenb = "Tristan Helmich "; - fare = "Francois-Rene Rideau "; falsifian = "James Cook "; + fare = "Francois-Rene Rideau "; florianjacob = "Florian Jacob "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; @@ -290,12 +290,12 @@ jonafato = "Jon Banafato "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; - jyp = "Jean-Philippe Bernardy "; jraygauthier = "Raymond Gauthier "; jtojnar = "Jan Tojnar "; juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; jwilberding = "Jordan Wilberding "; + jyp = "Jean-Philippe Bernardy "; jzellner = "Jeff Zellner "; kaiha = "Kai Harries "; kamilchm = "Kamil Chmielewski "; @@ -335,6 +335,7 @@ lovek323 = "Jason O'Conal "; lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; + ltavard = "Laure Tavard "; lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; lufia = "Kyohei Kadota "; @@ -580,10 +581,9 @@ taku0 = "Takuo Yonezawa "; tari = "Peter Marheine "; tavyc = "Octavian Cerna "; - ltavard = "Laure Tavard "; teh = "Tom Hunger "; - teto = "Matthieu Coudron "; telotortium = "Robert Irelan "; + teto = "Matthieu Coudron "; thall = "Niclas Thall "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; @@ -612,6 +612,7 @@ #urkud = "Yury G. Kudryashov "; inactive since 2012 uwap = "uwap "; vaibhavsagar = "Vaibhav Sagar "; + valeriangalliat = "Valérian Galliat "; vandenoever = "Jos van den Oever "; vanschelven = "Klaas van Schelven "; vanzef = "Ivan Solyankin "; @@ -628,7 +629,6 @@ vlstill = "Vladimír Štill "; vmandela = "Venkateswara Rao Mandela "; vmchale = "Vanessa McHale "; - valeriangalliat = "Valérian Galliat "; volhovm = "Mikhail Volkhov "; volth = "Jaroslavas Pocepko "; vozz = "Oliver Hunt "; From d1aed97aa03cb1e28096a78a4dd90d0e56bdf9aa Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:50:51 +0100 Subject: [PATCH 2/4] maintainers.nix: add robertodr --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 2d33a34a5630..ebbb801d590d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -508,6 +508,7 @@ robberer = "Longrin Wischnewski "; robbinch = "Robbin C. "; roberth = "Robert Hensing "; + robertodr = "Roberto Di Remigio "; robgssp = "Rob Glossop "; roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; From 932bd985105a535d4f142449620a7df0f5a1de1b Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Mon, 25 Sep 2017 14:51:16 +0100 Subject: [PATCH 3/4] watson-ruby: init at 1.6.3 --- .../development/tools/misc/watson-ruby/Gemfile | 2 ++ .../tools/misc/watson-ruby/Gemfile.lock | 15 +++++++++++++++ .../tools/misc/watson-ruby/default.nix | 18 ++++++++++++++++++ .../tools/misc/watson-ruby/gemset.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 55 insertions(+) create mode 100644 pkgs/development/tools/misc/watson-ruby/Gemfile create mode 100644 pkgs/development/tools/misc/watson-ruby/Gemfile.lock create mode 100644 pkgs/development/tools/misc/watson-ruby/default.nix create mode 100644 pkgs/development/tools/misc/watson-ruby/gemset.nix diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile b/pkgs/development/tools/misc/watson-ruby/Gemfile new file mode 100644 index 000000000000..fc739389e84e --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'watson-ruby' diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock new file mode 100644 index 000000000000..fa157d794f73 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -0,0 +1,15 @@ +GEM + remote: https://rubygems.org/ + specs: + json (2.1.0) + watson-ruby (1.6.3) + json + +PLATFORMS + ruby + +DEPENDENCIES + watson-ruby + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix new file mode 100644 index 000000000000..860358354540 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "watson-ruby-${version}"; + + version = (import ./gemset.nix).watson-ruby.version; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + + meta = with lib; { + description = "An inline issue manager"; + homepage = http://goosecode.com/watson/; + license = with licenses; mit; + maintainers = with maintainers; [ robertodr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/watson-ruby/gemset.nix b/pkgs/development/tools/misc/watson-ruby/gemset.nix new file mode 100644 index 000000000000..a3bb144899c7 --- /dev/null +++ b/pkgs/development/tools/misc/watson-ruby/gemset.nix @@ -0,0 +1,18 @@ +{ + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; + watson-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d5m29nr0i030q8ygmbapwri5ndcg2q6lf8a15bk79lfcp9xyj9w"; + type = "gem"; + }; + version = "1.6.3"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ba0c3add19a..e13a15d1b01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7574,6 +7574,8 @@ with pkgs; pythonPackages = python3Packages; }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { From 407d8dac85e9a1901091955e078345ee9d5313c6 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 15:49:14 +0100 Subject: [PATCH 4/4] watson-ruby: hide bundlerEnv to avoid collisions bundlerEnv also comes with a bundle script and ruby libraries --- .../tools/misc/watson-ruby/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 860358354540..32f94a1f2285 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,14 +1,25 @@ -{ lib, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby }: -bundlerEnv rec { + +stdenv.mkDerivation rec { name = "watson-ruby-${version}"; - version = (import ./gemset.nix).watson-ruby.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - meta = with lib; { + env = bundlerEnv rec { + name = "watson-ruby-gems-${version}"; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + ln -s ${env}/bin/watson $out/bin/watson + ''; + + meta = with stdenv.lib; { description = "An inline issue manager"; homepage = http://goosecode.com/watson/; license = with licenses; mit;