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

zoxide: 0.4.3 -> 0.5.0 #102180

Merged
merged 1 commit into from Oct 31, 2020
Merged

zoxide: 0.4.3 -> 0.5.0 #102180

merged 1 commit into from Oct 31, 2020

Conversation

@cole-h
Copy link
Member

@cole-h cole-h commented Oct 30, 2020

ajeetdsouza/zoxide@v0.4.3...v0.5.0

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
pkgs/tools/misc/zoxide/default.nix Show resolved Hide resolved
pkgs/tools/misc/zoxide/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 30, 2020

Result of nixpkgs-review pr 102180 run on x86_64-linux 1

1 package built:
  • zoxide

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 30, 2020

Result of nixpkgs-review pr 102180 run on x86_64-darwin 1

1 package failed to build:
  • zoxide
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/s0fyc5vva5acv3hhihfa6wqdsdql9sm1-source
source root is source
unpacking source archive /nix/store/saqjr906wxx0166gxym0h9lr9fw2h27k-zoxide-0.5.0-vendor.tar.gz
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
Validating consistency between /private/tmp/nix-build-zoxide-0.5.0.drv-0/source/Cargo.lock and /private/tmp/nix-build-zoxide-0.5.0.drv-0/zoxide-0.5.0-vendor.tar.gz/Cargo.lock
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
@nix { "action": "setPhase", "phase": "buildPhase" }
building
++ env CC_x86_64-apple-darwin=/nix/store/gkcr1p2x0psdc31bavmqbfb2nwq0d6jn-clang-wrapper-7.1.0/bin/cc CXX_x86_64-apple-darwin=/nix/store/gkcr1p2x0psdc31bavmqbfb2nwq0d6jn-clang-wrapper-7.1.0/bin/c++ CC_x86_64-apple-darwin=/nix/store/gkcr1p2x0psdc31bavmqbfb2nwq0d6jn-clang-wrapper-7.1.0/bin/cc CXX_x86_64-apple-darwin=/nix/store/gkcr1p2x0psdc31bavmqbfb2nwq0d6jn-clang-wrapper-7.1.0/bin/c++ cargo build -j 4 --release --target x86_64-apple-darwin --frozen
�[0m�[0m�[1m�[32m   Compiling�[0m proc-macro2 v1.0.24
�[0m�[0m�[1m�[32m   Compiling�[0m version_check v0.9.2
�[0m�[0m�[1m�[32m   Compiling�[0m syn v1.0.48
�[0m�[0m�[1m�[32m   Compiling�[0m unicode-xid v0.2.1
�[0m�[0m�[1m�[32m   Compiling�[0m libc v0.2.80
�[0m�[0m�[1m�[32m   Compiling�[0m memchr v2.3.3
�[0m�[0m�[1m�[32m   Compiling�[0m autocfg v1.0.1
�[0m�[0m�[1m�[32m   Compiling�[0m getrandom v0.1.15
�[0m�[0m�[1m�[32m   Compiling�[0m cfg-if v0.1.10
�[0m�[0m�[1m�[32m   Compiling�[0m serde_derive v1.0.117
�[0m�[0m�[1m�[32m   Compiling�[0m ppv-lite86 v0.2.9
�[0m�[0m�[1m�[32m   Compiling�[0m unicode-segmentation v1.6.0
�[0m�[0m�[1m�[32m   Compiling�[0m bitflags v1.2.1
�[0m�[0m�[1m�[32m   Compiling�[0m askama_escape v0.10.1
�[0m�[0m�[1m�[32m   Compiling�[0m byteorder v1.3.4
�[0m�[0m�[1m�[32m   Compiling�[0m serde v1.0.117
�[0m�[0m�[1m�[32m   Compiling�[0m hashbrown v0.9.1
�[0m�[0m�[1m�[32m   Compiling�[0m anyhow v1.0.33
�[0m�[0m�[1m�[32m   Compiling�[0m unicode-width v0.1.8
�[0m�[0m�[1m�[32m   Compiling�[0m lazy_static v1.4.0
�[0m�[0m�[1m�[32m   Compiling�[0m vec_map v0.8.2
�[0m�[0m�[1m�[32m   Compiling�[0m termcolor v1.1.0
�[0m�[0m�[1m�[32m   Compiling�[0m cfg-if v1.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m os_str_bytes v2.3.2
�[0m�[0m�[1m�[32m   Compiling�[0m zoxide v0.5.0 (/private/tmp/nix-build-zoxide-0.5.0.drv-0/source)
�[0m�[0m�[1m�[32m   Compiling�[0m remove_dir_all v0.5.3
�[0m�[0m�[1m�[32m   Compiling�[0m strsim v0.10.0
�[0m�[0m�[1m�[32m   Compiling�[0m glob v0.3.0
�[0m�[0m�[1m�[32m   Compiling�[0m dunce v1.0.1
�[0m�[0m�[1m�[32m   Compiling�[0m once_cell v1.4.1
�[0m�[0m�[1m�[32m   Compiling�[0m nom v5.1.2
�[0m�[0m�[1m�[32m   Compiling�[0m proc-macro-error-attr v1.0.4
�[0m�[0m�[1m�[32m   Compiling�[0m proc-macro-error v1.0.4
�[0m�[0m�[1m�[32m   Compiling�[0m heck v0.3.1
�[0m�[0m�[1m�[32m   Compiling�[0m indexmap v1.6.0
�[0m�[0m�[1m�[32m   Compiling�[0m num-traits v0.2.12
�[0m�[0m�[1m�[32m   Compiling�[0m textwrap v0.12.1
�[0m�[0m�[1m�[32m   Compiling�[0m quote v1.0.7
�[0m�[0m�[1m�[32m   Compiling�[0m atty v0.2.14
�[0m�[0m�[1m�[32m   Compiling�[0m dirs-sys-next v0.1.1
�[0m�[0m�[1m�[32m   Compiling�[0m rand_core v0.5.1
�[0m�[0m�[1m�[32m   Compiling�[0m dirs-next v1.0.2
�[0m�[0m�[1m�[32m   Compiling�[0m ordered-float v2.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m rand_chacha v0.2.2
�[0m�[0m�[1m�[32m   Compiling�[0m rand v0.7.3
�[0m�[0m�[1m�[32m   Compiling�[0m askama_shared v0.10.4
�[0m�[0m�[1m�[32m   Compiling�[0m tempfile v3.1.0
�[0m�[0m�[1m�[32m   Compiling�[0m askama_derive v0.10.3
�[0m�[0m�[1m�[32m   Compiling�[0m clap_derive v3.0.0-beta.2
�[0m�[0m�[1m�[32m   Compiling�[0m askama v0.10.3
�[0m�[0m�[1m�[32m   Compiling�[0m clap v3.0.0-beta.2
�[0m�[0m�[1m�[32m   Compiling�[0m bincode v1.3.1
�[0m�[0m�[1m�[32m    Finished�[0m release [optimized] target(s) in 1m 44s
@nix { "action": "setPhase", "phase": "checkPhase" }
running tests
Running cargo test --release --target x86_64-apple-darwin --frozen --  
�[0m�[0m�[1m�[32m   Compiling�[0m unicode-xid v0.2.1
�[0m�[0m�[1m�[32m   Compiling�[0m cfg-if v0.1.10
�[0m�[0m�[1m�[32m   Compiling�[0m ppv-lite86 v0.2.9
�[0m�[0m�[1m�[32m   Compiling�[0m predicates-core v1.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m doc-comment v0.3.3
�[0m�[0m�[1m�[32m   Compiling�[0m askama_escape v0.10.1
�[0m�[0m�[1m�[32m   Compiling�[0m hashbrown v0.9.1
�[0m�[0m�[1m�[32m   Compiling�[0m difference v2.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m treeline v0.1.0
�[0m�[0m�[1m�[32m   Compiling�[0m unicode-width v0.1.8
�[0m�[0m�[1m�[32m   Compiling�[0m strsim v0.10.0
�[0m�[0m�[1m�[32m   Compiling�[0m remove_dir_all v0.5.3
�[0m�[0m�[1m�[32m   Compiling�[0m lazy_static v1.4.0
�[0m�[0m�[1m�[32m   Compiling�[0m vec_map v0.8.2
�[0m�[0m�[1m�[32m   Compiling�[0m termcolor v1.1.0
�[0m�[0m�[1m�[32m   Compiling�[0m cfg-if v1.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m os_str_bytes v2.3.2
�[0m�[0m�[1m�[32m   Compiling�[0m once_cell v1.4.1
�[0m�[0m�[1m�[32m   Compiling�[0m glob v0.3.0
�[0m�[0m�[1m�[32m   Compiling�[0m dunce v1.0.1
�[0m�[0m�[1m�[32m   Compiling�[0m predicates v1.0.5
�[0m�[0m�[1m�[32m   Compiling�[0m predicates-tree v1.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m textwrap v0.12.1
�[0m�[0m�[1m�[32m   Compiling�[0m proc-macro2 v1.0.24
�[0m�[0m�[1m�[32m   Compiling�[0m libc v0.2.80
�[0m�[0m�[1m�[32m   Compiling�[0m memchr v2.3.3
�[0m�[0m�[1m�[32m   Compiling�[0m byteorder v1.3.4
�[0m�[0m�[1m�[32m   Compiling�[0m bitflags v1.2.1
�[0m�[0m�[1m�[32m   Compiling�[0m anyhow v1.0.33
�[0m�[0m�[1m�[32m   Compiling�[0m indexmap v1.6.0
�[0m�[0m�[1m�[32m   Compiling�[0m num-traits v0.2.12
�[0m�[0m�[1m�[32m   Compiling�[0m quote v1.0.7
�[0m�[0m�[1m�[32m   Compiling�[0m getrandom v0.1.15
�[0m�[0m�[1m�[32m   Compiling�[0m atty v0.2.14
�[0m�[0m�[1m�[32m   Compiling�[0m dirs-sys-next v0.1.1
�[0m�[0m�[1m�[32m   Compiling�[0m wait-timeout v0.2.0
�[0m�[0m�[1m�[32m   Compiling�[0m nom v5.1.2
�[0m�[0m�[1m�[32m   Compiling�[0m syn v1.0.48
�[0m�[0m�[1m�[32m   Compiling�[0m rand_core v0.5.1
�[0m�[0m�[1m�[32m   Compiling�[0m dirs-next v1.0.2
�[0m�[0m�[1m�[32m   Compiling�[0m assert_cmd v1.0.1
�[0m�[0m�[1m�[32m   Compiling�[0m ordered-float v2.0.0
�[0m�[0m�[1m�[32m   Compiling�[0m rand_chacha v0.2.2
�[0m�[0m�[1m�[32m   Compiling�[0m serde v1.0.117
�[0m�[0m�[1m�[32m   Compiling�[0m rand v0.7.3
�[0m�[0m�[1m�[32m   Compiling�[0m clap v3.0.0-beta.2
�[0m�[0m�[1m�[32m   Compiling�[0m tempfile v3.1.0
�[0m�[0m�[1m�[32m   Compiling�[0m askama_shared v0.10.4
�[0m�[0m�[1m�[32m   Compiling�[0m askama v0.10.3
�[0m�[0m�[1m�[32m   Compiling�[0m bincode v1.3.1
�[0m�[0m�[1m�[32m   Compiling�[0m zoxide v0.5.0 (/private/tmp/nix-build-zoxide-0.5.0.drv-0/source)
�[0m�[0m�[1m�[32m    Finished�[0m release [optimized] target(s) in 48.55s
�[0m�[0m�[1m�[32m     Running�[0m target/x86_64-apple-darwin/release/deps/zoxide-ba81eebfe7706ec5

running 22 tests
test shell::tests::test_fish ... FAILED
test shell::tests::test_pwsh ... FAILED
test shell::tests::test_bash ... ok
test shell::tests::test_bash_posix ... ok
test shell::tests::test_dash ... ok
test shell::tests::test_shfmt_posix ... ok
test shell::tests::test_shfmt_bash ... ok
test shell::tests::test_shellcheck_bash ... ok
test store::query::tests::test_query_consecutive_slash ... ok
test store::query::tests::test_query_filename ... ok
test store::query::tests::test_query_normalization ... ok
test store::query::tests::test_query_not_filename ... ok
test store::query::tests::test_query_not_filename_slash ... ok
test store::query::tests::test_query_overlap_slash ... ok
test store::query::tests::test_query_overlap_text ... ok
test store::query::tests::test_query_path_separator ... ok
test store::query::tests::test_query_path_separator_between ... ok
test store::tests::test_add ... ok
test store::tests::test_remove ... ok
test shell::tests::test_shellcheck_sh ... ok
test shell::tests::test_zsh ... ok
test shell::tests::test_xonsh ... ok

failures:

---- shell::tests::test_fish stdout ----
thread 'shell::tests::test_fish' panicked at 'Unexpected stderr, failed var - original <= 0
├── original: 
├── actual distance: 3
├── diff: �[92m<W> fish: notify_register_file_descriptor() failed with status 9.
<W> fish: Universal variable notifications may not be received.
<W> fish: notify_post() failed with status 9. Uvar notifications may not be sent.
�[0m

└── var as str: <W> fish: notify_register_file_descriptor() failed with status 9.
<W> fish: Universal variable notifications may not be received.
<W> fish: notify_post() failed with status 9. Uvar notifications may not be sent.



command=`"fish" "-c" "# =============================================================================\n#\n# Utility functions for zoxide.\n#\n\n# Remove definitions.\n\n# pwd based on the value of _ZO_RESOLVE_SYMLINKS.\nfunction __zoxide_pwd\n    pwd -L\nend\n\n# cd + custom logic based on the value of _ZO_ECHO.\nfunction __zoxide_cd\n    cd $argv\n    and commandline -f repaint\nend\n\n# =============================================================================\n#\n# Hook configuration for zoxide.\n#\n\n# Initialize hook to add new entries to the database.\nfunction __zoxide_hook\n    zoxide add (__zoxide_pwd)\nend\n\n# =============================================================================\n#\n# When using zoxide with --no-aliases, alias these internal functions as\n# desired.\n#\n\n# Jump to a directory using only keywords.\nfunction __zoxide_z\n    set argc (count $argv)\n    if test $argc -eq 0\n        __zoxide_cd $HOME\n    else if begin; test $argc -eq 1; and test $argv[1] = \'-\'; end\n        __zoxide_cd -\n    else if begin; test $argc -eq 1; and test -d $argv[1]; end\n        __zoxide_cd $argv[1]\n    else\n        set -l __zoxide_result (zoxide query -- $argv)\n        and __zoxide_cd $__zoxide_result\n    end\nend\n\n# Jump to a directory using interactive search.\nfunction __zoxide_zi\n    set -l __zoxide_result (zoxide query -i -- $argv)\n    and __zoxide_cd $__zoxide_result\nend\n\n# Add a new entry to the database.\nfunction __zoxide_za\n    zoxide add $argv\nend\n\n# Query an entry from the database using only keywords.\nfunction __zoxide_zq\n    zoxide query $argv\nend\n\n# Query an entry from the database using interactive selection.\nfunction __zoxide_zqi\n    zoxide query -i $argv\nend\n\n# Remove an entry from the database using the exact path.\nfunction __zoxide_zr\n    zoxide remove $argv\nend\n\n# Remove an entry from the database using interactive selection.\nfunction __zoxide_zri\n    zoxide remove -i $argv\nend\n\n# =============================================================================\n#\n# Convenient aliases for zoxide. Disable these using --no-aliases.\n#\n# -- not configured --\n\n# =============================================================================\n#\n# To initialize zoxide with fish, add the following line to your fish\n# configuration file (usually ~/.config/fish/config.fish):\n#\n# zoxide init fish | source"`
code=0
stdout=
stderr=<W> fish: notify_register_file_descriptor() failed with status 9.
<W> fish: Universal variable notifications may not be received.
<W> fish: notify_post() failed with status 9. Uvar notifications may not be sent.
', /private/tmp/nix-build-zoxide-0.5.0.drv-0/zoxide-0.5.0-vendor.tar.gz/assert_cmd/src/assert.rs:428:17
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

---- shell::tests::test_pwsh stdout ----
thread 'shell::tests::test_pwsh' panicked at 'Unexpected failure.
code=<interrupted>
stderr=```Unhandled exception. System.Runtime.InteropServices.ExternalException (0x80004005): External component has thrown an exception.
   at System.Globalization.CompareInfo.SortHandleCache.GetCachedSortHandle(String sortName)
   at System.Globalization.CompareInfo.InitSort(CultureInfo culture)
   at System.Globalization.CultureInfo.get_CompareInfo()
   at System.Globalization.TextInfo.PopulateIsAsciiCasingSameAsInvariant()
   at System.Globalization.TextInfo.ChangeCaseCommon[TConversion](String source)
   at System.Globalization.TextInfo.ToLower(String str)
   at System.String.ToLowerInvariant()
   at Microsoft.PowerShell.CommandLineParameterParser.GetSwitchKey(String[] args, Int32& argIndex, CommandLineParameterParser parser, Boolean& noexitSeen)
   at Microsoft.PowerShell.CommandLineParameterParser.EarlyParse(String[] args)
   at Microsoft.PowerShell.UnmanagedPSEntry.Start(String consoleFilePath, String[] args, Int32 argc)
   at Microsoft.PowerShell.ManagedPSEntry.Main(String[] args)

command=`"pwsh" "-c" "# =============================================================================\n#\n# Utility functions for zoxide.\n#\n\n# pwd based on the value of _ZO_RESOLVE_SYMLINKS.\nfunction __zoxide_pwd {\n    $(Get-Location).Path\n}\n\n# cd + custom logic based on the value of _ZO_ECHO.\nfunction __zoxide_cd($dir) {\n    Set-Location $dir -ea Stop\n}\n\n# =============================================================================\n#\n# Hook configuration for zoxide.\n#\n\n# Hook to add new entries to the database.\nfunction __zoxide_hook {\n    zoxide add $(__zoxide_pwd)\n}\n\n# Initialize hook.\n# -- not configured --\n\n# =============================================================================\n#\n# When using zoxide with --no-aliases, alias these internal functions as\n# desired.\n#\n\n# Jump to a directory using only keywords.\nfunction __zoxide_z {\n    if ($args.Length -eq 0) {\n        __zoxide_cd ~\n    }\n    elseif ($args.Length -eq 1 -and $args[0] -eq \'-\') {\n        __zoxide_cd -\n    }\n    elseif ($args.Length -eq 1 -and ( Test-Path $args[0] -PathType Container) ) {\n        __zoxide_cd $args[0]\n    }\n    else {\n        $__zoxide_result = zoxide query -- @args\n        if ($LASTEXITCODE -eq 0) {\n            __zoxide_cd $__zoxide_result\n        }\n    }\n}\n\n# Jump to a directory using interactive search.\nfunction __zoxide_zi {\n    $__zoxide_result = zoxide query -i -- @args\n    if ($LASTEXITCODE -eq 0) {\n        __zoxide_cd $__zoxide_result\n    }\n}\n\n# Add a new entry to the database.\nfunction __zoxide_za {\n    zoxide add @args\n}\n\n# Query an entry from the database using only keywords.\nfunction __zoxide_zq {\n    zoxide query @args\n}\n\n# Query an entry from the database using interactive selection.\nfunction __zoxide_zqi {\n    zoxide query -i @args\n}\n\n# Remove an entry from the database using the exact path.\nfunction __zoxide_zr {\n    zoxide remove @args\n}\n\n# Remove an entry from the database using interactive selection.\nfunction __zoxide_zri {\n    zoxide remove -i @args\n}\n\n# =============================================================================\n#\n# Convenient aliases for zoxide. Disable these using --no-aliases.\n#\n# -- not configured --\n\n# =============================================================================\n#\n# To initialize zoxide with PowerShell, add the following line to your\n# PowerShell configuration file (the location is stored in $profile):\n#\n# Invoke-Expression (& { $hook = if ($PSVersionTable.PSVersion.Major -ge 6) { \'pwd\' } else { \'prompt\' } (zoxide init powershell --hook $hook) -join \"`n\" })"`
code=<interrupted>
stdout=
stderr=Unhandled exception. System.Runtime.InteropServices.ExternalException (0x80004005): External component has thrown an exception.
   at System.Globalization.CompareInfo.SortHandleCache.GetCachedSortHandle(String sortName)
   at System.Globalization.CompareInfo.InitSort(CultureInfo culture)
   at System.Globalization.CultureInfo.get_CompareInfo()
   at System.Globalization.TextInfo.PopulateIsAsciiCasingSameAsInvariant()
   at System.Globalization.TextInfo.ChangeCaseCommon[TConversion](String source)
   at System.Globalization.TextInfo.ToLower(String str)
   at System.String.ToLowerInvariant()
   at Microsoft.PowerShell.CommandLineParameterParser.GetSwitchKey(String[] args, Int32& argIndex, CommandLineParameterParser parser, Boolean& noexitSeen)
   at Microsoft.PowerShell.CommandLineParameterParser.EarlyParse(String[] args)
   at Microsoft.PowerShell.UnmanagedPSEntry.Start(String consoleFilePath, String[] args, Int32 argc)
   at Microsoft.PowerShell.ManagedPSEntry.Main(String[] args)

', /private/tmp/nix-build-zoxide-0.5.0.drv-0/zoxide-0.5.0-vendor.tar.gz/assert_cmd/src/assert.rs:146:17


failures:
    shell::tests::test_fish
    shell::tests::test_pwsh

test result: FAILED. 20 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out

�[0m�[0m�[1m�[31merror�[0m�[1m:�[0m test failed, to rerun pass '--bin zoxide'

@cole-h
Copy link
Member Author

@cole-h cole-h commented Oct 31, 2020

Looks like I'll need to disable tests on Darwin. I'll get around to that later tonight.

ajeetdsouza/zoxide@v0.4.3...v0.5.0

Tests are disabled on darwin because they fail and I can't troubleshoot
(since I don't have a darwin system).

Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
@cole-h
Copy link
Member Author

@cole-h cole-h commented Oct 31, 2020

Alright, pushed a change that disables tests on darwin (and expands preCheck as suggested). Thanks for testing, @SuperSandro2000.

@marsam marsam merged commit 705b159 into NixOS:master Oct 31, 2020
19 of 20 checks passed
@cole-h cole-h deleted the zoxide branch Nov 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants