Skip to content

Update ShellifyTemplate.hs #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielrolls merged 4 commits into from
Feb 22, 2025
Merged

Update ShellifyTemplate.hs #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ac793b
Update ShellifyTemplate.hs
coillteoir Feb 12, 2025
7d22ec2
Update FlakeTemplate.hs
coillteoir Feb 12, 2025
0333fe9
fix: added newlines to template
coillteoir Feb 18, 2025
ea797af
merge: master
coillteoir Feb 18, 2025
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
4 changes: 3 additions & 1 deletion src/FlakeTemplate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ flakeTemplate = [r|{
devShells.default = import ./shell.nix { $shell_args;separator=' '$ };
}
);
}|]
}

|]
1 change: 1 addition & 0 deletions src/ShellifyTemplate.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ $if(shell_hook)$
'';
$endif$
}

|]
6 changes: 1 addition & 5 deletions test/TestHelpers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ theOptions = options "nix-shellify" . words
instance Show Options

readNixTemplate :: FilePath -> IO Text
readNixTemplate fileName =
stripTrailingNewline <$> readFile ("test/outputs/" <> fileName)
where stripTrailingNewline f = bool id stripLastChar (lastCharIsNewline f) f
lastCharIsNewline = (== '\n') . last
stripLastChar = reverse . tail . reverse
readNixTemplate fileName = readFile ("test/outputs/" <> fileName)

flakeFile = (<> "-flake.nix")
shellFile = (<> "-shell.nix")
Expand Down