Merge pull request 'update compiler to Rust 1.77' (#866 ) from rust-1.77 into main

Reviewed-on: #866
use rust 1.77 in nix/compile.nix
2024-08-26 19:08:00 +00:00 · 2024-08-26 19:19:16 +02:00 · 2024-08-26 19:19:16 +02:00
3 changed files with 21 additions and 73 deletions
--- a/flake.lock
+++ b/flake.lock
@ -28,11 +28,11 @@
    },
    "flake-compat": {
      "locked": {
-        "lastModified": 1688025799,
-        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
+        "lastModified": 1717312683,
+        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
        "owner": "nix-community",
        "repo": "flake-compat",
-        "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
+        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
        "type": "github"
      },
      "original": {
@ -42,33 +42,12 @@
      }
    },
    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
        "type": "github"
      },
      "original": {
@ -79,11 +58,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1682109806,
-        "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
+        "lastModified": 1724395761,
+        "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2362848adf8def2866fabbffc50462e929d7fffb",
+        "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
        "type": "github"
      },
      "original": {
@ -95,17 +74,17 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1707091808,
-        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
+        "lastModified": 1724681257,
+        "narHash": "sha256-EJRuc5Qp7yfXko5ZNeEMYAs4DzAvkCyALuJ/tGllhN4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "0239aeb2f82ea27ccd6b61582b8f7fb8750eeada",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "0239aeb2f82ea27ccd6b61582b8f7fb8750eeada",
        "type": "github"
      }
    },
@ -122,15 +101,14 @@
    },
    "rust-overlay": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1707271822,
-        "narHash": "sha256-/DZsoPH5GBzOpVEGz5PgJ7vh8Q6TcrJq5u8FcBjqAfI=",
+        "lastModified": 1724638882,
+        "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "7a94fe7690d2bdfe1aab475382a505e14dc114a6",
+        "rev": "19b70f147b9c67a759e35824b241f1ed92e46694",
        "type": "github"
      },
      "original": {
@ -138,36 +116,6 @@
        "repo": "rust-overlay",
        "type": "github"
      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -2,9 +2,9 @@
  description =
    "Garage, an S3-compatible distributed object store for self-hosted deployments";

-  # Nixpkgs 23.11 as of 2024-02-07, has rustc v1.73
+  # Nixpkgs 24.05 as of 2024-08-26 has rustc v1.77
  inputs.nixpkgs.url =
-    "github:NixOS/nixpkgs/9f2ee8c91ac42da3ae6c6a1d21555f283458247e";
+    "github:NixOS/nixpkgs/0239aeb2f82ea27ccd6b61582b8f7fb8750eeada";

  inputs.flake-compat.url = "github:nix-community/flake-compat";

@ -17,9 +17,9 @@
    # - rustc v1.66
    # url = "github:cargo2nix/cargo2nix/8fb57a670f7993bfc24099c33eb9c5abb51f29a2";

-    # Rust overlay as of 2024-02-07
+    # Rust overlay as of 2024-08-26
    inputs.rust-overlay.url =
-      "github:oxalica/rust-overlay/7a94fe7690d2bdfe1aab475382a505e14dc114a6";
+      "github:oxalica/rust-overlay/19b70f147b9c67a759e35824b241f1ed92e46694";

    inputs.nixpkgs.follows = "nixpkgs";
    inputs.flake-compat.follows = "flake-compat";
--- a/nix/compile.nix
+++ b/nix/compile.nix
@ -20,7 +20,7 @@ let
    };

  toolchainOptions = {
-    rustVersion = "1.73.0";
+    rustVersion = "1.77.0";
    extraRustComponents = [ "clippy" ];
  };
Author	SHA1	Message	Date
Alex	615698df7d	Merge pull request 'update compiler to Rust 1.77' (#866 ) from rust-1.77 into main All checks were successful ci/woodpecker/push/debug Pipeline was successful Details ci/woodpecker/cron/release/3 Pipeline was successful Details ci/woodpecker/cron/debug Pipeline was successful Details ci/woodpecker/cron/release/2 Pipeline was successful Details ci/woodpecker/cron/release/4 Pipeline was successful Details ci/woodpecker/cron/release/1 Pipeline was successful Details ci/woodpecker/cron/publish Pipeline was successful Details Reviewed-on: #866	2024-08-26 19:08:00 +00:00
Alex Auvolat	7061fa5a56	use rust 1.77 in nix/compile.nix All checks were successful ci/woodpecker/push/debug Pipeline was successful Details ci/woodpecker/pr/debug Pipeline was successful Details ci/woodpecker/deployment/debug Pipeline was successful Details ci/woodpecker/deployment/release/1 Pipeline was successful Details ci/woodpecker/deployment/release/4 Pipeline was successful Details ci/woodpecker/deployment/release/3 Pipeline was successful Details ci/woodpecker/deployment/release/2 Pipeline was successful Details ci/woodpecker/deployment/publish Pipeline was successful Details	2024-08-26 19:19:16 +02:00
Alex Auvolat	8881930cdd	update nixpkgs and rust-overlay sources in flake.nix	2024-08-26 19:19:16 +02:00