Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2024-11-10 15:20:55 +00:00
Code Issues Projects Releases Wiki Activity

Use Nushell from Nixpkgs unstable (#171)

Browse Source
This commit is contained in:
Ajeet D'Souza 2021-04-05 12:01:24 +05:30 committed by GitHub
parent 0b7b29e0e8
commit 3398cc721d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/ci.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/install@v0.1
@ -19,13 +19,10 @@ jobs:
with:
crate: cargo-audit
version: latest
- uses: actions-rs/install@v0.1
if: ${{ matrix.os != 'windows-latest' }}
with:
crate: nu
version: latest
- uses: cachix/install-nix-action@v12
if: ${{ matrix.os != 'windows-latest' }}
with:
nix_path: nixpkgs=channel:nixos-stable
- run: make test
- run: mkdir -p /tmp/home && make test
env:
HOME: /tmp/home

18
Makefile
View File

@ -16,7 +16,7 @@ endif
ifeq ($(NIX), true)
build:
nix-shell --run 'cargo build $(build_flags) $(ci_color_always)'
nix-shell --pure --run 'cargo build $(build_flags) $(ci_color_always)'
else
build:
cargo build $(build_flags) $(ci_color_always)
@ -24,7 +24,7 @@ endif
ifeq ($(NIX), true)
clean:
nix-shell --run 'cargo clean $(ci_color_always)'
nix-shell --pure --run 'cargo clean $(ci_color_always)'
else
clean:
cargo clean $(ci_color_always)
@ -32,7 +32,7 @@ endif
ifeq ($(NIX), true)
install:
nix-shell --run 'cargo install --path=. $(ci_color_always)'
nix-shell --pure --run 'cargo install --path=. $(ci_color_always)'
else
install:
cargo install --path=. $(ci_color_always)
@ -40,11 +40,11 @@ endif
ifeq ($(NIX), true)
test:
nix-shell --run 'cargo fmt -- --check --files-with-diff $(ci_color_always)'
nix-shell --run 'cargo check --all-features $(build_flags) $(ci_color_always)'
nix-shell --run 'cargo clippy --all-features $(build_flags) $(ci_color_always) -- --deny warnings --deny clippy::all'
nix-shell --run 'cargo test --all-features --no-fail-fast $(build_flags) $(ci_color_always)'
nix-shell --run 'cargo audit --deny warnings $(ci_color_always) --ignore=RUSTSEC-2020-0095'
nix-shell --pure --run 'cargo fmt -- --check --files-with-diff $(ci_color_always)'
nix-shell --pure --run 'cargo check --all-features $(build_flags) $(ci_color_always)'
nix-shell --pure --run 'cargo clippy --all-features $(build_flags) $(ci_color_always) -- --deny warnings --deny clippy::all'
nix-shell --pure --run 'cargo test --all-features --no-fail-fast $(build_flags) $(ci_color_always)'
nix-shell --pure --run 'cargo audit --deny warnings $(ci_color_always) --ignore=RUSTSEC-2020-0095'
else
test:
cargo fmt -- --check --files-with-diff $(ci_color_always)
@ -56,7 +56,7 @@ endif
ifeq ($(NIX), true)
uninstall:
nix-shell --run 'cargo uninstall $(ci_color_always)'
nix-shell --pure --run 'cargo uninstall $(ci_color_always)'
else
uninstall:
cargo uninstall $(ci_color_always)

3
contrib/ranger.py
View File

@ -1,8 +1,9 @@
import os.path
import subprocess
import ranger.api
import ranger.core.fm
import ranger.ext.signals
import subprocess
hook_init_old = ranger.api.hook_init

18
shell.nix
View File

@ -1,29 +1,27 @@
{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz") {} }:
let
python-pkgs = pkgs.python3.withPackages (pkgs: [ pkgs.black pkgs.mypy pkgs.pylint ]);
pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/20.09.tar.gz") {};
pkgs-master = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/470e4a9bbc98b171a7e733dfc9e62531f7b9ceca.tar.gz") {};
pkgs-python = pkgs.python3.withPackages (pkgs: [ pkgs.black pkgs.mypy pkgs.pylint ]);
in
pkgs.mkShell {
name = "env";
buildInputs = [
pkgs-master.cargo-audit
pkgs-master.nushell
pkgs-python
pkgs.bash
pkgs.cargo
pkgs.cargo-audit
pkgs.clippy
pkgs.dash
pkgs.fish
pkgs.fzf
pkgs.git
# pkgs.nushell # FIXME: too outdated
pkgs.powershell
pkgs.rustc
pkgs.rustfmt
pkgs.shellcheck
pkgs.shfmt
pkgs.xonsh
pkgs.zsh
python-pkgs
];
# Set Environment Variables
RUST_BACKTRACE = 1;
}