update and add riscv support

This commit is contained in:
Charlotte 🦝 Delenk 2023-06-16 06:40:20 +01:00
parent fc9f56b614
commit 8ca80f4687
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
18 changed files with 133 additions and 102 deletions

View file

@ -77,7 +77,7 @@ in
// (
if pkgs.system == "riscv64-linux"
then {
inherit (pkgsWithOverlay) vf2Kernel vf2KernelPackages;
inherit (pkgsWithOverlay) vf2Kernel;
}
else {}
)

View file

@ -259,11 +259,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686752049,
"narHash": "sha256-GtSbXZ6ia/o+f/I5O/5ee8HGmKuwQWZhtyd2u5y5TOk=",
"lastModified": 1687059273,
"narHash": "sha256-xbYjk/7CoabX8LTipr5QxVg8mY7u6R/qgPpELfCtQco=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "eafbb465a91939b9a47bc05fcef0f948903755c1",
"rev": "5799ed8639d5a6883da4b6f315f2cc61c874149d",
"type": "github"
},
"original": {

View file

@ -121,7 +121,7 @@
// (
if system == "riscv64-linux"
then {
inherit (pkgs) vf2Kernel vf2KernelPackages;
inherit (pkgs) vf2Kernel;
}
else {}
);
@ -129,12 +129,9 @@
modules = import ./modules;
lib = import ./lib {inherit pkgs;};
hydraJobs =
if (system == "x86_64-linux") || (system == "aarch64-linux")
then {
hydraJobs = {
inherit packages devShells formatter;
}
else {};
};
}
);
}

View file

