Skip to content
This repository was archived by the owner on Jan 25, 2024. It is now read-only.

flake: Bump nixpkgs & flake-utils #76

Merged
merged 2 commits into from
Jan 30, 2022
Merged

flake: Bump nixpkgs & flake-utils #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b3623
flake: Bump `nixpkgs` & `flake-utils`
Ma27 Jan 17, 2022
bf9671b
Temporarily disable problematic test on Darwin
Ma27 Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
inputs = {
naersk.url = "github:nix-community/naersk";
utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
naersk.inputs.nixpkgs.follows = "nixpkgs";
};

Expand All @@ -19,7 +19,7 @@
pname = "rnix-lsp";
root = ./.;
doCheck = true;
checkInputs = [ pkgs.nixUnstable ];
checkInputs = [ pkgs.nix_2_4 ];
};
defaultPackage = packages.rnix-lsp;

Expand Down
4 changes: 4 additions & 0 deletions src/lookup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ mod tests {
}

#[test]
// FIXME re-activate it again for macos as soon as
// https://github.com/NixOS/nix/issues/5884 / https://github.com/nix-community/rnix-lsp/issues/75
// is properly resolved
#[cfg_attr(target_os = "macos", ignore)]
fn test_provide_builtins() {
let root = rnix::parse("builtins.map (y: y)").node();
let mut app = App {
Expand Down