Compare commits

..

No commits in common. "35c961fd557fcf5a9f6a9ad14c26b237a2fe4ea3" and "2bb9caefd8114f1af92ada23eba384b583a6990b" have entirely different histories.

2 changed files with 4 additions and 6 deletions

View File

@ -39,9 +39,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install nix - name: Install nix
uses: DeterminateSystems/nix-installer-action@main uses: cachix/install-nix-action@v21
with: with:
nix_path: "${{ matrix.nixPath }}" nix_path: "${{ matrix.nixPath }}"
# nix 2.6 breaks restrict-eval, when using the NIX_PATH # nix 2.6 breaks restrict-eval, when using the NIX_PATH
@ -49,7 +49,6 @@ jobs:
extra_nix_config: | extra_nix_config: |
experimental-features = nix-command flakes experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: DeterminateSystems/magic-nix-cache-action@main
- name: Show nixpkgs version - name: Show nixpkgs version
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version' run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
#- name: Setup cachix #- name: Setup cachix

View File

@ -18,9 +18,8 @@
freqtop = pkgs.callPackage ./pkgs/freqtop { }; freqtop = pkgs.callPackage ./pkgs/freqtop { };
map = pkgs.callPackage ./pkgs/map { }; map = pkgs.callPackage ./pkgs/map { };
q = pkgs.callPackage ./pkgs/q { }; q = pkgs.callPackage ./pkgs/q { };
# TODO: fix dependency specification raspi-oled = pkgs.callPackage ./pkgs/raspi-oled { };
#raspi-oled = pkgs.callPackage ./pkgs/raspi-oled { }; raspi-oled-cross = pkgs.pkgsCross.muslpi.callPackage ./pkgs/raspi-oled { };
#raspi-oled-cross = pkgs.pkgsCross.muslpi.callPackage ./pkgs/raspi-oled { };
ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all { ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all {
inherit (pkgs.darwin.apple_sdk.frameworks) Security; inherit (pkgs.darwin.apple_sdk.frameworks) Security;
}; };