Skip to content

kdigger: init at 1.2.0 #177868

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

Jump to bottom
Merged
merged 1 commit into from
Jun 17, 2022
Merged

kdigger: init at 1.2.0 #177868

merged 1 commit into from
Jun 17, 2022

Conversation

06kellyjac
Copy link
Member

Description of changes

Package kdigger for nixpkgs @ 1.2.0

https://github.com/quarkslab/kdigger

Wait to see if x86_64-darwin builds

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@06kellyjac
Copy link
Member Author

Related to #81418

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jun 16, 2022
@ofborg ofborg bot requested a review from kalbasit June 16, 2022 11:27
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 16, 2022
@06kellyjac
Copy link
Member Author

Patch to simplify ldflags and clarify their purpose

quarkslab/kdigger#2

Since aarch64-linux and x86_64-darwin fail to build I've just marked this as x86_64-linux only

quarkslab/kdigger#3

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Jun 16, 2022
SuperSandro2000
SuperSandro2000 requested changes Jun 17, 2022
View reviewed changes
pkgs/tools/security/kdigger/default.nix Outdated

preBuild = ''
ldflags+=" -X github.com/quarkslab/kdigger/commands.GITCOMMIT=$(cat COMMIT)"
ldflags+=" -X github.com/quarkslab/kdigger/commands.BUILDERARCH=$(uname -m)"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
ldflags+=" -X github.com/quarkslab/kdigger/commands.BUILDERARCH=$(uname -m)"

Thats impure.

Copy link
Member Author

Choose a reason for hiding this comment

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

How so, shouldn't it always be x86-64 on an x86_64 builder and aarch64 if crosscompiled for x86_64-linux from an aarch64-linux platform?

It doesnt have other details like kernel label/name/whatever, date, etc

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 guess I can pull an equivalent value from stdenv somewhere

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, you're right. I thought it includes the x86_64 variants but we still shouldn't use it because it depends on the build machine and not the nixpkgs platform. Also it probably breaks easily on binfmt.

@SuperSandro2000 SuperSandro2000 merged commit 2dc9fa4 into NixOS:master Jun 17, 2022
@github-actions github-actions bot mentioned this pull request Jun 17, 2022
Merged
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #178067 for release-22.05.

@06kellyjac 06kellyjac deleted the kdigger branch June 17, 2022 20:44
@06kellyjac 06kellyjac mentioned this pull request Jun 29, 2022
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@06kellyjac @SuperSandro2000