don't overlay pixelflasher and don't patch attic num_prefetch
This commit is contained in:
parent
b5d3358f52
commit
57aa110347
4 changed files with 0 additions and 28 deletions
17
flake.lock
generated
17
flake.lock
generated
|
@ -945,22 +945,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pixelflasher": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1741302870,
|
|
||||||
"narHash": "sha256-7AywZ1b3PaqolAZ0vQmddD6Br4o0a7ucdtE0/W3rnaM=",
|
|
||||||
"owner": "cything",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "5ef8b274bb7f939104295a22cec3382268ed73cc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cything",
|
|
||||||
"ref": "pixelflasher",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pre-commit-hooks-nix": {
|
"pre-commit-hooks-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": [
|
||||||
|
@ -1024,7 +1008,6 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
"nvim-github-theme": "nvim-github-theme",
|
"nvim-github-theme": "nvim-github-theme",
|
||||||
"pixelflasher": "pixelflasher",
|
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"treefmt": "treefmt",
|
"treefmt": "treefmt",
|
||||||
|
|
|
@ -71,7 +71,6 @@
|
||||||
url = "github:nix-community/nix-index-database";
|
url = "github:nix-community/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
pixelflasher.url = "github:cything/nixpkgs/pixelflasher";
|
|
||||||
attic = {
|
attic = {
|
||||||
url = "github:zhaofengli/attic";
|
url = "github:zhaofengli/attic";
|
||||||
inputs = {
|
inputs = {
|
||||||
|
|
|
@ -11,13 +11,4 @@ index 02e4857..b522154 100644
|
||||||
Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
|
Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
|
||||||
Download::AsyncRead(stream) => {
|
Download::AsyncRead(stream) => {
|
||||||
let stream = ReaderStream::new(stream).map_err(|e| {
|
let stream = ReaderStream::new(stream).map_err(|e| {
|
||||||
@@ -262,7 +262,7 @@ async fn get_nar(
|
|
||||||
|
|
||||||
// TODO: Make num_prefetch configurable
|
|
||||||
// The ideal size depends on the average chunk size
|
|
||||||
- let merged = merge_chunks(chunks, streamer, storage, 2).map_err(|e| {
|
|
||||||
+ let merged = merge_chunks(chunks, streamer, storage, 8).map_err(|e| {
|
|
||||||
tracing::error!(%e, "Stream error");
|
|
||||||
e
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ in
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
conduwuit = pkgFrom inputs.conduwuit "default";
|
conduwuit = pkgFrom inputs.conduwuit "default";
|
||||||
pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher";
|
|
||||||
attic-server = pkgFrom inputs.attic "attic-server";
|
attic-server = pkgFrom inputs.attic "attic-server";
|
||||||
attic = pkgFrom inputs.attic "attic";
|
attic = pkgFrom inputs.attic "attic";
|
||||||
garage = (
|
garage = (
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue