Update to latest attic

This commit is contained in:
Eelco Dolstra 2024-02-29 16:26:10 +01:00
parent 14b3ed8242
commit e5513406df
5 changed files with 2815 additions and 127 deletions

2895
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -12,3 +12,7 @@ lto = true
panic = "abort" panic = "abort"
incremental = false incremental = false
codegen-units = 1 codegen-units = 1
[patch.crates-io]
# See attic's Cargo.toml for why we need a clickhouse fork.
clickhouse = { git = "https://github.com/cole-h/clickhouse.rs", branch = "rustls" }

View file

@ -90,54 +90,54 @@
"type": "github" "type": "github"
} }
}, },
"lowdown-src": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1633514407, "lastModified": 1709118350,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", "narHash": "sha256-JptPxlhXS3VHDYNKWTud7ubs1qweF6g0Vo6Epojporc=",
"owner": "kristapsdz", "owner": "libgit2",
"repo": "lowdown", "repo": "libgit2",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", "rev": "4ab9c401ab36080707ab27aafd0c247af4399ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "kristapsdz", "owner": "libgit2",
"repo": "lowdown", "repo": "libgit2",
"type": "github" "type": "github"
} }
}, },
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"lowdown-src": "lowdown-src", "libgit2": "libgit2",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1701122567, "lastModified": 1708517151,
"narHash": "sha256-iA8DqS+W2fWTfR+nNJSvMHqQ+4NpYMRT3b+2zS6JTvE=", "narHash": "sha256-s7QTMxLzVA5UF80sFCv8jwaTMBLA8/110YFkZNkNsCk=",
"rev": "50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d", "rev": "8a8172cd2b5ef2f6dd2d9673a6379447d780ff17",
"revCount": 15434, "revCount": 16129,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.19.2/018c1be0-1b88-7682-b3bf-948ec82d0a0b/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.20.3/018dcc43-c784-772a-8da1-64165044e9cd/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/NixOS/nix/2.19.tar.gz" "url": "https://flakehub.com/f/NixOS/nix/2.20.tar.gz"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1698876495, "lastModified": 1705033721,
"narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9eb24edd6a0027fed010ccfe300a9734d029983c", "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-23.05", "ref": "nixos-23.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -17,7 +17,7 @@
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz"; flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.0.1.tar.gz";
nix.url = "https://flakehub.com/f/NixOS/nix/2.19.tar.gz"; nix.url = "https://flakehub.com/f/NixOS/nix/2.20.tar.gz";
}; };
outputs = { self, nixpkgs, nix, ... }@inputs: outputs = { self, nixpkgs, nix, ... }@inputs:

View file

@ -27,10 +27,13 @@ attic = { git = "ssh://git@github.com/DeterminateSystems/attic-priv", branch = "
#attic = { path = "../../attic-priv/attic" } #attic = { path = "../../attic-priv/attic" }
attic-client = { git = "ssh://git@github.com/DeterminateSystems/attic-priv", branch = "main" } attic-client = { git = "ssh://git@github.com/DeterminateSystems/attic-priv", branch = "main" }
#attic-client = { path = "../../attic-priv/client" } #attic-client = { path = "../../attic-priv/client" }
attic-server = { git = "ssh://git@github.com/DeterminateSystems/attic-priv", branch = "main" }
#attic-server = { path = "../../attic-priv/server" }
indicatif = "0.17" indicatif = "0.17"
anyhow = "1.0.71" anyhow = "1.0.71"
tempfile = "3.9" tempfile = "3.9"
uuid = { version = "1.4.0", features = ["serde", "v7", "rand", "std"] } uuid = { version = "1.4.0", features = ["serde", "v7", "rand", "std"] }
futures = "0.3"
[dependencies.tokio] [dependencies.tokio]
version = "1.28.0" version = "1.28.0"