Skip to content

fix(flake.nix): add procps to nix dogfood image #16607

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
merged 1 commit into from
Feb 18, 2025
Merged

fix(flake.nix): add procps to nix dogfood image #16607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@
unzip
zip
gzip
procps # free
])
++ oldAttrs.buildInputs;
});
Expand Down
5 changes: 5 additions & 0 deletions nix/docker.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ let
experimental-features = nix-command flakes
'';

etcReleaseName = writeTextDir "etc/coderniximage-release" ''
0.0.0
Copy link
Member

Choose a reason for hiding this comment

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

nit: wonder if it would make sense to have some kind of versioning here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree. It would make sense to get some versioning here.

Right now, we're not versioning the dogfood images, so this file is mostly a stub/placeholder for the system info go library not to fail.

Copy link
Member Author

Choose a reason for hiding this comment

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

I could add the output of git describe --tags here, or we could consider versioning the dogfood images, in which case the image tag should go here.

Copy link
Member

Choose a reason for hiding this comment

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

That or git SHA would probably be fine!

'';

etcPamdSudoFile = writeText "pam-sudo" ''
# Allow root to bypass authentication (optional)
auth sufficient pam_rootok.so
Expand Down Expand Up @@ -271,6 +275,7 @@ let
etcNixConf
etcSudoers
etcPamdSudo
etcReleaseName
(fakeNss.override {
# Allows programs to look up the build user's home directory
# https://github.com/NixOS/nix/blob/ffe155abd36366a870482625543f9bf924a58281/src/libstore/build/local-derivation-goal.cc#L906-L910
Expand Down
Loading