From 0f4da4a501dda1dd2c873baefe327fd548d16a7d Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Tue, 4 Jun 2019 14:36:25 +0200 Subject: [PATCH 1/4] bloop: 1.2.5 -> 1.3.2 --- .../development/tools/build-managers/bloop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index c20985f31dc..6ed6fe77405 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.2.5"; + version = "1.3.2"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,14 +16,14 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "19373fyb0g7irrdzb1vsjmyv5xj84qwbcfb6lm076px7wfyn0w1c"; + outputHash = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - nailgunCommit = "0c325237"; + nailgunCommit = "9327a60a"; buildInputs = [ jdk makeWrapper deps ]; @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { client = fetchurl { url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; - sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n"; + sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4"; }; zshCompletion = fetchurl { url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; - sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm"; + sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp"; }; installPhase = '' From 3bdd3b158ad15e1750e139660ec1fc24cb5c89f5 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Sat, 15 Jun 2019 12:11:40 +0200 Subject: [PATCH 2/4] bloop: refactor derivation to use subderivations This change prevents accidentally using cached version of dependencies when updating the version --- .../tools/build-managers/bloop/default.nix | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 6ed6fe77405..69f3dc7e033 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -3,6 +3,8 @@ let baseName = "bloop"; version = "1.3.2"; + nailgunCommit = "9327a60a"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py + deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -18,39 +20,53 @@ let outputHashAlgo = "sha256"; outputHash = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8"; }; + + client = stdenv.mkDerivation { + name = "${baseName}-client-${nailgunCommit}"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; + sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + cp $src $out + chmod +x $out + ''; + }; + + zsh = stdenv.mkDerivation { + name = "${baseName}-zshcompletion-${version}"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; + sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp"; + }; + + phases = [ "installPhase" ]; + + installPhase = ''cp $src $out''; + }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - nailgunCommit = "9327a60a"; - buildInputs = [ jdk makeWrapper deps ]; phases = [ "installPhase" ]; - client = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; - sha256 = "0z4as5ibmzkd145wsch9caiy4037bgg780gcf7pyns0cv9n955b4"; - }; - - zshCompletion = fetchurl { - url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; - sha256 = "09qq5888vaqlqan2jbs2qajz2c3ff13zj8r0x2pcxsqmvlqr02hp"; - }; - installPhase = '' mkdir -p $out/bin mkdir -p $out/share/zsh/site-functions - cp ${client} $out/bin/blp-client - cp ${zshCompletion} $out/share/zsh/site-functions/_bloop - chmod +x $out/bin/blp-client + ln -s ${zsh} $out/share/zsh/site-functions/_bloop makeWrapper ${jre}/bin/java $out/bin/blp-server \ --prefix PATH : ${lib.makeBinPath [ jdk ]} \ --add-flags "-cp $CLASSPATH bloop.Server" - makeWrapper $out/bin/blp-client $out/bin/bloop \ + makeWrapper ${client} $out/bin/bloop \ --prefix PATH : ${lib.makeBinPath [ python ]} ''; From d6b6015d3474590a6e1ea238255f904c866679ff Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Wed, 24 Jul 2019 15:39:08 +0200 Subject: [PATCH 3/4] bloop: get closer to standard bloop packaging --- nixos/modules/services/development/bloop.nix | 9 ++-- .../tools/build-managers/bloop/default.nix | 51 +++++++++---------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix index 56904b7c40e..5cb88cc49a1 100644 --- a/nixos/modules/services/development/bloop.nix +++ b/nixos/modules/services/development/bloop.nix @@ -25,10 +25,13 @@ in { systemd.user.services.bloop = { description = "Bloop Scala build server"; + environment = { + PATH = mkForce "${makeBinPath [ config.programs.java.package ]}"; + }; serviceConfig = { - Type = "simple"; - ExecStart = ''${pkgs.bloop}/bin/blp-server''; - Restart = "always"; + Type = "simple"; + ExecStart = ''${pkgs.bloop}/bin/bloop server''; + Restart = "always"; }; }; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 69f3dc7e033..ba842289dba 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -1,28 +1,12 @@ -{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }: +{ stdenv, lib, fetchurl, coursier, python, makeWrapper }: let baseName = "bloop"; version = "1.3.2"; nailgunCommit = "9327a60a"; # Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py - deps = stdenv.mkDerivation { - name = "${baseName}-deps-${version}"; - buildCommand = '' - export COURSIER_CACHE=$(pwd) - ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \ - -r "bintray:scalameta/maven" \ - -r "bintray:scalacenter/releases" \ - -r "https://oss.sonatype.org/content/repositories/staging" > deps - mkdir -p $out/share/java - cp $(< deps) $out/share/java/ - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "1npq02npk6qiwghgr3bqd1ala1kv8hwq1qkmyffvigcq7frkz4r8"; - }; - client = stdenv.mkDerivation { - name = "${baseName}-client-${nailgunCommit}"; + name = "${baseName}-client-${version}"; src = fetchurl { url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; @@ -31,10 +15,25 @@ let phases = [ "installPhase" ]; - installPhase = '' - cp $src $out - chmod +x $out + installPhase = ''cp $src $out''; + }; + + server = stdenv.mkDerivation { + name = "${baseName}-server-${version}"; + buildCommand = '' + mkdir -p $out/bin + + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier bootstrap ch.epfl.scala:bloop-frontend_2.12:${version} \ + -r "bintray:scalameta/maven" \ + -r "bintray:scalacenter/releases" \ + -r "https://oss.sonatype.org/content/repositories/staging" \ + --deterministic \ + -f --main bloop.Server -o $out/bin/blp-server ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "0k9zc9q793fkfwcssbkmzb0nxmgb99rwi0pjkqhvf719vmgvhc2a"; }; zsh = stdenv.mkDerivation { @@ -53,7 +52,7 @@ in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - buildInputs = [ jdk makeWrapper deps ]; + buildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; @@ -61,12 +60,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/zsh/site-functions + ln -s ${server}/bin/blp-server $out/blp-server ln -s ${zsh} $out/share/zsh/site-functions/_bloop - makeWrapper ${jre}/bin/java $out/bin/blp-server \ - --prefix PATH : ${lib.makeBinPath [ jdk ]} \ - --add-flags "-cp $CLASSPATH bloop.Server" - makeWrapper ${client} $out/bin/bloop \ + cp ${client} $out/bloop + chmod +x $out/bloop + makeWrapper $out/bloop $out/bin/bloop \ --prefix PATH : ${lib.makeBinPath [ python ]} ''; From 17c2f79e39ecfd7ef7e995a2c8397447f1f75d14 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Thu, 25 Jul 2019 09:24:25 +0200 Subject: [PATCH 4/4] bloop: allow specifying extra cli options --- nixos/modules/services/development/bloop.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix index 5cb88cc49a1..226718a9e80 100644 --- a/nixos/modules/services/development/bloop.nix +++ b/nixos/modules/services/development/bloop.nix @@ -9,6 +9,20 @@ let in { options.services.bloop = { + extraOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "-J-Xmx2G" + "-J-XX:MaxInlineLevel=20" + "-J-XX:+UseParallelGC" + ]; + description = '' + Specifies additional command line argument to pass to bloop + java process. + ''; + }; + install = mkOption { type = types.bool; default = false;