Commit 530964d
Changed files (2)
.forgejo
workflows
.forgejo/workflows/auto-update.yml
@@ -7,7 +7,6 @@ on:
enable-openid-connect: true
env:
AUTHORIZED_INTEGRATION_AUDIENCE: "u:302663:cf6d5efd-a70c-4b33-a5af-d9b6eea3b0bd"
- NIX_PATH: nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz
jobs:
auto-update:
runs-on: nixos-latest
@@ -34,6 +33,8 @@ jobs:
- name: Setup GitHub Token
run: |
echo "access-tokens = github.com=${{ secrets.NIX_GITHUB_TOKEN }}" >> /etc/nix/nix.conf
+ nixpkgsRev=$(nix-instantiate --eval -E '(builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked.rev' | tr -d '"')
+ echo "NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/${nixpkgsRev}.tar.gz" >> "$FORGEJO_ENV"
- name: Update packages and open PRs
env:
FORGEJO_TOKEN: ${{ steps.jwt.outputs.jwt }}
.forgejo/workflows/build.yml
@@ -34,9 +34,6 @@ jobs:
# https://github.com/<your_githubname>/nur-packages/settings/secrets
cachixName:
- hpcesia-nur
- nixPath:
- - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz
- # - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-26.05.tar.gz
runs-on: nixos-latest-high
steps:
- name: Checkout repository
@@ -47,7 +44,8 @@ jobs:
echo "substituters = https://mirrors.ustc.edu.cn/nix-channels/store?priority=39 \
https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store?priority=39 \
https://cache.nixos.org?priority=40" >> /etc/nix/nix.conf
- echo "NIX_PATH=${{ matrix.nixPath }}" >> $FORGEJO_ENV
+ nixpkgsRev=$(nix-instantiate --eval -E '(builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked.rev' | tr -d '"')
+ echo "NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs/archive/${nixpkgsRev}.tar.gz" >> $FORGEJO_ENV
- name: Show nixpkgs version
run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
- name: Setup cachix