chore(3p/sources): Bump channels & overlays

- //tvix: address new clippy lints

- //users/tazjin: Satisfy gonic module's new need for a playlist folder.

- //users/aspen/games: adjust for changed location of df's default
  init.txt and d_init.txt.

Change-Id: I00a2adb506ae866206fb6f88c39c9a6af320380f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11509
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: aspen <root@gws.fyi>
This commit is contained in:
sterni 2024-04-24 16:05:45 +02:00 committed by clbot
parent eace431e53
commit 69e4a78818
6 changed files with 27 additions and 24 deletions

View file

@ -17,10 +17,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b787726a8413e11b074cde42704b4af32d95545c", "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
"sha256": "0amclig8lqn7ylb1r38yni4v4r1mf5m0qih7n2lvm8azjrybxfkr", "sha256": "112r86p3iah1xahwlp82yd3gvh10wkf271za5h7v3jsqv08c6gkr",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/b787726a8413e11b074cde42704b4af32d95545c.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/c1609d584a6b5e9e6a02010f51bd368cb4782f8e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -41,10 +41,10 @@
"homepage": "", "homepage": "",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9", "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49",
"sha256": "185wg4p67krrjd8dx5h9pc381z7677nfzsdyp54kg3niqcf5wdzx", "sha256": "1ql5ziwfrpmc8cxhgflmdy2z06z4dsdfzjwb2vv9bag6a2chrvq8",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nmattia/naersk/archive/aeb58d5e8faead8980a807c840232697982d47b9.tar.gz", "url": "https://github.com/nmattia/naersk/archive/c5037590290c6c7dae2e42e7da1e247e54ed2d49.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"napalm": { "napalm": {
@ -65,10 +65,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"sha256": "1hy81yj2dcg6kfsm63xcqf8kvigxglim1rcg1xpmy2rb6a8vqvsj", "sha256": "0ijqx995jw9i16f28whyjdll9b0nydmyl4n91bci2cgryxms7f8f",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fd281bd6b7d3e32ddfa399853946f782553163b5.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -77,10 +77,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72da83d9515b43550436891f538ff41d68eecc7f", "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
"sha256": "177sws22nqkvv8am76qmy9knham2adfh3gv7hrjf6492z1mvy02y", "sha256": "1nxd4dqci8rs94a7cypx30axgj778p2wydkx16q298n29crkflbw",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/72da83d9515b43550436891f538ff41d68eecc7f.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/dd37924974b9202f8226ed5d74a252a9785aedf8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rust-overlay": { "rust-overlay": {
@ -89,10 +89,10 @@
"homepage": "", "homepage": "",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779", "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd",
"sha256": "13xp3bsgwpld8bkh5sjkigxcy5nz336hyc9xssk58glpgf1sxddm", "sha256": "1wpkca75ysb2ssycc0dshd1m76q8iqhzrrbr6xmfmkkcj1p333nk",
"type": "tarball", "type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/41b3b080cc3e4b3a48e933b87fc15a05f1870779.tar.gz", "url": "https://github.com/oxalica/rust-overlay/archive/2a42c742ab04b61d9b2f1edf392842cf9f27ebfd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rustsec-advisory-db": { "rustsec-advisory-db": {
@ -101,10 +101,10 @@
"homepage": "https://rustsec.org", "homepage": "https://rustsec.org",
"owner": "RustSec", "owner": "RustSec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "0bc9a77248be5cb5f2b51fe6aba8ba451d74c6bb", "rev": "35e7459a331d3e0c585e56dabd03006b9b354088",
"sha256": "1fmgz6a2b63yy5cn2ghbqj8l0pdb2rwr5agr1m4mzaydlyypx26m", "sha256": "1j8c0vzwg6b9lxmdy2a40pvwsy2kncv455spbjbxsj10p2vmy5fl",
"type": "tarball", "type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/0bc9a77248be5cb5f2b51fe6aba8ba451d74c6bb.tar.gz", "url": "https://github.com/RustSec/advisory-db/archive/35e7459a331d3e0c585e56dabd03006b9b354088.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

View file

@ -34,6 +34,7 @@ enum Error {
/// Invalid descriptor chain. /// Invalid descriptor chain.
InvalidDescriptorChain, InvalidDescriptorChain,
/// Failed to handle filesystem requests. /// Failed to handle filesystem requests.
#[allow(dead_code)]
HandleRequests(fuse_backend_rs::Error), HandleRequests(fuse_backend_rs::Error),
/// Failed to construct new vhost user daemon. /// Failed to construct new vhost user daemon.
NewDaemon, NewDaemon,

View file

@ -37,7 +37,7 @@ mod impure_builtins {
Ok(p) => p, Ok(p) => p,
}; };
let r = generators::request_open_file(&co, path).await; let r = generators::request_open_file(&co, path).await;
Ok(hash_nix_string(algo.to_str()?, r).map(Value::from)?) hash_nix_string(algo.to_str()?, r).map(Value::from)
} }
#[builtin("pathExists")] #[builtin("pathExists")]

