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

Update flake.lock #682

Merged
merged 9 commits into from
Dec 16, 2023
Merged

Update flake.lock #682

merged 9 commits into from
Dec 16, 2023

Conversation

onekey-sec-bot
Copy link

@onekey-sec-bot onekey-sec-bot commented Nov 19, 2023

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

Flake lock file updates:

• Updated input 'filter':
    'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
  → 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
  → 'github:NixOS/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
• Updated input 'unblob-native':
    'github:onekey-sec/unblob-native/d14b8743fa3265086a2cabcd2f0589fadaad9de8' (2023-11-06)
  → 'github:onekey-sec/unblob-native/69439fc0d33f2d8237c2ad57addcc497f189bd69' (2023-11-27)
• Updated input 'unblob-native/advisory-db':
    'github:rustsec/advisory-db/088ec034cfc17c918d8c1d4f9fbb832b935011b0' (2023-11-02)
  → 'github:rustsec/advisory-db/3338fcfb59cea5fcd7d2a4e7fe24cbc7cb778003' (2023-11-11)
• Updated input 'unblob-native/crane':
    'github:ipetkov/crane/2c89c36bffac32d8267e719f73b0d06e313ede30' (2023-11-03)
  → 'github:ipetkov/crane/ae7cd510e508ee03d792005c2f1c0a3ff25ecb80' (2023-11-18)
• Updated input 'unblob-native/rust-overlay':
    'github:oxalica/rust-overlay/321affd863e3e4e669990a1db5fdabef98387b95' (2023-11-03)
  → 'github:oxalica/rust-overlay/0309d58c91c57e8d519de68312430074de3ef5f8' (2023-11-25)

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 Nov 19, 2023
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from f8316fe to eb01095 Compare November 20, 2023 10:43
@qkaiser qkaiser self-assigned this Nov 20, 2023
@qkaiser qkaiser assigned onekey-sec-bot and unassigned qkaiser Nov 20, 2023
@qkaiser qkaiser enabled auto-merge November 20, 2023 10:44
@qkaiser qkaiser force-pushed the update_flake_lock_action branch 2 times, most recently from b0dd1bb to 820877c Compare November 21, 2023 12:02
@onekey-sec-bot onekey-sec-bot force-pushed the update_flake_lock_action branch from 820877c to 4adf119 Compare November 26, 2023 00:18
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 4adf119 to 49842fe Compare November 27, 2023 12:42
@qkaiser
Copy link
Contributor

qkaiser commented Dec 1, 2023

@vlaci is this something we can fix ?

error: Python version mismatch in 'python3.11-unblob-23.10.31':

       The Python derivation 'python3.11-unblob-[23](https://github.com/onekey-sec/unblob/actions/runs/7005141658/job/19054294300?pr=682#step:7:24).10.31' depends on a Python derivation
       named 'python3.11-pyperscan-0.2.2', but the two derivations use different versions
       of Python:

           'python3.11-unblob-23.10.31' uses /nix/store/vwnrri83bxr1l6x4fxwk[25](https://github.com/onekey-sec/unblob/actions/runs/7005141658/job/19054294300?pr=682#step:7:26)by1x2aaa3d-python3-3.11.6
           'python3.11-pyperscan-0.2.2' uses /nix/store/dc4xnyqi2kh25f1c74dfczxw95anbhhr-python3-3.11.6

       Possible solutions:

         * If 'python3.11-pyperscan-0.2.2' is a Python library, change the reference to 'python3.11-pyperscan-0.2.2'
           in the propagatedBuildInputs of 'python3.11-unblob-23.10.[31](https://github.com/onekey-sec/unblob/actions/runs/7005141658/job/19054294300?pr=682#step:7:32)' to use a 'python3.11-pyperscan-0.2.2' built from the same
           version of Python

         * If 'python3.11-pyperscan-0.2.2' is used as a tool during the build, move the reference to
           'python3.11-pyperscan-0.2.2' in 'python3.11-unblob-23.10.31' from propagatedBuildInputs to nativeBuildInputs

         * If 'python3.11-pyperscan-0.2.2' provides executables that are called at run time, pass its
           bin path to makeWrapperArgs:

               makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ pyperscan ] }" ];

        at /nix/store/hg0wlqn0l7n5ybybb7d2r2hhsafnpcq3-source/nix/unblob/default.nix:62:12
