From 571a82849e45e17618e8f08d18d74f6d646ca80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 25 Jun 2023 14:07:35 +0100 Subject: [PATCH 1/3] Revert "Revert "Merge pull request 'Add bcachefs' (#197) from add-bcachefs-kernel into main"" This reverts commit b3227934444c9407e10b511ee91ac620a14661d8. --- default.nix | 7 +++++++ flake.nix | 7 +++++++ linux/bcachefs/default.nix | 33 +++++++++++++++++++++++++++++++++ linux/bcachefs/source.json | 11 +++++++++++ overlay.nix | 1 + 5 files changed, 59 insertions(+) create mode 100644 linux/bcachefs/default.nix create mode 100644 linux/bcachefs/source.json diff --git a/default.nix b/default.nix index 642b075..c599e21 100644 --- a/default.nix +++ b/default.nix @@ -81,3 +81,10 @@ in } else {} ) + // ( + if pkgs.system == "x86_64-linux" + then { + inherit (pkgsWithOverlay) linux-bcachefs; + } + else {} + ) diff --git a/flake.nix b/flake.nix index 7379e97..da1303d 100644 --- a/flake.nix +++ b/flake.nix @@ -124,6 +124,13 @@ inherit (pkgs) vf2Kernel; } else {} + ) + // ( + if system == "x86_64-linux" + then { + inherit (pkgs) linux-bcachefs; + } + else {} ); modules = import ./modules; diff --git a/linux/bcachefs/default.nix b/linux/bcachefs/default.nix new file mode 100644 index 0000000..f868953 --- /dev/null +++ b/linux/bcachefs/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildLinux, + ... +} @ args: let + modDirVersion = "6.3.0"; + source = builtins.fromJSON (builtins.readFile ./source.json); +in + buildLinux (args + // { + inherit modDirVersion; + version = "6.3.0+${source.rev}"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs"; + inherit (source) rev sha256; + }; + structuredExtraConfig = with lib.kernel; { + BCACHEFS_FS = module; + BCACHEFS_DEBUG = yes; + KALLSYMS = yes; + KALLSYMS_ALL = yes; + DEBUG_FS = yes; + DYNAMIC_FTRACE = yes; + FTRACE = yes; + }; + passthru.updateScript = [ + ../../scripts/update-git.sh + "github.com/koverstreet/bcachefs" + "linux/bcachefs/source.json" + ]; + }) diff --git a/linux/bcachefs/source.json b/linux/bcachefs/source.json new file mode 100644 index 0000000..4a79569 --- /dev/null +++ b/linux/bcachefs/source.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/koverstreet/bcachefs", + "rev": "799716df00709f7480f575e8fd626915bafba006", + "date": "2023-05-14T23:01:14-04:00", + "path": "/nix/store/mx6zdja6ii9g3pd7vzv9k4rnm4p4spqm-bcachefs", + "sha256": "0zid3g15034nd5cwmn233kn6fjyphkax2nklzhb46sz2283gzkiv", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/overlay.nix b/overlay.nix index ca1e3f6..9acee66 100644 --- a/overlay.nix +++ b/overlay.nix @@ -87,6 +87,7 @@ system: self: super: let fcitx5 = super.fcitx5.overrideAttrs (_: { src = self.callPackage ./i18n/fcitx5/patched-source.nix {inherit (super) fcitx5;}; }); + linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];}; }) riscv-overlay ]; -- 2.47.0 From 23db32b50bd04d1fd3c43f32797c6b0fe1849914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 25 Jun 2023 14:24:37 +0100 Subject: [PATCH 2/3] add bcachefs-tools and autoupdate for linux kernels --- default.nix | 2 +- flake.nix | 2 +- linux/bcachefs-tools/Cargo.lock | 998 +++++++++++++++++++++++++++++++ linux/bcachefs-tools/default.nix | 108 ++++ linux/bcachefs-tools/source.json | 11 + linux/bcachefs/default.nix | 16 +- linux/bcachefs/source.json | 8 +- linux/vf2/default.nix | 154 ++--- overlay.nix | 1 + 9 files changed, 1215 insertions(+), 85 deletions(-) create mode 100644 linux/bcachefs-tools/Cargo.lock create mode 100644 linux/bcachefs-tools/default.nix create mode 100644 linux/bcachefs-tools/source.json diff --git a/default.nix b/default.nix index c599e21..079f7db 100644 --- a/default.nix +++ b/default.nix @@ -84,7 +84,7 @@ in // ( if pkgs.system == "x86_64-linux" then { - inherit (pkgsWithOverlay) linux-bcachefs; + inherit (pkgsWithOverlay) linux-bcachefs bcachefs-tools; } else {} ) diff --git a/flake.nix b/flake.nix index da1303d..da49f2c 100644 --- a/flake.nix +++ b/flake.nix @@ -128,7 +128,7 @@ // ( if system == "x86_64-linux" then { - inherit (pkgs) linux-bcachefs; + inherit (pkgs) linux-bcachefs bcachefs-tools; } else {} ); diff --git a/linux/bcachefs-tools/Cargo.lock b/linux/bcachefs-tools/Cargo.lock new file mode 100644 index 0000000..c4dd7f5 --- /dev/null +++ b/linux/bcachefs-tools/Cargo.lock @@ -0,0 +1,998 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bcachefs-rust" +version = "0.3.1" +dependencies = [ + "anyhow", + "atty", + "bch_bindgen", + "byteorder", + "chrono", + "clap", + "colored", + "either", + "errno", + "gag", + "getset", + "itertools", + "libc", + "log", + "parse-display", + "rpassword", + "udev", + "uuid", +] + +[[package]] +name = "bch_bindgen" +version = "0.1.0" +dependencies = [ + "anyhow", + "bindgen", + "bitfield", + "bitflags", + "byteorder", + "chrono", + "colored", + "gag", + "libc", + "memoffset", + "paste", + "pkg-config", + "udev", + "uuid", +] + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitfield" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clang-sys" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +dependencies = [ + "glob", + "libc", +] + +[[package]] +name = "clap" +version = "4.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cxx" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "gag" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" +dependencies = [ + "filedescriptor", + "tempfile", +] + +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parse-display" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd87725635cbae7fe960f91f55a114ed104e637790317cc8d9197ea16b058010" +dependencies = [ + "lazy_static", + "parse-display-derive", + "regex", +] + +[[package]] +name = "parse-display-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc52b391380aa8550348736a356bf028f5469391d580533a566e97543f55e813" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "regex", + "regex-syntax", + "syn", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rpassword" +version = "4.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +dependencies = [ + "rustix", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "uuid" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/linux/bcachefs-tools/default.nix b/linux/bcachefs-tools/default.nix new file mode 100644 index 0000000..61a940d --- /dev/null +++ b/linux/bcachefs-tools/default.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libuuid, + libsodium, + keyutils, + liburcu, + zlib, + libaio, + zstd, + lz4, + attr, + udev, + valgrind, + nixosTests, + fuse3, + cargo, + rustc, + coreutils, + rustPlatform, + makeWrapper, + fuseSupport ? false, + writeScript, +}: let + source = builtins.fromJSON (builtins.readFile ./source.json); +in + stdenv.mkDerivation { + pname = "bcachefs-tools"; + version = source.date; + + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + inherit (source) rev sha256; + }; + + nativeBuildInputs = [ + pkg-config + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + makeWrapper + ]; + + cargoRoot = "rust-src"; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "bindgen-0.64.0" = "sha256-GNG8as33HLRYJGYe0nw6qBzq86aHiGonyynEM7gaEE4="; + }; + }; + + buildInputs = + [ + libaio + keyutils + lz4 + + libsodium + liburcu + libuuid + zstd + zlib + attr + udev + ] + ++ lib.optional fuseSupport fuse3; + + doCheck = false; # needs bcachefs module loaded on builder + checkFlags = ["BCACHEFS_TEST_USE_VALGRIND=no"]; + nativeCheckInputs = [valgrind]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${lib.strings.substring 0 7 source.rev}" + "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + ]; + + preCheck = lib.optionalString fuseSupport '' + rm tests/test_fuse.py + ''; + + passthru.updateScript = writeScript "update-bcachefs" '' + ${../../scripts/update-git.sh} https://github.com/koverstreet/bcachefs-tools linux/bcachefs-tools/source.json + if [ "$(git diff -- linux/bcachefs-tools/source.json)" ]; then + SRC_PATH=$(nix-build -E '(import ./. {}).bcachefs-tools.src') + cp $SRC_PATH/rust-src/Cargo.toml linux/bcachefs-tools + fi + ''; + + postFixup = '' + wrapProgram $out/bin/mount.bcachefs \ + --prefix PATH : ${lib.makeBinPath [coreutils]} + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Tool for managing bcachefs filesystems"; + homepage = "https://bcachefs.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [davidak Madouura]; + platforms = platforms.linux; + }; + } diff --git a/linux/bcachefs-tools/source.json b/linux/bcachefs-tools/source.json new file mode 100644 index 0000000..f6a4fe7 --- /dev/null +++ b/linux/bcachefs-tools/source.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/koverstreet/bcachefs-tools", + "rev": "84cb7bffe5e80ef9036213bbfbaf358d478536be", + "date": "2023-06-18T16:20:01-04:00", + "path": "/nix/store/2q344qykij6xca6zqfz3rrnnj63lmdqd-bcachefs-tools", + "sha256": "19k6wzjw3yfcrrni5m38r17vl1sb5jr3fwn9dwdkrqmxp2kl3rdx", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/linux/bcachefs/default.nix b/linux/bcachefs/default.nix index f868953..40828ea 100644 --- a/linux/bcachefs/default.nix +++ b/linux/bcachefs/default.nix @@ -7,7 +7,7 @@ modDirVersion = "6.3.0"; source = builtins.fromJSON (builtins.readFile ./source.json); in - buildLinux (args + (buildLinux (args // { inherit modDirVersion; version = "6.3.0+${source.rev}"; @@ -25,9 +25,11 @@ in DYNAMIC_FTRACE = yes; FTRACE = yes; }; - passthru.updateScript = [ - ../../scripts/update-git.sh - "github.com/koverstreet/bcachefs" - "linux/bcachefs/source.json" - ]; - }) + })) + .overrideAttrs (_: { + passthru.updateScript = [ + ../../scripts/update-git.sh + "https://github.com/koverstreet/bcachefs" + "linux/bcachefs/source.json" + ]; + }) diff --git a/linux/bcachefs/source.json b/linux/bcachefs/source.json index 4a79569..60e6d0f 100644 --- a/linux/bcachefs/source.json +++ b/linux/bcachefs/source.json @@ -1,9 +1,9 @@ { "url": "https://github.com/koverstreet/bcachefs", - "rev": "799716df00709f7480f575e8fd626915bafba006", - "date": "2023-05-14T23:01:14-04:00", - "path": "/nix/store/mx6zdja6ii9g3pd7vzv9k4rnm4p4spqm-bcachefs", - "sha256": "0zid3g15034nd5cwmn233kn6fjyphkax2nklzhb46sz2283gzkiv", + "rev": "be1251eac68916279a396baff00e93607463e7bb", + "date": "2023-06-25T01:58:37-04:00", + "path": "/nix/store/awg9lywg7sjgmfylps903hm0ckl055ap-bcachefs", + "sha256": "1mpnqi2i9swy6vrcpvgj0rzcvv7idypwbkyyh54qbax0cy6987xr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/linux/vf2/default.nix b/linux/vf2/default.nix index 047911c..684d3fa 100644 --- a/linux/vf2/default.nix +++ b/linux/vf2/default.nix @@ -9,84 +9,94 @@ modDirVersion = "6.4.0-rc6"; source = builtins.fromJSON (builtins.readFile ./source.json); in - buildLinux (args - // { - inherit modDirVersion; - version = "${modDirVersion}-vf2"; + ( + buildLinux (args + // { + inherit modDirVersion; + version = "${modDirVersion}-vf2"; - src = fetchFromGitHub { - owner = "starfive-tech"; - repo = "linux"; - inherit (source) rev sha256; - }; + 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; - 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="; - }; - } - ]; + 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; { - 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; + 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; + RTC_DRV_STARFIVE = yes; + SPI_PL022 = yes; + SPI_PL022_STARFIVE = yes; - I2C = yes; - MFD_AXP20X = yes; - MFD_AXP20X_I2C = yes; - REGULATOR_AXP20X = 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; + # 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; - }; + PL330_DMA = no; + }; - preferBuiltin = true; + preferBuiltin = true; - extraMeta = { - branch = "JH7110_VisionFive2_upstream"; - description = "Linux kernel for StarFive's VisionFive2"; - platforms = ["riscv64-linux"]; - }; - } - // (args.argsOverride or {})) + extraMeta = { + branch = "JH7110_VisionFive2_upstream"; + description = "Linux kernel for StarFive's VisionFive2"; + platforms = ["riscv64-linux"]; + }; + } + // (args.argsOverride or {})) + ) + .overrideAttrs (_: { + passthru.updateScript = [ + ../../scripts/update-git.sh + "https://github.com/starfive-tech/linux" + "linux/bcachefs/source.json" + "--rev refs/heads/JH7110_VisionFive2_upstream" + ]; + }) diff --git a/overlay.nix b/overlay.nix index 9acee66..3258909 100644 --- a/overlay.nix +++ b/overlay.nix @@ -88,6 +88,7 @@ system: self: super: let src = self.callPackage ./i18n/fcitx5/patched-source.nix {inherit (super) fcitx5;}; }); linux-bcachefs = self.callPackage ./linux/bcachefs {kernelPatches = [];}; + bcachefs-tools = self.callPackage ./linux/bcachefs-tools {}; }) riscv-overlay ]; -- 2.47.0 From be57fe61bd13115aa0a26ff063b93e76ba8e2548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 25 Jun 2023 14:25:50 +0100 Subject: [PATCH 3/3] move update script for wp plugins --- web/wordpress-plugins/default.nix | 7 +++---- web/wordpress-themes/default.nix | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/web/wordpress-plugins/default.nix b/web/wordpress-plugins/default.nix index d180a2f..80ec82a 100644 --- a/web/wordpress-plugins/default.nix +++ b/web/wordpress-plugins/default.nix @@ -24,10 +24,9 @@ in ''; installPhase = "mkdir -p $out; cp -R $pname/* $out/"; meta = {inherit (source) description;}; - passthru.updateScript = - if name == "activitypub" - then ./update.sh - else []; }; }) plugins) + // { + passthru.updateScript = ./update.sh; + } diff --git a/web/wordpress-themes/default.nix b/web/wordpress-themes/default.nix index 615cd52..c277369 100644 --- a/web/wordpress-themes/default.nix +++ b/web/wordpress-themes/default.nix @@ -24,10 +24,9 @@ in ''; installPhase = "mkdir -p $out; cp -R $pname/* $out/"; meta = {inherit (source) description;}; - passthru.updateScript = - if name == "activitypub" - then ./update.sh - else []; }; }) themes) + // { + passthru.updateScript = ./update.sh; + } -- 2.47.0