Merge pull request #61 from nix-community/ci

This commit is contained in:
Jörg Thalheim 2021-01-09 10:15:54 +00:00 committed by GitHub
commit 14eec73a76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -25,4 +25,4 @@ jobs:
keep-derivations = true keep-derivations = true
experimental-features = nix-command flakes experimental-features = nix-command flakes
- run: - run:
nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixpkgs-unstable.tar.gz ci.nix --run 'true' nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz ci.nix --run 'true'

View file

@ -123,7 +123,7 @@ use_nix() {
path=$("${NIX_BIN_PREFIX}nix-instantiate" --find-file nixpkgs) path=$("${NIX_BIN_PREFIX}nix-instantiate" --find-file nixpkgs)
layout_dir=$(direnv_layout_dir) layout_dir=$(direnv_layout_dir)
local experimental_flags=() local experimental_flags=()
if nix-shell --experimental-features '' --version 2>/dev/null; then if nix-shell --experimental-features '' --version 2>/dev/null >&2; then
experimental_flags+=('--experimental-features' 'nix-command flakes') experimental_flags+=('--experimental-features' 'nix-command flakes')
fi fi