Skip to content

Commit d314250

Browse files
committed
Update flake locks
- This includes a newer Nix (2.35). - `nixfmt-rfc-style` is renamed to `nixfmt` now.
1 parent 4e54530 commit d314250

7 files changed

Lines changed: 17 additions & 17 deletions

File tree

dev/flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Development Environment for nil";
33

44
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
66
rust-overlay.url = "github:oxalica/rust-overlay";
77
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
88
};
@@ -49,7 +49,7 @@
4949
watchman # Required by coc.nvim for file watching.
5050

5151
jq
52-
nixfmt-rfc-style
52+
nixfmt
5353
(import ./nvim-lsp.nix { inherit pkgs; })
5454
(import ./vim-coc.nix { inherit pkgs; })
5555
(import ./vim-lsp.nix { inherit pkgs; })

dev/pre-push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -eu
3-
# Requires: [ git nixfmt-rfc-style fd typos ], rust toolchain, npm toolchain
3+
# Requires: [ git nixfmt fd typos ], rust toolchain, npm toolchain
44

55
die() { echo "$*" >&2; exit 1; }
66

dev/vim-coc.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ let
9595
};
9696

9797
in
98-
pkgs.vim_configurable.customize {
98+
pkgs.vim-full.customize {
9999
name = "vim-coc";
100100
vimrcConfig = {
101101
inherit customRC;

dev/vim-lsp.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
pkgs ? import <nixpkgs> { },
33
}:
4-
pkgs.vim_configurable.customize {
4+
pkgs.vim-full.customize {
55
name = "vim-lsp";
66

77
vimrcConfig = {

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rec {
2626
{
2727
rustPlatform,
2828
nixVersions,
29-
nixfmt-rfc-style,
29+
nixfmt,
3030
...
3131
}:
3232
rustPlatform.buildRustPackage {
@@ -42,7 +42,7 @@ rec {
4242
nativeBuildInputs = [ (nixVersions.latest or nixVersions.unstable) ];
4343

4444
CFG_RELEASE = "git-${rev}";
45-
CFG_DEFAULT_FORMATTER = lib.getExe nixfmt-rfc-style;
45+
CFG_DEFAULT_FORMATTER = lib.getExe nixfmt;
4646

4747
meta = {
4848
inherit description;

0 commit comments

Comments
 (0)