Stop bootstrapping rnix-lsp as it is unmaintained

Also allow the possibility of not including buildInputs in a shell, since it's now
possible to not require anything from nixpkgs.

.last-exported-commit

@@ -1 +1 @@
-Last exported commit from parent repo: 6a71c253c9cb6e804e58f923f3c294ea164c99e1
+Last exported commit from parent repo: 67d50f90e5ca6530f4799983c0b11245988a6c3c

nix-bootstrap.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        1.5.5.3
+version:        1.5.6.0
 author:         gchquser
 maintainer:     [email protected]
 copyright:      Crown Copyright

package.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: nix-bootstrap
-version: 1.5.5.3
+version: 1.5.6.0
 author: gchquser
 maintainer: [email protected]
 copyright: Crown Copyright

src/Bootstrap/Data/Bootstrappable/NixShell.hs

@@ -145,7 +145,7 @@ nixShellFor RunConfig {rcUseFlakes} projectType preCommitHooksConfig nixPreCommi
             . fmap EIdent
     nixpkgsBuildInputsFor :: ProjectType -> [Expr]
     nixpkgsBuildInputsFor =
-      sortBy compareBuildInputs . (([nix|rnix-lsp|] : [[nix|niv|] | not rcUseFlakes]) <>) . \case
+      sortBy compareBuildInputs . (([[nix|niv|] | not rcUseFlakes]) <>) . \case
         Minimal -> []
         Elm elmOptions ->
           [ [nix|elmPackages.elm|],

src/Bootstrap/Nix/Expr/BuildInputs.hs

@@ -56,29 +56,33 @@ data BuildInputSpec projectType = BuildInputSpec
 buildInputsBindings :: HasProjectSuperType t => BuildInputSpec t -> [Binding]
 buildInputsBindings spec@BuildInputSpec {bisNativeNixpkgsPackages} =
   catMaybes
-    [ Just $ [nixproperty|buildInputs|] |= foldr (|++) buildInputGroupExpr1 otherBuildInputGroupExprs,
+    [ case buildInputGroupExprs of
+        [] -> Nothing
+        [buildInputGroupExpr1] ->
+          Just $ [nixproperty|buildInputs|] |= buildInputGroupExpr1
+        (buildInputGroupExpr1 : otherBuildInputGroupExprs) ->
+          Just $ [nixproperty|buildInputs|] |= foldr (|++) buildInputGroupExpr1 otherBuildInputGroupExprs,
       if null bisNativeNixpkgsPackages
         then Nothing
         else Just $ [nixproperty|nativeBuildInputs|] |= groupToExpr (BIGNativeNixpkgsInputs bisNativeNixpkgsPackages)
     ]
   where
-    buildInputGroups :: NonEmpty BuildInputGroup
+    buildInputGroups :: [BuildInputGroup]
     buildInputGroups = buildInputGroupsFor spec
     groupPackageSets :: Bool
     groupPackageSets = length buildInputGroups > 1
     groupToExpr :: BuildInputGroup -> Expr
     groupToExpr g = (if groupPackageSets && requiresGrouping g then EGrouping else id) (toNixExpr g)
-    buildInputGroupExpr1 :: Expr
-    otherBuildInputGroupExprs :: [Expr]
-    (buildInputGroupExpr1 :| otherBuildInputGroupExprs) = groupToExpr <$> buildInputGroups
+    buildInputGroupExprs :: [Expr]
+    buildInputGroupExprs = groupToExpr <$> buildInputGroups
 
-buildInputGroupsFor :: HasProjectSuperType t => BuildInputSpec t -> NonEmpty BuildInputGroup
+buildInputGroupsFor :: HasProjectSuperType t => BuildInputSpec t -> [BuildInputGroup]
 buildInputGroupsFor BuildInputSpec {..} =
-  BIGNixpkgs bisNixpkgsPackages
-    :| catMaybes
-      [ if unPreCommitHooksConfig bisPreCommitHooksConfig then Just BIGPreCommitHooks else Nothing,
-        if projectSuperType bisProjectType == PSTPython then Just BIGPythonPackages else Nothing,
-        case bisOtherPackages of
-          [] -> Nothing
-          otherPackages -> Just $ BIGOther otherPackages
-      ]
+  catMaybes
+    [ if null bisNixpkgsPackages then Nothing else Just (BIGNixpkgs bisNixpkgsPackages),
+      if unPreCommitHooksConfig bisPreCommitHooksConfig then Just BIGPreCommitHooks else Nothing,
+      if projectSuperType bisProjectType == PSTPython then Just BIGPythonPackages else Nothing,
+      case bisOtherPackages of
+        [] -> Nothing
+        otherPackages -> Just $ BIGOther otherPackages
+    ]

test/Bootstrap/Data/Bootstrappable/FlakeNixSpec.hs

@@ -49,11 +49,7 @@ spec = describe "flake.nix rendering" do
     in {
       devShell = self.devShells.${system}.default;
       devShells.default = nixpkgs.mkShell {
-        buildInputs = with nixpkgs; [
-          awscli2
-          nodejs
-          rnix-lsp
-        ];
+        buildInputs = with nixpkgs; [awscli2 nodejs];
       };
     });
 }
@@ -88,7 +84,6 @@ spec = describe "flake.nix rendering" do
           awscli2
           nodePackages.pnpm
           nodejs
-          rnix-lsp
         ];
       };
     });
@@ -137,13 +132,7 @@ spec = describe "flake.nix rendering" do
       checks.pre-commit-check = preCommitHooks.pureHooks;
       devShell = self.devShells.${system}.default;
       devShells.default = nixpkgs.mkShell {
-        buildInputs =
-          preCommitHooks.tools
-          ++ (with nixpkgs; [
-            awscli2
-            nodejs
-            rnix-lsp
-          ]);
+        buildInputs = preCommitHooks.tools ++ (with nixpkgs; [awscli2 nodejs]);
         inherit (preCommitHooks.allHooks) shellHook;
       };
       # runChecks is a hack required to allow checks to run on a single system
@@ -198,7 +187,7 @@ spec = describe "flake.nix rendering" do
       checks.pre-commit-check = preCommitHooks.pureHooks;
       devShell = self.devShells.${system}.default;
       devShells.default = nixpkgs.mkShell {
-        buildInputs = preCommitHooks.tools ++ (with nixpkgs; [go rnix-lsp]);
+        buildInputs = preCommitHooks.tools ++ (with nixpkgs; [go]);
         inherit (preCommitHooks.allHooks) shellHook;
       };
       defaultPackage = self.packages.${system}.default;
@@ -246,7 +235,7 @@ spec = describe "flake.nix rendering" do
     in {
       devShell = self.devShells.${system}.default;
       devShells.default = nixpkgs.mkShell {
-        buildInputs = [pythonPackages] ++ (with nixpkgs; [rnix-lsp]);
+        buildInputs = [pythonPackages];
       };
     });
 }
@@ -294,7 +283,7 @@ spec = describe "flake.nix rendering" do
       checks.pre-commit-check = preCommitHooks.pureHooks;
       devShell = self.devShells.${system}.default;
       devShells.default = nixpkgs.mkShell {
-        buildInputs = preCommitHooks.tools ++ (with nixpkgs; [libiconv rnix-lsp]);
+        buildInputs = preCommitHooks.tools ++ (with nixpkgs; [libiconv]);
         nativeBuildInputs = with nixpkgs; [
           cargo
           rust-analyzer

test/Bootstrap/Data/Bootstrappable/NixShellSpec.hs

@@ -36,7 +36,6 @@ in
       awscli2
       niv
       nodejs
-      rnix-lsp
     ];
   }
 |]
@@ -55,7 +54,6 @@ in
       niv
       nodePackages.pnpm
       nodejs
