Merge pull request 'update' (#285) from update-flake into main
Some checks failed
Hydra vf2Kernel Hydra build #58082 of nix-packages:riscv64-linux-master:vf2Kernel
Hydra linux-bcachefs Hydra build #58091 of nix-packages:x86_64-linux-master:linux-bcachefs
Hydra bcachefs-tools Hydra build #58093 of nix-packages:x86_64-linux-master:bcachefs-tools
Hydra papermc Hydra build #58096 of nix-packages:aarch64-linux-master:papermc
Hydra woodpecker-cli Hydra build #58097 of nix-packages:aarch64-linux-master:woodpecker-cli
Hydra woodpecker-frontend Hydra build #58098 of nix-packages:aarch64-linux-master:woodpecker-frontend
Hydra woodpecker-agent Hydra build #58100 of nix-packages:aarch64-linux-master:woodpecker-agent
Hydra woodpecker-server Hydra build #58101 of nix-packages:aarch64-linux-master:woodpecker-server
Hydra emoji-volpeon-neofox Hydra build #58085 of nix-packages:riscv64-linux-master:emoji-volpeon-neofox
ci/woodpecker/cron/update-lockfile Pipeline failed
Hydra lotte-art Hydra build #58206 of nix-packages:aarch64-linux-master:lotte-art
Hydra akkoma Hydra build #58208 of nix-packages:aarch64-linux-master:akkoma
Hydra fcitx5 Hydra build #58210 of nix-packages:aarch64-linux-master:fcitx5
Hydra packages.mautrix-telegram.aarch64-linux Hydra build #58518 of flakes:nix-packages:packages.mautrix-telegram.aarch64-linux
Hydra plover-plugins-manager Hydra build #58205 of nix-packages:aarch64-linux-master:plover-plugins-manager
Hydra emoji-lotte Hydra build #58201 of nix-packages:riscv64-linux-master:emoji-lotte
Hydra emoji-caro Hydra build #58202 of nix-packages:riscv64-linux-master:emoji-caro
Hydra mautrix-telegram Hydra build #58204 of nix-packages:aarch64-linux-master:mautrix-telegram
ci/woodpecker/cron/update Pipeline was successful

Reviewed-on: #285
This commit is contained in:
Charlotte 🦝 Delenk 2023-07-08 15:27:49 +00:00
commit d4e4810370
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
11 changed files with 6429 additions and 122 deletions

View file

@ -4,7 +4,7 @@
"files": "neofox.json",
"homepage": "https://volpeon.ink/projects/emojis/neofox/",
"src": "https://volpeon.ink/projects/emojis/neofox/neofox.zip",
"src_sha256": "14a61789c22f988bef6cf9ae314f25a713d7868d9a728c0ecfe51911cbe2db68",
"src_sha256": "507615d61e4e9084cc6def0fb79deb262ddaf39b2efbc431949500d9f51ba8cc",
"license": "CC BY-NC-SA 4.0"
}
}

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/woodpecker-ci/woodpecker",
"rev": "205f8ecc1649ab48a9d5fb52b0ecd7b8c24abf4f",
"date": "2023-07-07T07:04:34+02:00",
"path": "/nix/store/i4h40vw3gi72zbmia712fpx7x0ny9djb-woodpecker",
"sha256": "119w1jahkb0cjjv48rzrkavkvq5x01v574bjicvxr9lgmwqv9k2b",
"rev": "cef135eba5f21a3e4ad429f9af51f535ce907372",
"date": "2023-07-07T20:02:13+02:00",
"path": "/nix/store/8lab0szy89p5n04glnsyc8pci3ywyj8q-woodpecker",
"sha256": "1cbdy1lwnl714pg2zqy28a5646pkhch68gwp62rrmnqwf4fnkfh7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -383,9 +383,9 @@
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
"@iconify/json@^2.2.85":
version "2.2.87"
resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.87.tgz#b1b9f6c01d142cf00291e5414850c3a22eef61ae"
integrity sha512-sIFqYdTa5St7yjCHQ8wxgugNFVSjcboEOErf2ouxMGg8OACj/r+X6RXqIm+Y2OzEtjVnz6pR2WwlSbFPrijhGQ==
version "2.2.88"
resolved "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.88.tgz#f7b860731504cd256629c756415179854acc34dc"
integrity sha512-b0A0468m8paGVJIW/GzJIjb/vjTi+ITzcwOBiJ8ZrxUOKdUUs9rdZc4pjPr0zzFZIII8Sxe6+0Xr67DkYXzTQA==
dependencies:
"@iconify/types" "*"
pathe "^1.1.0"
@ -1081,9 +1081,9 @@ callsites@^3.0.0:
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
caniuse-lite@^1.0.30001503:
version "1.0.30001512"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz#7450843fb581c39f290305a83523c7a9ef0d4cb4"
integrity sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==
version "1.0.30001513"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001513.tgz#382fe5fbfb0f7abbaf8c55ca3ac71a0307a752e9"
integrity sha512-pnjGJo7SOOjAGytZZ203Em95MRM8Cr6jhCXNF/FAXTpCTRTECnqQWLpiTRqrFtdYcth8hf4WECUpkezuYsMVww==
chalk@^2.0.0:
version "2.4.2"
@ -1322,9 +1322,9 @@ domutils@^3.0.1:
domhandler "^5.0.3"
electron-to-chromium@^1.4.431:
version "1.4.452"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.452.tgz#d68bb9c02412cd454b16c265a432f6da753239a2"
integrity sha512-ITLyB1brjWat2oEIzbPjewgN6DnJlmW8isz4pMC54FctnaKhkZR1s9cCVgRZzrk7i1kW1n0k2G4hs3ibwFalyw==
version "1.4.454"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz#774dc7cb5e58576d0125939ec34a4182f3ccc87d"
integrity sha512-pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==
entities@^4.2.0:
version "4.5.0"
@ -2708,9 +2708,9 @@ semver@^6.3.0:
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8:
version "7.5.3"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"
@ -3021,9 +3021,9 @@ vite-svg-loader@^4.0.0:
svgo "^3.0.2"
vite@^4.3.9:
version "4.4.1"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.4.1.tgz#cfe0baf6af4b1b9f3b37c5ebf1e012622be3da98"
integrity sha512-8mmwPlsy7t+ZcTme7vdbVGuZ3Tri+lrLXr6hsF5UHdyYyARPPPMtM16QlqC9TZuCd5j3NmWs1rwka3cVSRHZTw==
version "4.4.2"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.4.2.tgz#acd47de771c498aec80e4900f30133d9529b278a"
integrity sha512-zUcsJN+UvdSyHhYa277UHhiJ3iq4hUBwHavOpsNUGsTgjBeoBlK8eDt+iT09pBq0h9/knhG/SPrZiM7cGmg7NA==
dependencies:
esbuild "^0.18.10"
postcss "^8.4.24"