View file

@ -1148,7 +1148,7 @@ where
let mut captured_with_stack = frame let mut captured_with_stack = frame
.upvalues .upvalues
.with_stack() .with_stack()
.map(Clone::clone) .cloned()
// ... or make an empty one if there isn't one already. // ... or make an empty one if there isn't one already.
.unwrap_or_else(|| Vec::with_capacity(self.with_stack.len())); .unwrap_or_else(|| Vec::with_capacity(self.with_stack.len()));

View file

@ -15,14 +15,14 @@ let
}); });
init = runCommand "init.txt" { } '' init = runCommand "init.txt" { } ''
substitute "${df-orig}/data/init/init.txt" $out \ substitute "${df-orig}/data/init/init_default.txt" $out \
--replace "[INTRO:YES]" "[INTRO:NO]" \ --replace "[INTRO:YES]" "[INTRO:NO]" \
--replace "[VOLUME:255]" "[VOLUME:0]" \ --replace "[VOLUME:255]" "[VOLUME:0]" \
--replace "[FPS:NO]" "[FPS:YES]" --replace "[FPS:NO]" "[FPS:YES]"
''; '';
d_init = runCommand "d_init.txt" { } '' d_init = runCommand "d_init.txt" { } ''
substitute "${df-orig}/data/init/d_init.txt" $out \ substitute "${df-orig}/data/init/d_init_default.txt" $out \
--replace "[AUTOSAVE:NONE]" "[AUTOSAVE:SEASONAL]" \ --replace "[AUTOSAVE:NONE]" "[AUTOSAVE:SEASONAL]" \
--replace "[AUTOSAVE_PAUSE:NO]" "[AUTOSAVE_PAUSE:YES]" \ --replace "[AUTOSAVE_PAUSE:NO]" "[AUTOSAVE_PAUSE:YES]" \
--replace "[INITIAL_SAVE:NO]" "[INITIAL_SAVE:YES]" \ --replace "[INITIAL_SAVE:NO]" "[INITIAL_SAVE:YES]" \

View file

@ -129,10 +129,11 @@ in
''; '';
}; };
# I don't use the podcast feature, but I *have to* supply podcasts # I don't use the podcast nor playlist feature,
# to gonic ... # but I *have to* supply podcasts to gonic ...
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /tmp/fake-podcasts 0555 nobody nobody -" "d /tmp/fake-podcasts 0555 nobody nobody -"
"d /tmp/fake-playlists 0555 nobody nobody -"
]; ];
services.gonic = { services.gonic = {
@ -142,6 +143,7 @@ in
scan-interval = 5; scan-interval = 5;
scan-at-start-enabled = true; scan-at-start-enabled = true;
podcast-path = [ "/tmp/fake-podcasts" ]; podcast-path = [ "/tmp/fake-podcasts" ];
playlists-path = [ "/tmp/fake-playlists" ];
music-path = [ "/var/lib/geesefs/tazjins-files/music" ]; music-path = [ "/var/lib/geesefs/tazjins-files/music" ];
}; };
}; };