Skip to content
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

Clean up shell.nix #726

Merged
merged 2 commits into from
May 10, 2023
Merged

Clean up shell.nix #726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e32177
Clean up shell.nix
jacobweinstock May 9, 2023
c28e3af
Merge branch 'main' into clean-shell-nix
mergify[bot] May 10, 2023
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
20 changes: 1 addition & 19 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,11 @@ in { pkgs ? import (_pkgs.fetchFromGitHub {

with pkgs;

let
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this work with the CI now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dont know if I understand the questions, sorry. Currently, the shell.nix file is only needed for the ci-checks.sh script.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That answers the question 👍🏻 ; I'd forgotten.

pkgs = import (_pkgs.fetchFromGitHub {
# go 1.18.5
owner = "NixOS";
repo = "nixpkgs";
# branch@date: nixpkgs-unstable@2023-03-30
rev = "8b3bc690e201c8d3cbd14633dbf3462a820e73f2";
sha256 = "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=";
}) { };

go_1_20_3 = pkgs.go;

in mkShell {
mkShell {
buildInputs = [
docker-compose
git
gnumake
gnused
go_1_20_3
jq
nixfmt
nodePackages.prettier
protobuf
python3Packages.codespell
python3Packages.pip
python3Packages.setuptools
Expand Down