Skip to content

Update flake.lock #668

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 3 commits into from
Oct 31, 2023
Merged

Update flake.lock #668

merged 3 commits into from
Oct 31, 2023

Conversation

@onekey-sec-bot
Copy link

@onekey-sec-bot onekey-sec-bot commented Oct 15, 2023 •
edited
Loading

Automated changes by the update-flake-lock GitHub Action.

Flake lock file updates:

• Updated input 'filter':
    'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
  → 'github:NixOS/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26)
• Updated input 'unblob-native':
    'github:onekey-sec/unblob-native/3844f4fd5ffd5a3befcd25e8176eb889237b8eb4' (2023-07-31)
  → 'github:onekey-sec/unblob-native/ad931a3016122e862817ad7f30968024c649e3b3' (2023-10-23)
• Updated input 'unblob-native/advisory-db':
    'github:rustsec/advisory-db/98e8483ac17d42eeeeee51d4d02ad8a690bd12c7' (2023-07-29)
  → 'github:rustsec/advisory-db/71d80e811f2e29a4b82d3e545ad6591e35227e03' (2023-10-14)
• Updated input 'unblob-native/crane':
    'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
  → 'github:ipetkov/crane/758ae442227103fa501276e8225609a11c99718e' (2023-10-20)
• Removed input 'unblob-native/crane/flake-compat'
• Removed input 'unblob-native/crane/flake-utils'
• Removed input 'unblob-native/crane/flake-utils/systems'
• Removed input 'unblob-native/crane/rust-overlay'
• Removed input 'unblob-native/crane/rust-overlay/flake-utils'
• Removed input 'unblob-native/crane/rust-overlay/nixpkgs'
• Updated input 'unblob-native/flake-utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'unblob-native/nix-filter':
    'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'unblob-native/rust-overlay':
    'github:oxalica/rust-overlay/5c06b0ed7bfb00f3a925af6c4acd1636596381c1' (2023-07-29)
  → 'github:oxalica/rust-overlay/6e8e3332433847cd56186b1f6fc8c47603cf5b46' (2023-10-21)

Running GitHub Actions on this PR

GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action.

To run GitHub Actions workflows on this PR, run:

git branch -D update_flake_lock_action
git fetch origin
git checkout update_flake_lock_action
git commit --amend --no-edit
git push origin update_flake_lock_action --force

@onekey-sec-bot onekey-sec-bot added automated dependencies Pull requests that update a dependency file labels Oct 15, 2023
@qkaiser qkaiser force-pushed the update_flake_lock_action branch 2 times, most recently from b62084f to 9ffd128 Compare October 16, 2023 06:31
@qkaiser qkaiser marked this pull request as draft October 16, 2023 08:49
@qkaiser qkaiser force-pushed the update_flake_lock_action branch 3 times, most recently from 82e79d8 to 48d0b14 Compare October 17, 2023 07:32
@onekey-sec-bot onekey-sec-bot force-pushed the update_flake_lock_action branch from 48d0b14 to 2f8ae0a Compare October 22, 2023 00:18
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 2f8ae0a to 212ddf0 Compare October 24, 2023 15:16
@qkaiser qkaiser self-assigned this Oct 24, 2023
@qkaiser qkaiser marked this pull request as ready for review October 24, 2023 15:17
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 212ddf0 to 576d0da Compare October 24, 2023 15:18
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 576d0da to 0122eea Compare October 25, 2023 15:40
github-actions bot and others added 2 commits October 26, 2023 14:08
@github-actions @qkaiser
flake.lock: Update
16b4a94 
Flake lock file updates:

• Updated input 'filter':
    'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05)
  → 'github:NixOS/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
• Updated input 'unblob-native':
    'github:onekey-sec/unblob-native/3844f4fd5ffd5a3befcd25e8176eb889237b8eb4' (2023-07-31)
  → 'github:onekey-sec/unblob-native/042a7fea29d295d04877b31c41d9ebd5166e354f' (2023-10-08)