View file

@ -456,11 +456,11 @@
};
}
{
name = "_iconify_json___json_2.2.87.tgz";
name = "_iconify_json___json_2.2.88.tgz";
path = fetchurl {
name = "_iconify_json___json_2.2.87.tgz";
url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.87.tgz";
sha512 = "sIFqYdTa5St7yjCHQ8wxgugNFVSjcboEOErf2ouxMGg8OACj/r+X6RXqIm+Y2OzEtjVnz6pR2WwlSbFPrijhGQ==";
name = "_iconify_json___json_2.2.88.tgz";
url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.2.88.tgz";
sha512 = "b0A0468m8paGVJIW/GzJIjb/vjTi+ITzcwOBiJ8ZrxUOKdUUs9rdZc4pjPr0zzFZIII8Sxe6+0Xr67DkYXzTQA==";
};
}
{
@ -1200,11 +1200,11 @@
};
}
{
name = "caniuse_lite___caniuse_lite_1.0.30001512.tgz";
name = "caniuse_lite___caniuse_lite_1.0.30001513.tgz";
path = fetchurl {
name = "caniuse_lite___caniuse_lite_1.0.30001512.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz";
sha512 = "2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw==";
name = "caniuse_lite___caniuse_lite_1.0.30001513.tgz";
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001513.tgz";
sha512 = "pnjGJo7SOOjAGytZZ203Em95MRM8Cr6jhCXNF/FAXTpCTRTECnqQWLpiTRqrFtdYcth8hf4WECUpkezuYsMVww==";
};
}
{
@ -1480,11 +1480,11 @@
};
}
{
name = "electron_to_chromium___electron_to_chromium_1.4.452.tgz";
name = "electron_to_chromium___electron_to_chromium_1.4.454.tgz";
path = fetchurl {
name = "electron_to_chromium___electron_to_chromium_1.4.452.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.452.tgz";
sha512 = "ITLyB1brjWat2oEIzbPjewgN6DnJlmW8isz4pMC54FctnaKhkZR1s9cCVgRZzrk7i1kW1n0k2G4hs3ibwFalyw==";
name = "electron_to_chromium___electron_to_chromium_1.4.454.tgz";
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.454.tgz";
sha512 = "pmf1rbAStw8UEQ0sr2cdJtWl48ZMuPD9Sto8HVQOq9vx9j2WgDEN6lYoaqFvqEHYOmGA9oRGn7LqWI9ta0YugQ==";
};
}
{
@ -3040,11 +3040,11 @@
};
}
{
name = "semver___semver_7.5.3.tgz";
name = "semver___semver_7.5.4.tgz";
path = fetchurl {
name = "semver___semver_7.5.3.tgz";
url = "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz";
sha512 = "QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==";
name = "semver___semver_7.5.4.tgz";
url = "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz";
sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==";
};
}
{
@ -3376,11 +3376,11 @@
};
}
{
name = "vite___vite_4.4.1.tgz";
name = "vite___vite_4.4.2.tgz";
path = fetchurl {
name = "vite___vite_4.4.1.tgz";
url = "https://registry.yarnpkg.com/vite/-/vite-4.4.1.tgz";
sha512 = "8mmwPlsy7t+ZcTme7vdbVGuZ3Tri+lrLXr6hsF5UHdyYyARPPPMtM16QlqC9TZuCd5j3NmWs1rwka3cVSRHZTw==";
name = "vite___vite_4.4.2.tgz";
url = "https://registry.yarnpkg.com/vite/-/vite-4.4.2.tgz";
sha512 = "zUcsJN+UvdSyHhYa277UHhiJ3iq4hUBwHavOpsNUGsTgjBeoBlK8eDt+iT09pBq0h9/knhG/SPrZiM7cGmg7NA==";
};
}
{

View file

@ -259,11 +259,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1688706787,
"narHash": "sha256-STveiR1bamEloAqO2Y3ywPwofylRs/mk7cfKO0OIL+c=",
"lastModified": 1688800490,
"narHash": "sha256-gsCh6ermMwQEPxi0AC7YS+rZ/v4xLTafPRFGAon903s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f91766e8c58501176aa67e34a460e588f9a56fb",
"rev": "c138b605600fa00307dc3f090b9d21ee771892f0",
"type": "github"
},
"original": {

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/koverstreet/bcachefs-tools",
"rev": "84cb7bffe5e80ef9036213bbfbaf358d478536be",
"date": "2023-06-18T16:20:01-04:00",
"path": "/nix/store/l0fr5n1crs2fqzaa7nm2iy5mxac27ijx-bcachefs-tools-84cb7bf",
"sha256": "19k6wzjw3yfcrrni5m38r17vl1sb5jr3fwn9dwdkrqmxp2kl3rdx",
"rev": "c99a444c5cc242a89845be83236aacd7db628ef5",
"date": "2023-07-07T04:25:07-04:00",
"path": "/nix/store/g8023jpasa99g7md893w2lwx457k7l2c-bcachefs-tools",
"sha256": "1yw5mbf9r9zjpqhk3jah1gnqspk9fqzpdfv3wigxmd0bvq193gz9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/koverstreet/bcachefs",
"rev": "3c29e114d8735ccf310f3e9bf5db1fc5d1c6a131",
"date": "2023-06-28T20:35:20-04:00",
"path": "/nix/store/j56pp43j1hzng4w3bw2gfkgf050mpnzm-bcachefs",
"sha256": "19d5vb3jmxv3qzxx9zk6bws3p2f9wgih5rlmx043vq5p4yk285gb",
"rev": "aa89863f95f3d7fb549e156cc12ba39a553ed00d",
"date": "2023-07-07T18:06:27-04:00",
"path": "/nix/store/kmwx0mdjfwnm22l2arhllshmg9g4gwr7-bcachefs",
"sha256": "1ln3pmkiw3dq5c330xgaaxqcclwvhpjdndq8xss1q6w14nm3snb5",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -2,86 +2,44 @@
{
lib,
fetchFromGitHub,
buildLinux,
linuxManualConfig,
fetchpatch,
applyPatches,
...
} @ args: let
modDirVersion = "6.4.0-rc6";
modDirVersion = "6.4.0";
source = builtins.fromJSON (builtins.readFile ./source.json);
in
buildLinux (args
// {
linuxManualConfig ({
inherit modDirVersion;
version = "${modDirVersion}-vf2";
src = fetchFromGitHub {
owner = "starfive-tech";
repo = "linux";
inherit (source) rev sha256;
};
kernelPatches = [
# https://lore.kernel.org/all/20230524000012.15028-1-andre.przywara@arm.com/
rec {
name = "axp15060-1.patch";
patch = fetchpatch {
inherit name;
src = applyPatches {
src = fetchFromGitHub {
owner = "starfive-tech";
repo = "linux";
inherit (source) rev sha256;
};
patches = [
(fetchpatch {
name = "axp15060-1.patch";
url = "https://lore.kernel.org/all/20230524000012.15028-2-andre.przywara@arm.com/raw";
hash = "sha256-kj4vQaT4CV29EHv8MtuTgM/semIPDdv2dmveo/X27vU=";
};
}
rec {
name = "axp15060-2.patch";
patch = fetchpatch {
inherit name;
})
(fetchpatch {
name = "axp15060-2.patch";
url = "https://lore.kernel.org/all/20230524000012.15028-3-andre.przywara@arm.com/raw";
hash = "sha256-QCPQyKqoapMtqEDB9QgAuXA7n8e1OtG+YlIgeSQBxXM=";
};
}
rec {
name = "axp15060-3.patch";
patch = fetchpatch {
inherit name;
})
(fetchpatch {
name = "axp15060-3.patch";
url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw";
hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM=";
};
}
];
structuredExtraConfig = with lib.kernel; {
CPU_FREQ = yes;
CPUFREQ_DT = yes;
CPUFREQ_DT_PLATDEV = yes;
DMADEVICES = yes;
GPIO_SYSFS = yes;
HIBERNATION = yes;
NO_HZ_IDLE = yes;
POWER_RESET_GPIO_RESTART = yes;
PROC_KCORE = yes;
PWM = yes;
PWM_STARFIVE_PTC = yes;
RD_GZIP = yes;
SENSORS_SFCTEMP = yes;
SERIAL_8250_DW = yes;
SIFIVE_CCACHE = yes;
SIFIVE_PLIC = yes;
RTC_DRV_STARFIVE = yes;
SPI_PL022 = yes;
SPI_PL022_STARFIVE = yes;
I2C = yes;
MFD_AXP20X = yes;
MFD_AXP20X_I2C = yes;
REGULATOR_AXP20X = yes;
# FATAL: modpost: drivers/gpu/drm/verisilicon/vs_drm: struct of_device_id is not terminated with a NULL entry!
DRM_VERISILICON = no;
PL330_DMA = no;
})
];
};
preferBuiltin = true;
configfile = ./vf2.config;
extraMeta = {
branch = "JH7110_VisionFive2_upstream";

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/starfive-tech/linux",
"rev": "0f114a7b7058bb621f469e7fb51ef893722f9366",
"date": "2023-06-13T13:58:57+08:00",
"path": "/nix/store/gawhkrpjyh74dz1rils62y02ia3fpfpr-linux",
"sha256": "0qyhk8c9wwf3hzwyijiig9hscbvbghypyd8pnjq01jn0pxhfmkv2",
"rev": "e5a381c51d624ffd8784db908a58ae227d0608a4",
"date": "2023-06-29T17:00:49+08:00",
"path": "/nix/store/7ks8y8krj0c37m9a0q6dznjh5lkak8gr-linux",
"sha256": "04f9b8aih2pvxl2vj8xm6m4knkly14h4mcj9ylw9m7nxhkcgw3c2",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

6349
linux/vf2/vf2.config Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{
"version": "1.20.1",
"build": 66,
"name": "paper-1.20.1-66.jar",
"sha256": "7b66acad7956c34b7c373af94ecd3dc1cdc92bc7ea679f692f5f5ceeff47d2d2"
"build": 67,
"name": "paper-1.20.1-67.jar",
"sha256": "9184c6bd1fb5a54d3f13d589e871954fe5a66b2196394bd4bf72e048f1b31f71"
}