bloop 1.6.0 from nixpkgs/master

ornicar · Jul 14, 2024 · 02c58b0 · 02c58b0
1 parent c8d892b
commit 02c58b0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 65 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-pkgs: { thibloop = pkgs.callPackage ./thibloop.nix { }; }
+pkgs: { }
diff --git a/pkgs/thibloop.nix b/pkgs/thibloop.nix
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		pkgs: { thibloop = pkgs.callPackage ./thibloop.nix { }; }
		pkgs: { }