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.

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

Add nix hash convert #9452

Merged
merged 13 commits into from
Dec 7, 2023
Merged

Add nix hash convert #9452

merged 13 commits into from
Dec 7, 2023

Commits on Dec 6, 2023

  1. hash.cc/hash.h: Minor C++ improvements

    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    e7abf60 View commit details
    Browse the repository at this point in the history

  2. CmdHashBase: doc comment

    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    156ea78 View commit details
    Browse the repository at this point in the history

  3. nix hash convert: added 

    This deviated from the proposal! See comments on the issue.

NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    6bbd900 View commit details
    Browse the repository at this point in the history

  4. nix hash convert: s/--type/--algo/ + more functional tests 

    NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    0c2d5f7 View commit details
    Browse the repository at this point in the history

  5. HashType: Rename to HashAlgorithm 

    To be consistent with CLI, nix API
and many other references.

As part of this, we also converted it to a scoped enum.

NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    5334c9c View commit details
    Browse the repository at this point in the history

  6. Further HashType renaming + using mkHashAlgoOptFlag for new conversion 

    NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    837b889 View commit details
    Browse the repository at this point in the history

  7. Renamed HashFormat::Base32 to HashFormat::Nix32 

    ...and also adjusted parsing accordingly.

Also added CLI completion for HashFormats.

NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    fc6f290 View commit details
    Browse the repository at this point in the history

  8. Add deprecation notice for old nix hash conversion subcommands. 

    (But not yet nix-hash since `nix hash` is still hidden behind a feature flag.)

NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    7ff876b View commit details
    Browse the repository at this point in the history

  9. Add docs/rl-notes for nix hash convert / builtins.convertHash 

    NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8afeaf0 View commit details
    Browse the repository at this point in the history

  10. Update src/libexpr/primops.cc 

    Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
    @kolloch @thufschmitt
    kolloch and thufschmitt committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    d38ec12 View commit details
    Browse the repository at this point in the history

  11. Refactor concurrently added tests to use HashAlgorithm. 

    NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bbba205 View commit details
    Browse the repository at this point in the history

  12. hash.sh: Make failure tests more tolerant of additional output 

    "warning: you don'\''t have Internet access; disabling some network-dependent features" ...

NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    e9a5365 View commit details
    Browse the repository at this point in the history

  13. Store.xs: fix references to HashFormat::Nix32 

    NixOS#8876
    @kolloch
    kolloch committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    9a1a3c4 View commit details
    Browse the repository at this point in the history