Compare commits

...

11 commits

Author SHA1 Message Date
Luc Perkins d35e6e72df
Merge pull request #137 from DeterminateSystems/dependabot/cargo/crossbeam-channel-0.5.15
build(deps): bump crossbeam-channel from 0.5.14 to 0.5.15
2025-04-10 12:13:17 -03:00
dependabot[bot] 6fc832cb76
build(deps): bump crossbeam-channel from 0.5.14 to 0.5.15
Bumps [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) from 0.5.14 to 0.5.15.
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases)
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.5.14...crossbeam-channel-0.5.15)

---
updated-dependencies:
- dependency-name: crossbeam-channel
  dependency-version: 0.5.15
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-10 14:45:15 +00:00
Luc Perkins 78a56de86a
Merge pull request #136 from DeterminateSystems/dependabot/cargo/tokio-1.44.2
build(deps): bump tokio from 1.44.1 to 1.44.2
2025-04-08 16:20:27 -03:00
dependabot[bot] 9fdc760dcb
build(deps): bump tokio from 1.44.1 to 1.44.2
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.44.1 to 1.44.2.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.44.1...tokio-1.44.2)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.44.2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-08 02:10:21 +00:00
Graham Christensen 90e95ab197
Merge pull request #134 from DeterminateSystems/update-deps
Update dependencies
2025-04-02 11:55:00 -04:00
Graham Christensen 9f88cc4842 Update dependencies 2025-04-02 11:26:06 -04:00
Luc Perkins 942b6b0ffe
Merge pull request #129 from DeterminateSystems/update-flake-lock
Update flake.lock and add update-flake-lock support
2025-03-26 16:37:30 -03:00
Luc Perkins 80600ec316
Merge remote-tracking branch 'origin/main' into update-flake-lock 2025-03-26 10:48:45 -03:00
Luc Perkins 5a689bfeb3
Fix merge conflicts with main 2025-03-25 11:45:05 -03:00
Luc Perkins a774f04dfb
Switch crane input to FlakeHub 2025-03-24 20:25:46 -03:00
Luc Perkins 7ed9fc9cbb
Update flake.lock and add update-flake-lock support 2025-03-24 20:21:34 -03:00
6 changed files with 813 additions and 444 deletions

View file

@ -0,0 +1,20 @@
name: update-flake-lock
on:
workflow_dispatch: # enable manual triggering
schedule:
- cron: "0 0 * * 0" # every Sunday at midnight
jobs:
lockfile:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/flakehub-cache-action@main
- uses: DeterminateSystems/update-flake-lock@main
with:
pr-title: Update flake.lock
pr-labels: |
dependencies
automated

1189
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -2,17 +2,16 @@
"nodes": {
"crane": {
"locked": {
"lastModified": 1742394900,
"narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
"owner": "ipetkov",
"repo": "crane",
"rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
"type": "github"
"lastModified": 1741479724,
"narHash": "sha256-fnyETBKSVRa5abjOiRG/IAzKZq5yX8U6oRrHstPl4VM=",
"rev": "60202a2e3597a3d91f5e791aab03f45470a738b5",
"revCount": 709,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.20.2/0195784b-915b-7d2d-915d-ab02d1112ef9/source.tar.gz"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
"type": "tarball",
"url": "https://flakehub.com/f/ipetkov/crane/%2A"
}
},
"flake-compat": {
@ -102,7 +101,7 @@
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nix/2.tar.gz"
"url": "https://flakehub.com/f/NixOS/nix/2"
}
},
"nixpkgs": {
@ -164,7 +163,7 @@
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz"
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1"
}
},
"root": {

View file

@ -2,16 +2,14 @@
description = "GitHub Actions-powered Nix binary cache";
inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz";
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
# Pinned to `master` until a release containing
# <https://github.com/ipetkov/crane/pull/792> is cut.
crane.url = "github:ipetkov/crane";
crane.url = "https://flakehub.com/f/ipetkov/crane/*";
nix.url = "https://flakehub.com/f/NixOS/nix/2.tar.gz";
nix.url = "https://flakehub.com/f/NixOS/nix/2";
};
outputs = { self, nixpkgs, crane, ... }@inputs:
outputs = inputs:
let
supportedSystems = [
"aarch64-linux"
@ -20,14 +18,13 @@
"x86_64-darwin"
];
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f rec {
pkgs = import nixpkgs {
forEachSupportedSystem = f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f rec {
pkgs = import inputs.nixpkgs {
inherit system;
overlays = [
self.overlays.default
inputs.self.overlays.default
];
};
inherit (pkgs) lib;
inherit system;
});
in
@ -35,14 +32,14 @@
overlays.default = final: prev:
let
craneLib = crane.mkLib final;
craneLib = inputs.crane.mkLib final;
crateName = craneLib.crateNameFromCargoToml {
cargoToml = ./magic-nix-cache/Cargo.toml;
};
commonArgs = {
inherit (crateName) pname version;
src = self;
src = inputs.self;
nativeBuildInputs = with final; [
pkg-config
@ -97,7 +94,7 @@
createChain 200 startFile;
});
devShells = forEachSupportedSystem ({ system, pkgs, lib }: {
devShells = forEachSupportedSystem ({ system, pkgs }: {
default = pkgs.mkShell {
packages = with pkgs; [
rustc

View file

@ -16,7 +16,7 @@ serde = { version = "1.0.162", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.96", default-features = false }
sha2 = { version = "0.10.6", default-features = false }
thiserror = "1.0.40"
tokio = { version = "1.28.0", default-features = false, features = ["io-util"] }
tokio = { version = "1.44.2", default-features = false, features = ["io-util"] }
tracing = { version = "0.1.37", default-features = false }
unicode-bom = "2.0.2"

View file

@ -60,6 +60,6 @@ hyper-util = { version = "0.1", features = ["tokio", "server-auto", "http1"] }
xdg = { version = "2.5.2" }
[dependencies.tokio]
version = "1.28.0"
version = "1.44.2"
default-features = false
features = ["fs", "macros", "process", "rt", "rt-multi-thread", "sync"]