From 02c58b030d6f4cd9e890dc43eabfd35e941ca78d Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <t@lichess.org>
Date: Sun, 14 Jul 2024 09:42:49 +0200
Subject: [PATCH] bloop 1.6.0 from nixpkgs/master

---
 flake.nix               |  1 +
 home/modules/coding.nix |  2 +-
 home/services/bloop.nix |  2 +-
 overlays/default.nix    |  2 ++
 pkgs/default.nix        |  2 +-
 pkgs/thibloop.nix       | 62 -----------------------------------------
 6 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/thibloop.nix

diff --git a/flake.nix b/flake.nix
index dce091b8..c186d1c7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
     nixpkgs-mongodb-pin.url =
       "github:NixOS/nixpkgs/e913ae340076bbb73d9f4d3d065c2bca7caafb16";
diff --git a/home/modules/coding.nix b/home/modules/coding.nix
index 238480eb..9bed7719 100644
--- a/home/modules/coding.nix
+++ b/home/modules/coding.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
 
-  home.packages = with pkgs; [ thibloop ];
+  home.packages = with pkgs; [ bloop ];
 
   home.sessionVariables = {
     # for lila/ui/build to find the sass executable
diff --git a/home/services/bloop.nix b/home/services/bloop.nix
index 88026d13..835f6355 100644
--- a/home/services/bloop.nix
+++ b/home/services/bloop.nix
@@ -4,7 +4,7 @@
     Service = {
       Environment =
         [ "PATH=${lib.makeBinPath [ config.programs.java.package ]}" ];
-      ExecStart = "${pkgs.thibloop}/bin/thibloop server";
+      ExecStart = "${pkgs.bloop}/bin/bloop server";
       ExecStop = "${pkgs.psmisc}/bin/fuser -k 8212/tcp -TERM";
     };
     Install = { WantedBy = [ "default.target" ]; };
diff --git a/overlays/default.nix b/overlays/default.nix
index da13d419..0f6a4388 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -13,6 +13,8 @@
       config.allowUnfree = true;
     }).mongodb-6_0;
 
+    bloop = (import inputs.nixpkgs-master { system = final.system; }).bloop;
+
     # bloop = prev.bloop.overrideAttrs (previousAttrs: {
     #   version = "1.6.0-3";
     #   bloop-binary = prev.fetchurl {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 597684b4..2fb07e06 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1 +1 @@
-pkgs: { thibloop = pkgs.callPackage ./thibloop.nix { }; }
+pkgs: { }
diff --git a/pkgs/thibloop.nix b/pkgs/thibloop.nix
deleted file mode 100644
index 771a369d..00000000
--- a/pkgs/thibloop.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl, autoPatchelfHook, installShellFiles, makeWrapper, jre, lib
-, zlib }:
-
-stdenv.mkDerivation rec {
-  pname = "thibloop";
-  version = "1.6.0-2";
-
-  platform = "x86_64-pc-linux";
-
-  # bloop-bash = fetchurl {
-  #   url =
-  #     "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";
-  #   sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";
-  # };
-  #
-  # bloop-fish = fetchurl {
-  #   url =
-  #     "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";
-  #   sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";
-  # };
-  #
-  # bloop-zsh = fetchurl {
-  #   url =
-  #     "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";
-  #   sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";
-  # };
-
-  thibloop-binary = fetchurl {
-    url =
-      "https://github.com/scalacenter/bloop/releases/download/v1.6.0/bloop-x86_64-pc-linux";
-    sha256 = "sha256-f7ZmjDO8L3hcYkaxiwf5BBD44hBiBhNovylM4B308bI=";
-  };
-
-  dontUnpack = true;
-  nativeBuildInputs = [ installShellFiles makeWrapper ]
-    ++ lib.optional stdenv.isLinux autoPatchelfHook;
-  buildInputs = [ stdenv.cc.cc.lib zlib ];
-  propagatedBuildInputs = [ jre ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -D -m 0755 ${thibloop-binary} $out/thibloop
-
-    makeWrapper $out/thibloop $out/bin/thibloop
-
-    #Install completions
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://scalacenter.github.io/bloop/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.asl20;
-    description =
-      "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
-    mainProgram = "thibloop";
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ kubukoz tomahna ];
-  };
-}