From b982c423ade3ca1219ad5016044348ed209ad867 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Thu, 9 Jan 2025 10:53:28 +0000 Subject: [PATCH 1/3] chore: Bump Rust version to 1.81 --- flake.lock | 32 ++++++++++++++++---------------- flake.nix | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 5c909e6..2a534e4 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1734808813, - "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", + "lastModified": 1736101677, + "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", "owner": "ipetkov", "repo": "crane", - "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", + "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -119,14 +119,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "root": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1734834660, - "narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", + "lastModified": 1736390353, + "narHash": "sha256-e2SP1zV9CISHlYZwEhwT53N9CW7yPh0tKTR0vuQqiWc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b070e6030118680977bc2388868c4b3963872134", + "rev": "1033caad3e26a56050de55ba0384df5ff0fa5ebd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 34c15b8..de2b68d 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ inherit system overlays; }; - rustVersion = "1.80.0"; + rustVersion = "1.81.0"; # define Rust toolchain version and targets to be used in this flake rust = (pkgs.rust-bin.stable.${rustVersion}.minimal.override From 8241829b7d4e058b975496813cab4ccee47fadf6 Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 29 Jan 2025 14:11:20 +0000 Subject: [PATCH 2/3] chore: Update Holochain to 0.4.1 --- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 2a534e4..ec74646 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1736101677, - "narHash": "sha256-iKOPq86AOWCohuzxwFy/MtC8PcSVGnrxBOvxpjpzrAY=", + "lastModified": 1737689766, + "narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=", "owner": "ipetkov", "repo": "crane", - "rev": "61ba163d85e5adeddc7b3a69bb174034965965b2", + "rev": "6fe74265bbb6d016d663b1091f015e2976c4a527", "type": "github" }, "original": { @@ -70,16 +70,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1734458780, - "narHash": "sha256-v06NZ0VWiGSC6+JfnQ0qCmjEhSOfdwG76dxzJ2fgh7Y=", + "lastModified": 1738154781, + "narHash": "sha256-s011Xzuw4quBGRcv3mSynap4qEyNlKf9reyxYhDW6r8=", "owner": "holochain", "repo": "holochain", - "rev": "f9311904e553e56e6622a978853974892d83e23e", + "rev": "a5816b0072a5a1b8c2f8ef215d81728c3d842b1f", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.4.0", + "ref": "holochain-0.4.1", "repo": "holochain", "type": "github" } @@ -103,11 +103,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1738023785, + "narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "2b4230bf03deb33103947e2528cac2ed516c5c89", "type": "github" }, "original": { @@ -148,11 +148,11 @@ ] }, "locked": { - "lastModified": 1736390353, - "narHash": "sha256-e2SP1zV9CISHlYZwEhwT53N9CW7yPh0tKTR0vuQqiWc=", + "lastModified": 1738117527, + "narHash": "sha256-GFviGfaezjGLFUlxdv3zyC7rSZvTXqwcG/YsF6MDkOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1033caad3e26a56050de55ba0384df5ff0fa5ebd", + "rev": "6a3dc6ce4132bd57359214d986db376f2333c14d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index de2b68d..0686411 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ # Holochain sources holochain = { - url = "github:holochain/holochain/holochain-0.4.0"; + url = "github:holochain/holochain/holochain-0.4.1"; flake = false; }; From 02468af4be45f3d051984cc715f2dcff40c88bbb Mon Sep 17 00:00:00 2001 From: ThetaSinner Date: Wed, 29 Jan 2025 14:55:16 +0000 Subject: [PATCH 3/3] ci: Bump Nix version --- .github/workflows/build.yaml | 6 +++--- .github/workflows/command-listener.yaml | 8 ++++---- .github/workflows/holonix-cache.yaml | 4 ++-- .github/workflows/holonix-update.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 29b0031..37455fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: - name: Install nix uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true @@ -106,7 +106,7 @@ jobs: - name: Install nix uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.6/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true @@ -144,7 +144,7 @@ jobs: - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true diff --git a/.github/workflows/command-listener.yaml b/.github/workflows/command-listener.yaml index 4f6118f..18bd88c 100644 --- a/.github/workflows/command-listener.yaml +++ b/.github/workflows/command-listener.yaml @@ -14,7 +14,7 @@ jobs: id: dispatch env: USER: ${{ github.event.sender.login }} - ALLOWED_USERS: ${{ join(fromJson('["ThetaSinner", "jost-s", "maackle", "neonphog", "matthme", "c12i"]'), '\n') }} + ALLOWED_USERS: ${{ join(fromJson('["ThetaSinner", "jost-s", "cdunster", "neonphog", "matthme", "c12i"]'), '\n') }} COMMENT: ${{ github.event.comment.body }} run: | set -euo pipefail @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - name: set up git config @@ -75,7 +75,7 @@ jobs: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - name: set up git config @@ -101,7 +101,7 @@ jobs: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - name: set up git config diff --git a/.github/workflows/holonix-cache.yaml b/.github/workflows/holonix-cache.yaml index c1157bc..4f037c4 100644 --- a/.github/workflows/holonix-cache.yaml +++ b/.github/workflows/holonix-cache.yaml @@ -39,7 +39,7 @@ jobs: steps: - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - uses: cachix/cachix-action@v15 @@ -110,7 +110,7 @@ jobs: steps: - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - uses: cachix/cachix-action@v15 diff --git a/.github/workflows/holonix-update.yaml b/.github/workflows/holonix-update.yaml index 9e4c1b6..b9da557 100644 --- a/.github/workflows/holonix-update.yaml +++ b/.github/workflows/holonix-update.yaml @@ -55,7 +55,7 @@ jobs: ref: ${{ inputs.branch }} - uses: cachix/install-nix-action@v30 with: - install_url: https://releases.nixos.org/nix/nix-2.24.9/install + install_url: https://releases.nixos.org/nix/nix-2.25.4/install extra_nix_config: | accept-flake-config = true - name: Run the Holochain and Lair bump scripts