Merge pull request #76 from Ma27/flake-input-updates

Ma27 · web-flow · commit 2a21f16887fe · 2022-01-31T00:36:32.000+01:00
flake: Bump `nixpkgs` &amp; `flake-utils`
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -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";
   };
 
@@ -19,7 +19,7 @@
           pname = "rnix-lsp";
           root = ./.;
           doCheck = true;
-          checkInputs = [ pkgs.nixUnstable ];
+          checkInputs = [ pkgs.nix_2_4 ];
         };
         defaultPackage = packages.rnix-lsp;
 
diff --git a/src/lookup.rs b/src/lookup.rs
@@ -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 {
