Compare commits

..

No commits in common. "c32fdde780269f5493ae55b109e85c0970435585" and "698ad1803d983d749f8bf0cd59b6f0f12b8ba3c3" have entirely different histories.

6 changed files with 16 additions and 23 deletions

View File

@ -15,10 +15,11 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22 - uses: cachix/install-nix-action@v20
- name: Check ${{ matrix.check }} - name: Check ${{ matrix.check }}
# Depends on nixos/nix#7759 to simply `nix flake check` # Depends on nixos/nix#7759 to simply `nix flake check`
run: nix run .#checks.$(nix eval --raw --impure --expr "builtins.currentSystem").${{ matrix.check }} run: nix run .#checks.$(nix eval --raw --impure --expr "builtins.currentSystem").${{ matrix.check }}
continue-on-error: true
build-and-update: build-and-update:
strategy: strategy:
@ -45,7 +46,7 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install nix - name: Install nix
uses: cachix/install-nix-action@v22 uses: cachix/install-nix-action@v20
- name: Show nixpkgs version - name: Show nixpkgs version
run: nix eval --impure --expr '(import ./flake-compat.nix { src = ./.; }).lib.version' run: nix eval --impure --expr '(import ./flake-compat.nix { src = ./.; }).lib.version'
- name: Setup cachix - name: Setup cachix
@ -54,8 +55,6 @@ jobs:
with: with:
name: ${{ matrix.cachixName }} name: ${{ matrix.cachixName }}
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- name: Check nix
run: nix flake check --show-trace
- name: Build nix packages - name: Build nix packages
run: nix develop .#ci -c nix-build-uncached ci.nix -A cacheOutputs run: nix develop .#ci -c nix-build-uncached ci.nix -A cacheOutputs
- name: Trigger NUR update - name: Trigger NUR update

View File

@ -12,7 +12,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22 - uses: cachix/install-nix-action@v20
with: with:
extra_nix_config: | extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

12
flake.lock generated
View File

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1681202837,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1687103638, "lastModified": 1684668519,
"narHash": "sha256-dwy/TK6Db5W7ivcgmcxUykhFwodIg0jrRzOFt7H5NUc=", "narHash": "sha256-KkVvlXTqdLLwko9Y0p1Xv6KQ9QTcQorrU098cGilb7c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "91430887645a0953568da2f3e9a3a3bb0a0378ac", "rev": "85340996ba67cc02f01ba324e18b1306892ed6f5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -37,16 +37,11 @@
# Normally we'd also run with `--option restrict-eval true`, but # Normally we'd also run with `--option restrict-eval true`, but
# this is incompatible with flakes because reasons. # this is incompatible with flakes because reasons.
nur = pkgs.writeShellScriptBin "nur-check" '' nur = pkgs.writeShellScriptBin "nur-check" ''
# Prefer nixpkgs channel (actual build), otherwise read from flake.lock (CI)
if ! nixpkgs=$(nix-instantiate --find-file nixpkgs 2>/dev/null); then
_rev=$(${pkgs.jq}/bin/jq -r .nodes.nixpkgs.locked.rev flake.lock)
nixpkgs="https://github.com/nixos/nixpkgs/archive/''${_rev}.tar.gz"
fi
nix-env -f . -qa \* --meta \ nix-env -f . -qa \* --meta \
--allowed-uris https://static.rust-lang.org \ --allowed-uris https://static.rust-lang.org \
--option allow-import-from-derivation true \ --option allow-import-from-derivation true \
--drv-path --show-trace \ --drv-path --show-trace \
-I nixpkgs="$nixpkgs" \ -I nixpkgs=$(nix-instantiate --find-file nixpkgs) \
-I ./ \ -I ./ \
--json | ${pkgs.jq}/bin/jq -r 'values | .[].name' --json | ${pkgs.jq}/bin/jq -r 'values | .[].name'
''; '';

View File

@ -25,7 +25,7 @@ alacritty.overrideAttrs (oldAttrs: rec {
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
name = "${pname}-${version}-vendor.tar.gz"; name = "${pname}-${version}-vendor.tar.gz";
inherit src; inherit src;
outputSha256 = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc="; outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
}); });
ligatureInputs = [ ligatureInputs = [

View File

@ -1,21 +1,20 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, python3 , python3
, ffmpeg , ffmpeg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ytarchive"; pname = "ytarchive";
version = "0.2.2+0304577"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Kethsar"; owner = "Kethsar";
repo = "ytarchive"; repo = "ytarchive";
# NOTE: Last revision where it was written in Python, so don't change rev = "v${version}";
# without rewriting the derivation. sha256 = "xT45FF0ztWQXzQgYztl2YKiI2iGJfnCXgCMw8gOmxzM=";
rev = "030457749d6c8d1d62240bfbad659326f3cd3a30";
hash = "sha256-mvmdkxZxlEbWc7GR8LfyxTJOeEhjCoYyeatDx8l1uhM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [