rm overlays fot stuff we dont use anymore
This commit is contained in:
parent
97da2848c6
commit
6a3a5d0cfd
8 changed files with 0 additions and 139 deletions
|
@ -1,7 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
attic-server = prev.attic-server.overrideAttrs {
|
|
||||||
patches = [
|
|
||||||
./prefetch-8-chunks.patch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/server/src/api/binary_cache.rs b/server/src/api/binary_cache.rs
|
|
||||||
index 02e4857..b522154 100644
|
|
||||||
--- a/server/src/api/binary_cache.rs
|
|
||||||
+++ b/server/src/api/binary_cache.rs
|
|
||||||
@@ -215,7 +215,7 @@ async fn get_nar(
|
|
||||||
let chunk = chunks[0].as_ref().unwrap();
|
|
||||||
let remote_file = &chunk.remote_file.0;
|
|
||||||
let storage = state.storage().await?;
|
|
||||||
- match storage.download_file_db(remote_file, false).await? {
|
|
||||||
+ match storage.download_file_db(remote_file, true).await? {
|
|
||||||
Download::Url(url) => Ok(Redirect::temporary(&url).into_response()),
|
|
||||||
Download::AsyncRead(stream) => {
|
|
||||||
let stream = ReaderStream::new(stream).map_err(|e| {
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
bitwarden-desktop = prev.bitwarden-desktop.overrideAttrs (
|
|
||||||
finalAttrs: prevAttrs: {
|
|
||||||
patches = prevAttrs.patches ++ [
|
|
||||||
./ssh-agent-no-confirm.patch
|
|
||||||
];
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -1,34 +0,0 @@
|
||||||
diff --git a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs b/core/src/ssh_agent/mod.rs
|
|
||||||
index 4e304cc..8203dca 100644
|
|
||||||
--- a/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
|
|
||||||
+++ b/apps/desktop/desktop_native/core/src/ssh_agent/mod.rs
|
|
||||||
@@ -44,28 +44,7 @@ impl ssh_agent::Agent<peerinfo::models::PeerInfo> for BitwardenDesktopAgent {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
- let request_id = self.get_request_id().await;
|
|
||||||
- println!(
|
|
||||||
- "[SSH Agent] Confirming request from application: {}",
|
|
||||||
- info.process_name()
|
|
||||||
- );
|
|
||||||
-
|
|
||||||
- let mut rx_channel = self.get_ui_response_rx.lock().await.resubscribe();
|
|
||||||
- self.show_ui_request_tx
|
|
||||||
- .send(SshAgentUIRequest {
|
|
||||||
- request_id,
|
|
||||||
- cipher_id: Some(ssh_key.cipher_uuid.clone()),
|
|
||||||
- process_name: info.process_name().to_string(),
|
|
||||||
- is_list: false,
|
|
||||||
- })
|
|
||||||
- .await
|
|
||||||
- .expect("Should send request to ui");
|
|
||||||
- while let Ok((id, response)) = rx_channel.recv().await {
|
|
||||||
- if id == request_id {
|
|
||||||
- return response;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- false
|
|
||||||
+ true
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn can_list(&self, info: &peerinfo::models::PeerInfo) -> bool {
|
|
|
@ -1,12 +1,4 @@
|
||||||
{ inputs }:
|
{ inputs }:
|
||||||
let
|
|
||||||
overlays = [
|
|
||||||
./zipline
|
|
||||||
./bitwarden
|
|
||||||
./attic
|
|
||||||
];
|
|
||||||
importedOverlays = map (m: import m) overlays;
|
|
||||||
in
|
|
||||||
[
|
[
|
||||||
(
|
(
|
||||||
final: prev:
|
final: prev:
|
||||||
|
@ -26,4 +18,3 @@ in
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
++ importedOverlays
|
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
vscode-extensions = prev.vscode-extensions // {
|
|
||||||
github = prev.vscode-extensions.github // {
|
|
||||||
codespaces = prev.vscode-utils.buildVscodeMarketplaceExtension {
|
|
||||||
mktplcRef = {
|
|
||||||
publisher = "github";
|
|
||||||
name = "codespaces";
|
|
||||||
version = "1.17.3";
|
|
||||||
hash = "sha256-idJFYHJ4yeqpFZBX55Y0v1yfzgqyhS0MrC4yIto7i7w=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,7 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
zipline = prev.zipline.overrideAttrs {
|
|
||||||
patches = [
|
|
||||||
./no-check-bucket.patch
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,45 +0,0 @@
|
||||||
diff --git a/src/lib/datasource/S3.ts b/src/lib/datasource/S3.ts
|
|
||||||
index 089dd64..39dd8f4 100644
|
|
||||||
--- a/src/lib/datasource/S3.ts
|
|
||||||
+++ b/src/lib/datasource/S3.ts
|
|
||||||
@@ -4,7 +4,6 @@ import {
|
|
||||||
DeleteObjectCommand,
|
|
||||||
DeleteObjectsCommand,
|
|
||||||
GetObjectCommand,
|
|
||||||
- ListBucketsCommand,
|
|
||||||
ListObjectsCommand,
|
|
||||||
PutObjectCommand,
|
|
||||||
S3Client,
|
|
||||||
@@ -38,32 +37,6 @@ export class S3Datasource extends Datasource {
|
|
||||||
endpoint: this.options.endpoint ?? undefined,
|
|
||||||
forcePathStyle: this.options.forcePathStyle ?? false,
|
|
||||||
});
|
|
||||||
-
|
|
||||||
- this.ensureBucketExists();
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- private async ensureBucketExists() {
|
|
||||||
- try {
|
|
||||||
- const res = await this.client.send(new ListBucketsCommand());
|
|
||||||
- if (res.$metadata.httpStatusCode !== 200) {
|
|
||||||
- this.logger
|
|
||||||
- .error('there was an error while listing buckets', res.$metadata as Record<string, unknown>)
|
|
||||||
- .error('zipline will now exit');
|
|
||||||
- process.exit(1);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (!res.Buckets?.find((bucket) => bucket.Name === this.options.bucket)) {
|
|
||||||
- this.logger.error(`bucket ${this.options.bucket} does not exist`).error('zipline will now exit');
|
|
||||||
- process.exit(1);
|
|
||||||
- }
|
|
||||||
- } catch (e) {
|
|
||||||
- this.logger
|
|
||||||
- .error('there was an error while listing buckets', e as Record<string, unknown>)
|
|
||||||
- .error('zipline will now exit');
|
|
||||||
- process.exit(1);
|
|
||||||
- } finally {
|
|
||||||
- this.logger.debug(`bucket ${this.options.bucket} exists`);
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
|
|
||||||
public async get(file: string): Promise<Readable | null> {
|
|
Loading…
Add table
Add a link
Reference in a new issue