Skip to content

Commit 4331d2e

Browse files
committed
project: vs r58 has been released.
1 parent 3659580 commit 4331d2e

File tree

3 files changed

+68
-31
lines changed

3 files changed

+68
-31
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
vs: ["57", "latest"]
10+
vs: ["57", "58", "latest"]
1111
py: ["39", "310"]
1212
steps:
1313
- uses: actions/checkout@v2.4.0

flake.lock

Lines changed: 49 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
23
inputs.flake-utils.url = "github:numtide/flake-utils";
34

5+
####
6+
# This is for our test matrix.
7+
48
# VS latest
59
inputs.vs_latest_vs = {
610
url = "github:vapoursynth/vapoursynth";
@@ -20,6 +24,14 @@
2024
url = "github:sekrit-twc/zimg/v3.0";
2125
flake = false;
2226
};
27+
inputs.vs_58_vs = {
28+
url = "github:vapoursynth/vapoursynth/R58";
29+
flake = false;
30+
};
31+
inputs.vs_58_zimg = {
32+
url = "github:sekrit-twc/zimg/v3.0";
33+
flake = false;
34+
};
2335

2436
outputs = { self, nixpkgs, flake-utils, ... }@releases:
2537
let
@@ -32,28 +44,23 @@
3244
# Supported versions
3345
versions = {
3446
python = [ "39" "310" ];
35-
vapoursynth = [ 57 "latest" ];
47+
vapoursynth = [ 58 "latest" ];
3648
};
3749

3850
# Version-Numbers for versions like "latest"
3951
aliases = {
4052
vapoursynth = {
41-
latest = 58;
53+
latest = 59;
4254
};
4355
};
44-
45-
## Versions
46-
module = pkgs: vapoursynth: ps: ps.buildPythonPackage rec {
47-
};
4856
in
49-
{
50-
51-
} // (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
57+
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
5258
let
5359
pkgs = import nixpkgs {
5460
inherit system;
5561
config = {
5662
allowUnsupportedSystem = true;
63+
allowBroken = true;
5764
};
5865
};
5966

@@ -131,15 +138,6 @@
131138
cp dist/* $out
132139
''
133140
);
134-
135-
docs = pkgs.runCommandNoCC "docs" {
136-
src = ./.;
137-
nativeBuildInputs = [ (pkgs."python${defaults.python}".pkgs.mkdocs) ];
138-
} ''
139-
mkdir $out
140-
mkdocs build
141-
cp -a site/* $out
142-
'';
143141
};
144142

145143
# Build shells with each vapoursynth-version / python-tuple
@@ -153,6 +151,7 @@
153151
]))
154152

155153
(versions.python.withPackages (ps: [
154+
# ps.mkdocs-material
156155
ps.mkdocs
157156
]))
158157
];
@@ -168,5 +167,5 @@
168167
# Compat with nix<2.7
169168
devShell = devShells.default;
170169
defaultPackage = packages.default;
171-
}));
170+
});
172171
}

0 commit comments

Comments
 (0)