-      rnix-lsp
     ];
   }
 |]
@@ -74,13 +72,7 @@ in
   };
 in
   nixpkgs.mkShell {
-    buildInputs =
-      preCommitHooks.tools
-      ++ (with nixpkgs; [
-        go
-        niv
-        rnix-lsp
-      ]);
+    buildInputs = preCommitHooks.tools ++ (with nixpkgs; [go niv]);
     inherit (preCommitHooks.allHooks) shellHook;
   }
 |]
@@ -110,7 +102,7 @@ in
   haskellEnv = haskellPackages.ghcWithPackages (pkgs: with pkgs; [cabal-install haskell-language-server]);
 in
   nixpkgs.mkShell {
-    buildInputs = [haskellEnv] ++ (with nixpkgs; [niv rnix-lsp]);
+    buildInputs = [haskellEnv] ++ (with nixpkgs; [niv]);
   }
 |]
           )
@@ -131,7 +123,7 @@ in
   };
 in
   nixpkgs.mkShell {
-    buildInputs = [pythonPackages] ++ (with nixpkgs; [niv rnix-lsp]);
+    buildInputs = [pythonPackages] ++ (with nixpkgs; [niv]);
   }
 |]
           )
@@ -157,7 +149,7 @@ in
   };
 in
   nixpkgs.mkShell {
-    buildInputs = preCommitHooks.tools ++ [pythonPackages] ++ (with nixpkgs; [niv rnix-lsp]);
+    buildInputs = preCommitHooks.tools ++ [pythonPackages] ++ (with nixpkgs; [niv]);
     inherit (preCommitHooks.allHooks) shellHook;
   }
 |]
@@ -172,11 +164,7 @@ in
   nixpkgs = import sources.nixpkgs {};
 in
   nixpkgs.mkShell {
-    buildInputs = with nixpkgs; [
-      libiconv
-      niv
-      rnix-lsp
-    ];
+    buildInputs = with nixpkgs; [libiconv niv];
     nativeBuildInputs = with nixpkgs; [
       cargo
       rust-analyzer

test/Bootstrap/Nix/Expr/MkShellSpec.hs

@@ -23,26 +23,24 @@ spec = do
     it "gives no shell hook when one isn't needed" do
       mkShell (BuildInputSpec [] [] (PreCommitHooksConfig False) PSTMinimal [])
         `shouldBe` [nix|nixpkgs.mkShell {
-  buildInputs = with nixpkgs; [];
 }|]
     it "gives a proper shell hook for projects with pre-commit hooks" do
       mkShell (BuildInputSpec [] [] (PreCommitHooksConfig True) PSTMinimal [])
         `shouldBe` [nix|nixpkgs.mkShell {
-  buildInputs = preCommitHooks.tools ++ (with nixpkgs; []);
+  buildInputs = preCommitHooks.tools;
   inherit (preCommitHooks.allHooks) shellHook;
 }|]
     it "gives a proper shell hook for Rust projects" do
       mkShell (BuildInputSpec [] [] (PreCommitHooksConfig False) PSTRust [])
         `shouldBe` [nix|nixpkgs.mkShell {
-  buildInputs = with nixpkgs; [];
   shellHook = ''
     export RUST_SRC_PATH=${nixpkgs.rustPlatform.rustLibSrc}
   '';
 }|]
     it "gives a proper shell hook for Rust projects with pre-commit hooks" do
       mkShell (BuildInputSpec [] [] (PreCommitHooksConfig True) PSTRust [])
         `shouldBe` [nix|nixpkgs.mkShell {
-  buildInputs = preCommitHooks.tools ++ (with nixpkgs; []);
+  buildInputs = preCommitHooks.tools;
   shellHook = ''
     export RUST_SRC_PATH=${nixpkgs.rustPlatform.rustLibSrc}
     ${preCommitHooks.allHooks.shellHook}