• Updated input 'unblob-native/advisory-db':
    'github:rustsec/advisory-db/98e8483ac17d42eeeeee51d4d02ad8a690bd12c7' (2023-07-29)
  → 'github:rustsec/advisory-db/da470caa84d3dd3be02657a9cb35bd5269636127' (2023-10-03)
• Updated input 'unblob-native/crane':
    'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
  → 'github:ipetkov/crane/f2143cd27f8bd09ee4f0121336c65015a2a0a19c' (2023-10-04)
• Updated input 'unblob-native/crane/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/4f910c9827911b1ec2bf26b5a062cd09f8d89f85' (2023-10-02)
• Updated input 'unblob-native/crane/flake-utils':
    'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'unblob-native/crane/rust-overlay':
    'github:oxalica/rust-overlay/f9b92316727af9e6c7fee4a761242f7f46880329' (2023-07-03)
  → 'github:oxalica/rust-overlay/611ccdceed92b4d94ae75328148d84ee4a5b462d' (2023-10-03)
• Updated input 'unblob-native/flake-utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
  → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
• Updated input 'unblob-native/nix-filter':
    'github:numtide/nix-filter/d90c75e8319d0dd9be67d933d8eb9d0894ec9174' (2023-06-19)
  → 'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
• Updated input 'unblob-native/rust-overlay':
    'github:oxalica/rust-overlay/5c06b0ed7bfb00f3a925af6c4acd1636596381c1' (2023-07-29)
  → 'github:oxalica/rust-overlay/6528a18a62d817200099c520b6eea7833ade9a9a' (2023-10-08)
@qkaiser
chore(deps): adapt nix derivation for pyfatfs.
7f54a72
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 0122eea to c8a3d31 Compare October 26, 2023 12:08
@onekey-sec-bot onekey-sec-bot force-pushed the update_flake_lock_action branch from c8a3d31 to 557d609 Compare October 29, 2023 00:17
@vlaci vlaci force-pushed the update_flake_lock_action branch from 557d609 to c8a3d31 Compare October 31, 2023 14:37
@vlaci
Copy link
Contributor

vlaci commented Oct 31, 2023

Repushed the branch containing the leaf build fixes. Uploaded local build output to cachix to circumvent build timing out.

vlaci
vlaci reviewed Oct 31, 2023
View reviewed changes
Copy link
Contributor

@vlaci vlaci left a comment

Choose a reason for hiding this comment

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

I am overall happy with the changes Added some stylistic suggestions, making it easier to extract this to its own file/upstream it.

@qkaiser qkaiser force-pushed the update_flake_lock_action branch from c72469a to 89f8456 Compare October 31, 2023 15:58
@qkaiser @vlaci
chore(deps): adapt nix derivation for lief.
e71232a 
Adapted CXX flags so warnings are no longer displayed when building with
clang++ on OSX. The nixpkgs derivation[0] for lief made use of
"/build/source" symlink, which is not available on Darwin.

build commands are taken from LIEF build scripts [1]

[0]: https://github.com/NixOS/nixpkgs/blob/8efd5d1e283604f75a808a20e6cde0ef313d07d4/pkgs/development/libraries/lief/default.nix#L37
[1]: https://github.com/lief-project/LIEF/tree/master/scripts

Co-authored-by: László Vaskó <1771332+vlaci@users.noreply.github.com>
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 8c5fb98 to e71232a Compare October 31, 2023 15:59
@qkaiser
Copy link
Contributor

qkaiser commented Oct 31, 2023

Repushed the branch containing the leaf build fixes. Uploaded local build output to cachix to circumvent build timing out.

Thanks. I sent a simpler fix upstream with NixOS/nixpkgs#264586 which simply solves the Darwin build and does not go into improving the build itself.

@qkaiser qkaiser enabled auto-merge October 31, 2023 16:03
@qkaiser qkaiser merged commit ff33d6b into main Oct 31, 2023
@qkaiser qkaiser deleted the update_flake_lock_action branch October 31, 2023 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vlaci vlaci vlaci left review comments

@qkaiser qkaiser qkaiser approved these changes

Assignees

@qkaiser qkaiser

Labels

automated dependencies Pull requests that update a dependency file

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@onekey-sec-bot @vlaci @qkaiser