@ -4,7 +4,7 @@
}: let
pkgs = import nixpkgs {};
prs = builtins.fromJSON (builtins.readFile prsJSON);
systems = ["x86_64-linux" "aarch64-linux"];
systems = ["x86_64-linux" "aarch64-linux" "riscv64-linux"];
nixpkgs_version = ["master"];
mkJobsets = system: version:
(builtins.listToAttrs (

View file

@ -20,34 +20,69 @@ in
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;
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;
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;
url = "https://lore.kernel.org/all/20230524000012.15028-4-andre.przywara@arm.com/raw";
hash = "sha256-SpKDm4PXR6qs7kX5SGVpFF/EPBijMhX1NsFUHrlCynM=";
};
}
];
structuredExtraConfig = with lib.kernel; {
ARCH_STARFIVE = yes;
SOC_STARFIVE = yes;
SERIAL_8250 = yes;
NO_HZ_IDLE = yes;
CPU_FREQ = yes;
CPUFREQ_DT = yes;
CPUFREQ_DT_PLATDEV = yes;
HIBERNATION = yes;
DMADEVICES = yes;
GPIO_SYSFS = yes;
POWER_RESET_GPIO_RESET = 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;
V4L_PLATFORM_DRIVERS = no; # TODO: Make module
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;
extraMeta = {
branch = "JH7110_VisionFive2_upstream";
description = "Linux kernel for StarFive's VisionFive2";

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/maunium/element-web",
"rev": "6c6a7f1b75ec0ccdf6429051cd5e14178fd84fdf",
"date": "2023-06-13T19:26:23+03:00",
"path": "/nix/store/wzvzx1c1n9z4y974831ia6lpqm4qzadl-element-web",
"sha256": "1kr5f9jsbc0rdvxsq2jxmq1myq5qmi5chi1hlc4yy0rhbnp2d179",
"rev": "1e4b24dcee68dbe2a71188788a457097c550aeae",
"date": "2023-06-16T15:37:26+03:00",
"path": "/nix/store/dxccv35k1b2xc0x5gwk6n90z04jmp1dc-element-web",
"sha256": "0afzda020rkyrazxpipl9qd3pywlqk33fgf88mnqnjh9qxcmaaba",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1592,9 +1592,9 @@
integrity sha512-8V2NKuzGOFzEZeZVgF2is7gmuopdRbMZ064tzPDE0vN34iX6s3O8A4oxIT7SA3qtymwm3t1yEvTnT+0gfbmh4g==
"@matrix-org/matrix-wysiwyg@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.2.2.tgz#911d0a9858a5a4b620f93777085daac8eff6a220"
integrity sha512-FprkgKiqEHoFUfaamKwTGBENqDxbORFgoPjiE1b9yPS3hgRswobVKRl4qrXgVgFj4qQ7gWeTqogiyrHXkm1myw==
version "2.3.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.0.tgz#7a815fb90600342cc74c03a3cc7c9908a1d15dd1"
integrity sha512-VtA+Bti2IdqpnpCNaTFHMjbpKXe4xHR+OWWJl/gjuYgn4NJO9lfeeEIv34ftC6dBh7R280JEiMxQ9mDcH0J54g==
"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
version "3.2.14"
@ -8339,7 +8339,7 @@ matrix-events-sdk@0.0.1:
"matrix-js-sdk@github:maunium/matrix-js-sdk":
version "26.0.1"
resolved "https://codeload.github.com/maunium/matrix-js-sdk/tar.gz/2647c5884d54bfa67bda68719a2c88306633dd69"
resolved "https://codeload.github.com/maunium/matrix-js-sdk/tar.gz/04ad5184ca39c2c3522825b2cb44a702da2671eb"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.10"

View file

@ -1472,11 +1472,11 @@
};
}
{
name = "_matrix_org_matrix_wysiwyg___matrix_wysiwyg_2.2.2.tgz";
name = "_matrix_org_matrix_wysiwyg___matrix_wysiwyg_2.3.0.tgz";
path = fetchurl {
name = "_matrix_org_matrix_wysiwyg___matrix_wysiwyg_2.2.2.tgz";
url = "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.2.2.tgz";
sha512 = "FprkgKiqEHoFUfaamKwTGBENqDxbORFgoPjiE1b9yPS3hgRswobVKRl4qrXgVgFj4qQ7gWeTqogiyrHXkm1myw==";
name = "_matrix_org_matrix_wysiwyg___matrix_wysiwyg_2.3.0.tgz";
url = "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.0.tgz";
sha512 = "VtA+Bti2IdqpnpCNaTFHMjbpKXe4xHR+OWWJl/gjuYgn4NJO9lfeeEIv34ftC6dBh7R280JEiMxQ9mDcH0J54g==";
};
}
{
@ -8696,11 +8696,11 @@
};
}
{
name = "2647c5884d54bfa67bda68719a2c88306633dd69";
name = "04ad5184ca39c2c3522825b2cb44a702da2671eb";
path = fetchurl {
name = "2647c5884d54bfa67bda68719a2c88306633dd69";
url = "https://codeload.github.com/maunium/matrix-js-sdk/tar.gz/2647c5884d54bfa67bda68719a2c88306633dd69";
sha512 = "64cf2e68fdcc84c1d2562a5fb5e54964a959ef74519d36b94afe5c60e233b72403e4843b3d818650a1bc387b59f3c32e4b5cbd854953f036d02aaba19fc88074";
name = "04ad5184ca39c2c3522825b2cb44a702da2671eb";
url = "https://codeload.github.com/maunium/matrix-js-sdk/tar.gz/04ad5184ca39c2c3522825b2cb44a702da2671eb";
sha512 = "cbde4cc924b6e203b4f817c92fc58b447bbb4e3c8da03cd2f23366c57b590198ba4457697cfbce2e2111e161ab27806880ad1503973d0ef7e2c6960ab445c7e8";
};
}
{

View file

@ -33,8 +33,8 @@ schema = 3
version = "v0.0.14"
hash = "sha256-e8zn5eCVh/B1HOP1PGXeXH0bGkIV0vKYP9KLwZni5as="
[mod."github.com/mattn/go-sqlite3"]
version = "v1.14.16"
hash = "sha256-Ky0kas72AY0lpuRiC/fQk9rw9aJ6dvL9y1Ikw5PFzlA="
version = "v1.14.17"
hash = "sha256-ictf2uCW2AnQbykhI0kKPXwzHQlbHHZflZgvpqGFquY="
[mod."github.com/pmezard/go-difflib"]
version = "v1.0.0"
hash = "sha256-/FtmHnaGjdvEIKAJtrUfEhV7EVo5A/eYrtdnUkuxLDA="
@ -45,8 +45,8 @@ schema = 3
version = "v0.0.0-20200617195104-da1b6568686e"
hash = "sha256-ST9t4/b7WFXUb8wra4ZYVDNZJGrEykw8dkWhLrxp8F0="
[mod."github.com/stretchr/testify"]
version = "v1.8.2"
hash = "sha256-n32PGyJL6VLtwOGEbS0lFchxunNU9nlol7OSEZlrKUM="
version = "v1.8.4"
hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo="
[mod."github.com/tidwall/gjson"]
version = "v1.14.4"
hash = "sha256-3DS2YNL95wG0qSajgRtIABD32J+oblaKVk8LIw+KSOc="
@ -66,17 +66,17 @@ schema = 3
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
[mod."golang.org/x/crypto"]
version = "v0.9.0"
hash = "sha256-RpGvWrx96GBXpu1zsWxdv9/+WcRmjBxOC7fvSgOJGL0="
[mod."golang.org/x/exp"]
version = "v0.0.0-20230510235704-dd950f8aeaea"
hash = "sha256-ufjPZXn2/Hn3jUnS4OkE9dpfqq3a+2cO2NU+5t7VnRc="
[mod."golang.org/x/net"]
version = "v0.10.0"
hash = "sha256-HkGiUYBZOBdOtt7mYo3N3swFjjAXzW++pG2JeWGJR9Q="
hash = "sha256-K+hdDHZM4oguyeYQAlp8Pu+BdVmo1pSIQ6jdVHdVPW0="
[mod."golang.org/x/exp"]
version = "v0.0.0-20230522175609-2e198f4a06a1"
hash = "sha256-Jh6UvqP0R9tK/JMPAncV8KWa6aNh9Tnn/vWKcIHaUOs="
[mod."golang.org/x/net"]
version = "v0.11.0"
hash = "sha256-9MWuk+lNmiiwRNLswRuIp/hhFRfYXJMrH2/Bs7iRW4M="
[mod."golang.org/x/sys"]
version = "v0.8.0"
hash = "sha256-wLPPnoFkHM1HPUaFIfRyQZOJjrqXVZimB0nMySly7Xg="
version = "v0.9.0"
hash = "sha256-++MDSczD7y9yLA3isjfNpXGl66snfb45wsNixGjebU4="
[mod."gopkg.in/natefinch/lumberjack.v2"]
version = "v2.2.1"
hash = "sha256-GaXWRDxhGy4Z4mgE+bJ8OE9SVvYUa9TnNiydnp2s1Ms="
@ -90,5 +90,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.15.3-0.20230609132253-737448a3d1b3"
hash = "sha256-sb+3tkon0b0d9emgcGyhOaQ51j7EmvrsLEUG7H2gByM="
version = "v0.15.3"
hash = "sha256-x6FhvYTvczthEeXAw5YIWWaDTdUZTFnizOqWW9bnZrA="

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/discord",
"rev": "67c8d9237e6069fe59ebeb335930b1e3c1414690",
"date": "2023-06-09T17:28:51+03:00",
"path": "/nix/store/wmgqqq3136nmqr8p2bii5drgclz8m8vj-discord",
"sha256": "0zyybbg590kbz8yf6awcl981s72l3qxq6a7xbmq34wxppk9i4paq",
"rev": "248664f8b006d867262151dae999c54fd75d120d",
"date": "2023-06-17T19:37:21+03:00",
"path": "/nix/store/5qjl0pbn4xwd8hsv25qyw97j7y7nxkh3-discord",
"sha256": "1s8jv2dww6xghpyw8g5ansv0f741xvdva08yysdirfppxw8z6qbs",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -44,8 +44,8 @@ schema = 3
version = "v1.0.4"
hash = "sha256-uovu7OycdeZ2oYQ7FhVxLey5ZX3T0FzShaRldndyGvc="
[mod."github.com/prometheus/client_golang"]
version = "v1.15.1"
hash = "sha256-9DCIuhmOYrfp0d2Y8g4m8vLRwAy0+pf0bkpLD/HObJo="
version = "v1.16.0"
hash = "sha256-P/b4/8m1ztF0fCLSJ+eRXN74Bncx2vjOJx7nFl2QEg4="
[mod."github.com/prometheus/client_model"]
version = "v0.3.0"
hash = "sha256-vP+miJfsoK5UG9eug8z/bhAMj3bwg66T2vIh8WHoOKU="
@ -53,8 +53,8 @@ schema = 3
version = "v0.42.0"
hash = "sha256-dJqoPZKtY2umWFWwMeRYY9I2JaFlpcMX4atkEcN5+hs="
[mod."github.com/prometheus/procfs"]
version = "v0.9.0"
hash = "sha256-imZN+1HRpMvgmrot2V+AK5ueYLmsp49vZfHtx2N6Wek="
version = "v0.10.1"
hash = "sha256-EJ8q8wux4964WE4X7UkHb+MXjLhX4TROJaoLIQvD/eQ="
[mod."github.com/rogpeppe/go-internal"]
version = "v1.10.0"
hash = "sha256-vR7+d0aoKTuKeTYSgZxsGhH9e5Zvxix3Zrq9SPm5+NQ="
@ -83,29 +83,29 @@ schema = 3
version = "v0.1.0"
hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0="
[mod."go.mau.fi/whatsmeow"]
version = "v0.0.0-20230608204524-7aedaa1de108"
hash = "sha256-0CviuXvNgxS5PLZl7g6EvilP7TWvGz7OwhO/7nj8BH8="
version = "v0.0.0-20230616194828-be0edabb0bf3"
hash = "sha256-K4w6vllxQJctWJ6TnhVounAyyHUcoz7/Yi1+IAOsq9E="
[mod."go.mau.fi/zeroconfig"]
version = "v0.1.2"
hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w="
[mod."golang.org/x/crypto"]
version = "v0.9.0"
hash = "sha256-RpGvWrx96GBXpu1zsWxdv9/+WcRmjBxOC7fvSgOJGL0="
[mod."golang.org/x/exp"]
version = "v0.0.0-20230510235704-dd950f8aeaea"
hash = "sha256-ufjPZXn2/Hn3jUnS4OkE9dpfqq3a+2cO2NU+5t7VnRc="
[mod."golang.org/x/image"]
version = "v0.7.0"
hash = "sha256-8ymOoG5nFlSCJOgn/apVzP4Zk5jtoYNLwd5TJKlP2X8="
[mod."golang.org/x/net"]
version = "v0.10.0"
hash = "sha256-HkGiUYBZOBdOtt7mYo3N3swFjjAXzW++pG2JeWGJR9Q="
[mod."golang.org/x/sys"]
hash = "sha256-K+hdDHZM4oguyeYQAlp8Pu+BdVmo1pSIQ6jdVHdVPW0="
[mod."golang.org/x/exp"]
version = "v0.0.0-20230522175609-2e198f4a06a1"
hash = "sha256-Jh6UvqP0R9tK/JMPAncV8KWa6aNh9Tnn/vWKcIHaUOs="
[mod."golang.org/x/image"]
version = "v0.8.0"
hash = "sha256-wLPPnoFkHM1HPUaFIfRyQZOJjrqXVZimB0nMySly7Xg="
[mod."golang.org/x/text"]
hash = "sha256-hie7PgC3I4PjIZV4usmKBsn/oxnZpxh560Y7EOC+hqg="
[mod."golang.org/x/net"]
version = "v0.11.0"
hash = "sha256-9MWuk+lNmiiwRNLswRuIp/hhFRfYXJMrH2/Bs7iRW4M="
[mod."golang.org/x/sys"]
version = "v0.9.0"
hash = "sha256-tkhDeMsSQZr3jo7vmKehWs3DvWetwXR0IB+DCLbQ4nk="
hash = "sha256-++MDSczD7y9yLA3isjfNpXGl66snfb45wsNixGjebU4="
[mod."golang.org/x/text"]
version = "v0.10.0"
hash = "sha256-pt4Ce9+Bvf7f0Vo8oUZ71F1aSCcCxsx6Lg0cvanq7x8="
[mod."google.golang.org/protobuf"]
version = "v1.30.0"
hash = "sha256-Y07NKhSuJQ2w7F7MAINQyBf+/hdMHOrxwA3B4ljQQKs="
@ -122,5 +122,5 @@ schema = 3
version = "v2.4.1"
hash = "sha256-OstOCC7Bib6mbcUG2X3YafEBikFhPQ8lN6jPK5c/Ah8="
[mod."maunium.net/go/mautrix"]
version = "v0.15.3-0.20230609124302-54a73ab22ef9"
hash = "sha256-z1Xp3KlDmsq4A/5YDifg9X5p7cDPV6/DutkChkVJmEU="
version = "v0.15.3"
hash = "sha256-x6FhvYTvczthEeXAw5YIWWaDTdUZTFnizOqWW9bnZrA="

View file

@ -1,9 +1,9 @@
{
"url": "https://github.com/mautrix/whatsapp",
"rev": "5c5633548ff8151cd68c9cc44388c119ea16ab23",
"date": "2023-06-10T01:19:00+03:00",
"path": "/nix/store/5zibg18wfj8hh6smfcmrczdqvmfl5bdg-whatsapp",
"sha256": "0yf4xjmp42iiplf1hp2rqclfw9gxzlczfjkvr9d5q2g8wba720na",
"rev": "8ab06edaca57ba0d726fe1013915d1fa3681436b",
"date": "2023-06-16T14:40:03-06:00",
"path": "/nix/store/h749gl1mxk970wp798azpbqh6f2av7pi-whatsapp",
"sha256": "097605j10n4a8k93mn6vd14x18am8dyzdypn8kzzjy44rfg0qdpx",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -15,7 +15,6 @@ system: self: super: let
riscv-overlay = self: super: {
vf2Kernel = self.callPackage ./linux/vf2 {kernelPatches = [];};
vf2KernelPackages = super.linuxPackagesFor self.vf2Kernel;
};
overlays = [

View file

@ -1,7 +1,7 @@
{
"version": "12.1.1",
"version": "12.2.1",
"pname": "jetpack",
"description": "Jetpack – WP Security, Backup, Speed, & Growth",
"url": "https://downloads.wordpress.org/plugin/jetpack.12.1.1.zip",
"sha256": "5eb45f911cf1e184e80dbd617f55071c3fcedb7d913bf3d1298f3d627a65c087"
"url": "https://downloads.wordpress.org/plugin/jetpack.12.2.1.zip",
"sha256": "cb3aa78f7eab79789b9fde5f582224e77b65ba4fbc26c59e08d4cb32677c54ee"
}

View file

@ -1,7 +1,7 @@
{
"version": "3.4.2",
"version": "3.4.3",
"pname": "polylang",
"description": "Polylang",
"url": "https://downloads.wordpress.org/plugin/polylang.3.4.2.zip",
"sha256": "6d372b64b263c926b4c152d39f454e7cb5c59c3beb1a0920c434566bfb086d86"
"url": "https://downloads.wordpress.org/plugin/polylang.3.4.3.zip",
"sha256": "d56263967ac8c727a368a22903b2466dee4f6a3a3d1b18978f0dbd772f2ee8bd"
}

View file

@ -1,7 +1,7 @@
{
"version": "2.0.7",
"version": "3.0.0",
"pname": "the-plus-addons-for-block-editor",
"description": "The Plus Blocks for Block Editor | Gutenberg",
"url": "https://downloads.wordpress.org/plugin/the-plus-addons-for-block-editor.2.0.7.zip",
"sha256": "67e4c4c601712309e2849549401faf6c54cf7ecbc657119df9c053c9869111b8"
"url": "https://downloads.wordpress.org/plugin/the-plus-addons-for-block-editor.3.0.0.zip",
"sha256": "5408e9b655ce8bbdd33206f1c87facec4b2bf3ddce8a193d798615fecc9e79a9"
}

View file

@ -1,7 +1,7 @@
{
"version": "5.0.0",
"version": "5.1.0",
"pname": "webmention",
"description": "Webmention",
"url": "https://downloads.wordpress.org/plugin/webmention.5.0.0.zip",
"sha256": "3530a1b516d76f8108bb3adab9022c4293b354f6b6cf3c62b47bacda933086d9"
"url": "https://downloads.wordpress.org/plugin/webmention.5.1.0.zip",
"sha256": "d0eac5da143a1551f4aa395424866623cf223a2be81865ff9f5356fc1947662e"
}

View file

@ -1,7 +1,7 @@
{
"version": "20.8",
"version": "20.9",
"pname": "wordpress-seo",
"description": "Yoast SEO",
"url": "https://downloads.wordpress.org/plugin/wordpress-seo.20.8.zip",
"sha256": "7a8275d17f598375aca0ff6c86a29fbfdcef074dac803322d674e373b170be33"
"url": "https://downloads.wordpress.org/plugin/wordpress-seo.20.9.zip",
"sha256": "ec7a6d2a7b3b0a5b5a41f076a0ff837f643b9c85823e76d8c48327ef740ad49f"
}