Compare commits
11 Commits
698ad1803d
...
c32fdde780
Author | SHA1 | Date | |
---|---|---|---|
c32fdde780 | |||
b1195b3d50 | |||
a2fbb58011 | |||
3d79b690e4 | |||
|
5f205a48c2 | ||
|
7de26a6d71 | ||
|
97ca7a2f35 | ||
|
734650a80a | ||
|
0d269dba16 | ||
|
8f2e2d2372 | ||
7a84f381fc |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@ -15,11 +15,10 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- uses: cachix/install-nix-action@v20
|
- uses: cachix/install-nix-action@v22
|
||||||
- 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:
|
||||||
@ -46,7 +45,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@v20
|
uses: cachix/install-nix-action@v22
|
||||||
- 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
|
||||||
@ -55,6 +54,8 @@ 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
|
||||||
|
2
.github/workflows/update.yml
vendored
2
.github/workflows/update.yml
vendored
@ -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@v20
|
- uses: cachix/install-nix-action@v22
|
||||||
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
12
flake.lock
generated
@ -5,11 +5,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1685518550,
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -20,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684668519,
|
"lastModified": 1687103638,
|
||||||
"narHash": "sha256-KkVvlXTqdLLwko9Y0p1Xv6KQ9QTcQorrU098cGilb7c=",
|
"narHash": "sha256-dwy/TK6Db5W7ivcgmcxUykhFwodIg0jrRzOFt7H5NUc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "85340996ba67cc02f01ba324e18b1306892ed6f5",
|
"rev": "91430887645a0953568da2f3e9a3a3bb0a0378ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -37,11 +37,16 @@
|
|||||||
# 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=$(nix-instantiate --find-file nixpkgs) \
|
-I nixpkgs="$nixpkgs" \
|
||||||
-I ./ \
|
-I ./ \
|
||||||
--json | ${pkgs.jq}/bin/jq -r 'values | .[].name'
|
--json | ${pkgs.jq}/bin/jq -r 'values | .[].name'
|
||||||
'';
|
'';
|
||||||
|
@ -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;
|
||||||
outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
|
outputSha256 = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
|
||||||
});
|
});
|
||||||
|
|
||||||
ligatureInputs = [
|
ligatureInputs = [
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, lib
|
, lib
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
|
||||||
, python3
|
, python3
|
||||||
, ffmpeg
|
, ffmpeg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ytarchive";
|
pname = "ytarchive";
|
||||||
version = "0.2.2";
|
version = "0.2.2+0304577";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Kethsar";
|
owner = "Kethsar";
|
||||||
repo = "ytarchive";
|
repo = "ytarchive";
|
||||||
rev = "v${version}";
|
# NOTE: Last revision where it was written in Python, so don't change
|
||||||
sha256 = "xT45FF0ztWQXzQgYztl2YKiI2iGJfnCXgCMw8gOmxzM=";
|
# without rewriting the derivation.
|
||||||
|
rev = "030457749d6c8d1d62240bfbad659326f3cd3a30";
|
||||||
|
hash = "sha256-mvmdkxZxlEbWc7GR8LfyxTJOeEhjCoYyeatDx8l1uhM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
Loading…
Reference in New Issue
Block a user