(use '--show-trace' to show detailed location information)

@onekey-sec-bot onekey-sec-bot force-pushed the update_flake_lock_action branch from 49842fe to 431776d Compare December 3, 2023 00:20
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 431776d to 97e9d4e Compare December 6, 2023 16:25
@onekey-sec-bot onekey-sec-bot force-pushed the update_flake_lock_action branch from 97e9d4e to 74e3d69 Compare December 10, 2023 00:20
@qkaiser
Copy link
Contributor

qkaiser commented Dec 10, 2023

Looked at the flake check again. The python3 version mismatch error is only thrown when I'm checking for a Darwin target. It does not happen for linux-x86_64 or linux-aarch64. Something's off.

I don't see how it could have been caused by pyperscan since its flake.nix was last modified 5 months ago and nixpkgs definition 7 months ago.

@qkaiser
Copy link
Contributor

qkaiser commented Dec 10, 2023

If someone wants to check:

nix flake check -L --no-build --option system x86_64-linux --extra-platforms x86_64-linux --show-trace
nix flake check -L --no-build --option system aarch64-linux --extra-platforms aarch64-linux --show-trace
nix flake check -L --no-build --option system x86_64-darwin --extra-platforms x86_64-darwin --show-trace

What I don't get is that it's failing for Linux on Github runners, but not on my machine.

@vlaci is it possible that we have some kind of broken cache on cachix or something ?

@vlaci vlaci force-pushed the update_flake_lock_action branch from 12738e2 to 0e309be Compare December 11, 2023 15:15
@qkaiser qkaiser disabled auto-merge December 11, 2023 15:15
@vlaci
Copy link
Contributor

vlaci commented Dec 13, 2023

As discussed IRL, there is actually an issue in the method pyperscan is included as a dependency. I'll need to update its flake.nix to provide an overlay instead of it using its own incompatible1 python environment.

Footnotes

  1. to be pedantic, it is not strictly incompatible as there are no common dependencies of unblob and pyperscan, if there would be some, we would have discovered this issue sooner.

@vlaci
Copy link
Contributor

vlaci commented Dec 13, 2023

unblob-native needed the same care as pyperscan. As unblob-native is simpler, its update is already done onekey-sec/unblob-native#37

vlaci and others added 3 commits December 14, 2023 14:07
Flake lock file updates:

• Updated input 'filter':
    'github:numtide/nix-filter/41fd48e00c22b4ced525af521ead8792402de0ea' (2023-09-16)
  → 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
  → 'github:NixOS/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
• Updated input 'unblob-native':
    'github:onekey-sec/unblob-native/d14b8743fa3265086a2cabcd2f0589fadaad9de8' (2023-11-06)
  → 'github:onekey-sec/unblob-native/69439fc0d33f2d8237c2ad57addcc497f189bd69' (2023-11-27)
• Updated input 'unblob-native/advisory-db':
    'github:rustsec/advisory-db/088ec034cfc17c918d8c1d4f9fbb832b935011b0' (2023-11-02)
  → 'github:rustsec/advisory-db/3338fcfb59cea5fcd7d2a4e7fe24cbc7cb778003' (2023-11-11)
• Updated input 'unblob-native/crane':
    'github:ipetkov/crane/2c89c36bffac32d8267e719f73b0d06e313ede30' (2023-11-03)
  → 'github:ipetkov/crane/ae7cd510e508ee03d792005c2f1c0a3ff25ecb80' (2023-11-18)
• Updated input 'unblob-native/rust-overlay':
    'github:oxalica/rust-overlay/321affd863e3e4e669990a1db5fdabef98387b95' (2023-11-03)
  → 'github:oxalica/rust-overlay/0309d58c91c57e8d519de68312430074de3ef5f8' (2023-11-25)
@qkaiser qkaiser force-pushed the update_flake_lock_action branch from 0e309be to 715ccc2 Compare December 14, 2023 13:10
@vlaci vlaci reopened this Dec 14, 2023
@vlaci vlaci force-pushed the update_flake_lock_action branch from e01a9e6 to 21e61ce Compare December 15, 2023 10:57
Flake lock file updates:

• Updated input 'pyperscan':
    'git+https://github.com/vlaci/pyperscan/?ref=main&rev=a53dfb3623e0d0e3a46639c590316b1dd767f5d9' (2023-12-12)
  → 'github:vlaci/pyperscan/ea38e0770de2fa175d0f5fbe09861bb51742762f' (2023-12-15)
• Updated input 'pyperscan/advisory-db':
    'github:rustsec/advisory-db/5ceeefcbbabf4b510ef8ede121d6dc57d1a1f7f8' (2023-07-08)
  → 'github:rustsec/advisory-db/6ef1d1fd84c57e46253ff16bf7379c115e1062eb' (2023-12-09)
• Updated input 'pyperscan/crane':
    'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
  → 'github:ipetkov/crane/62fc1a0cbe144c1014d956e603d56bf1ffe69c7d' (2023-12-09)
• Removed input 'pyperscan/crane/flake-compat'
• Removed input 'pyperscan/crane/flake-utils'
• Removed input 'pyperscan/crane/flake-utils/systems'
• Removed input 'pyperscan/crane/rust-overlay'
• Removed input 'pyperscan/crane/rust-overlay/flake-utils'
• Removed input 'pyperscan/crane/rust-overlay/nixpkgs'
• Updated input 'pyperscan/fenix':
    'github:nix-community/fenix/31f37ee3e471af1b40f6d0c9657f77062bb13ee3' (2023-07-14)
  → 'github:nix-community/fenix/7622e4a2d4378861d9e83fc02c1eeb0e084bf3f2' (2023-12-12)
• Removed input 'pyperscan/flake-utils'
• Removed input 'pyperscan/flake-utils/systems'
It is required since we are on debian's branch
so it matches with how unblob-native and pyperscan is used
Flake lock file updates:

• Added input 'lzallright':
    'github:vlaci/lzallright/ed5314d505881850626398184d772f4c8ab4cb0a' (2023-12-15)
• Added input 'lzallright/advisory-db':
    'github:rustsec/advisory-db/6ef1d1fd84c57e46253ff16bf7379c115e1062eb' (2023-12-09)
• Added input 'lzallright/crane':
    'github:ipetkov/crane/62fc1a0cbe144c1014d956e603d56bf1ffe69c7d' (2023-12-09)
• Added input 'lzallright/crane/nixpkgs':
    follows 'lzallright/nixpkgs'
• Added input 'lzallright/fenix':
    'github:nix-community/fenix/aa632e1b140686853a226fa0bf85ae8ebbf72aab' (2023-12-09)
• Added input 'lzallright/fenix/nixpkgs':
    follows 'lzallright/nixpkgs'
• Added input 'lzallright/fenix/rust-analyzer-src':
    follows 'lzallright'
• Added input 'lzallright/flake-utils':
    'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Added input 'lzallright/flake-utils/systems':
    'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
• Added input 'lzallright/nixpkgs':
    follows 'nixpkgs'
@vlaci vlaci force-pushed the update_flake_lock_action branch from b50a5ff to d14d915 Compare December 15, 2023 12:37
@vlaci
Copy link
Contributor

vlaci commented Dec 16, 2023

Finally it works!

@qkaiser qkaiser merged commit 6046db1 into main Dec 16, 2023
14 checks passed
@qkaiser qkaiser deleted the update_flake_lock_action branch December 16, 2023 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automated dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants