Skip to content

Commit e3c79a8

Browse files
committed
Configure vscode settings for nix-env-selector to use flakes
1 parent 1f945dc commit e3c79a8

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

.last-exported-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Last exported commit from parent repo: 09eae2ec1f5f8badcaabffca573e318029e828b3
1+
Last exported commit from parent repo: 5ab98034a1e3e033f9a966ff2d1ea8a43db9067c

nix-bootstrap.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 2.0
55
-- see: https://github.com/sol/hpack
66

77
name: nix-bootstrap
8-
version: 2.2.4.0
8+
version: 2.2.5.0
99
author: gchquser
1010
maintainer: [email protected]
1111
copyright: Crown Copyright

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
name: nix-bootstrap
15-
version: 2.2.4.0
15+
version: 2.2.5.0
1616
author: gchquser
1717
maintainer: [email protected]
1818
copyright: Crown Copyright

src/Bootstrap/Data/Bootstrappable/VSCodeSettings.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ instance ToJSON VSCodeSettings where
2222
toJSON =
2323
const $
2424
Aeson.object
25-
["nixEnvSelector.nixFile" .= Aeson.String "${workspaceRoot}/shell.nix"]
25+
[ "nixEnvSelector.nixFile" .= Aeson.String "${workspaceRoot}/flake.nix",
26+
"nixEnvSelector.useFlakes" .= Aeson.Bool True
27+
]
2628

2729
vsCodeSettingsFor :: DevContainerConfig -> Maybe VSCodeSettings
2830
vsCodeSettingsFor (DevContainerConfig True) = Just VSCodeSettings

test/Bootstrap/Data/Bootstrappable/VSCodeSettingsSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ spec = describe ".vscode/settings.json rendering" do
1414
>>= ( `shouldBe`
1515
Right
1616
( unlines
17-
["{", " \"nixEnvSelector.nixFile\": \"${workspaceRoot}/shell.nix\"", "}"]
17+
["{", " \"nixEnvSelector.nixFile\": \"${workspaceRoot}/flake.nix\",", " \"nixEnvSelector.useFlakes\": true", "}"]
1818
)
1919
)

0 commit comments

Comments
 (0)