Skip to content

Commit 0412499

Browse files
committed
Remove from source ripgrep
1 parent 00f8e9d commit 0412499

File tree

3 files changed

+1
-31
lines changed

3 files changed

+1
-31
lines changed

flake.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
};
3333

3434
nixos-hardware.url = "github:nixos/nixos-hardware";
35-
36-
ripgrep = {
37-
url = "github:burntsushi/ripgrep";
38-
flake = false;
39-
};
4035
};
4136

4237
outputs =

home-manager/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ extraModules:
1313
./git.nix
1414
./fish.nix
1515
./starship.nix
16-
./ripgrep.nix
1716
inputs.nix-index-database.homeModules.nix-index
1817
]
1918
++ extraModules;
2019

2120
programs = {
2221
bat.enable = true;
2322
fd.enable = true;
23+
ripgrep.enable = true;
2424
home-manager.enable = true;
2525
nix-index-database.comma.enable = !pkgs.stdenv.hostPlatform.isRiscV;
2626
nix-index.enable = !pkgs.stdenv.hostPlatform.isRiscV;

home-manager/ripgrep.nix

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +0,0 @@
1-
{
2-
lib,
3-
pkgs,
4-
inputs,
5-
fromSource,
6-
...
7-
}:
8-
let
9-
# TODO: Remove at next ripgrep release
10-
package = pkgs.ripgrep.overrideAttrs {
11-
src = inputs.ripgrep;
12-
cargoDeps = pkgs.rustPlatform.importCargoLock {
13-
lockFile = "${inputs.ripgrep}/Cargo.lock";
14-
allowBuiltinFetchGit = true;
15-
};
16-
cargoHash = null;
17-
doCheck = false;
18-
};
19-
in
20-
{
21-
programs.ripgrep = {
22-
package = lib.mkIf fromSource package;
23-
enable = true;
24-
};
25-
}

0 commit comments

Comments
 (0)