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.

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

Flake update #131

Merged
merged 2 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#! /usr/bin/env bash
# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
#
# SPDX-License-Identifier: Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-commit-message.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
commit-msg:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.2.0
- name: Check Commit Message
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_sbomnix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:
- 'v*'

jobs:
build:
build:
name: Upload Release Asset
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
- uses: actions/checkout@v4.2.0
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Build release asset
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test_sbomnix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

name: Test sbomnix
name: Test sbomnix

on:
push:
Expand All @@ -16,11 +16,13 @@ jobs:
tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
- uses: actions/checkout@v4.2.0
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Make sure nix-build works
- name: Ensure nix-build works
run: nix-build '<nixpkgs>' -A hello
- name: Print nix version
run: nix --version
- name: Run sbomnix CI tests
run: nix develop --command make test-ci
1 change: 0 additions & 1 deletion doc/vulnxscan.md
Original file line number Diff line number Diff line change
Expand Up @@ -376,5 +376,4 @@ For now, consider `vulnxscan` as a demonstration. Some improvement ideas are lis
- Nix ecosystem is not supported in OSV: the way `osv.py` makes use of OSV data for Nix targets -- as explained in section [Nix and OSV vulnerability database](#nix-and-osv-vulnerability-database) -- makes the reported OSV vulnerabilities include false positives.

### Other Future Work
- [vulnxscan](../src/vulnxscan/vulnxscan_cli.py) uses vulnix from a [forked repository](https://github.com/henrirosten/vulnix), to include vulnix support for [scanning runtime-only dependencies](https://github.com/nix-community/vulnix/compare/master...henrirosten:vulnix:master).
- [vulnxscan](../src//vulnxscan/vulnxscan_cli.py) could include more scanners in addition to [vulnix](https://github.com/nix-community/vulnix), [grype](https://github.com/anchore/grype), and [osv.py](../src/vulnxscan/osv.py). Suggestions for other open-source scanners, especially those that can digest CycloneDX or SPDX SBOMs are welcome. Consider e.g. [bombon](https://github.com/nikstur/bombon) and [cve-bin-tool](https://github.com/intel/cve-bin-tool). Adding cve-bin-tool to vulnxscan was [demonstrated](https://github.com/tiiuae/sbomnix/pull/75) earlier, but not merged due to reasons explained in the [PR](https://github.com/tiiuae/sbomnix/pull/75#issuecomment-1670958503).
84 changes: 22 additions & 62 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@
url = "github:nix-community/flake-compat";
flake = false;
};
nix-visualize = {
url = "github:craigmbooth/nix-visualize";
flake = false;
};
vulnix = {
url = "github:henrirosten/vulnix";
flake = false;
};
};

outputs = inputs @ {flake-parts, ...}:
Expand Down
4 changes: 2 additions & 2 deletions nix/devshell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
grype
gzip
nix
nix-visualize
pylint
reuse
vulnix
])
++ (with self'.packages; [
nix-visualize
python # that python with all sbomnix [dev-]dependencies
vulnix
]);

# Add the repo root to PYTHONPATH, so invoking entrypoints (and them being
Expand Down
Loading