From c7ec34cf5ee57608265f7deebe7e1303c5a2a7b5 Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Wed, 15 Jan 2025 11:32:28 -0800 Subject: [PATCH 1/3] Change nixpkgs branch to 24.11 --- .cspell.json | 1 + flake.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/.cspell.json b/.cspell.json index 249844ce3..0662db03f 100644 --- a/.cspell.json +++ b/.cspell.json @@ -10,6 +10,7 @@ ], "dictionaries": ["project"], "ignorePaths": [ + "**/flake.nix", "**/CMakeLists.txt", "**/pyproject.toml", "**/iwyu_mappings.yml" diff --git a/flake.nix b/flake.nix index 61e471547..76c94ba08 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ { description = "AWS IoT Greengrass runtime for constrained devices."; inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; flakelight.url = "github:nix-community/flakelight"; poetry2nix.url = "github:nix-community/poetry2nix"; }; From b4dffa9c0dfb51898d5c987ec891c2922b9828d1 Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Wed, 15 Jan 2025 11:33:01 -0800 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flakelight': 'github:nix-community/flakelight/872a42a49eeaef940d45b3507905e202dab8f733' (2024-08-19) → 'github:nix-community/flakelight/eedc71d6488f5b2aaafa0b60b6229022aefddcb5' (2025-01-15) • Updated input 'flakelight/nixpkgs': 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9' (2024-08-14) → 'github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6' (2025-01-12) • Added input 'nixpkgs': 'github:NixOS/nixpkgs/9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14) • Updated input 'poetry2nix': 'github:nix-community/poetry2nix/5ee730a8752264e463c0eaf06cc060fd07f6dae9' (2024-08-20) → 'github:nix-community/poetry2nix/75d0515332b7ca269f6d7abfd2c44c47a7cbca7b' (2025-01-14) • Updated input 'poetry2nix/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Updated input 'poetry2nix/nix-github-actions': 'github:nix-community/nix-github-actions/5163432afc817cf8bd1f031418d1869e4c9d5547' (2023-12-29) → 'github:nix-community/nix-github-actions/e04df33f62cdcf93d73e9a04142464753a16db67' (2024-10-24) • Updated input 'poetry2nix/nixpkgs': 'github:NixOS/nixpkgs/e6cdd8a11b26b4d60593733106042141756b54a3' (2024-06-30) → 'github:NixOS/nixpkgs/75e28c029ef2605f9841e0baa335d70065fe7ae2' (2024-10-28) • Updated input 'poetry2nix/treefmt-nix': 'github:numtide/treefmt-nix/8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd' (2024-06-30) → 'github:numtide/treefmt-nix/9ef337e492a5555d8e17a51c911ff1f02635be15' (2024-10-28) --- flake.lock | 68 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 39eb00dc8..efa95ef22 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1724070979, - "narHash": "sha256-T0NFh1FnjaPBJGGzr0p5DLfbG4fJYcB8Qa6ktzynFjg=", + "lastModified": 1736964779, + "narHash": "sha256-pODIN6HpjGXHGr5A7NnxA09HXArFtOpA1omWF3vb1K8=", "owner": "nix-community", "repo": "flakelight", - "rev": "872a42a49eeaef940d45b3507905e202dab8f733", + "rev": "eedc71d6488f5b2aaafa0b60b6229022aefddcb5", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { @@ -75,34 +75,50 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719763542, - "narHash": "sha256-mXkOj9sJ0f69Nkc2dGGOWtof9d1YNY8Le/Hia3RN+8Q=", + "lastModified": 1736867362, + "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6cdd8a11b26b4d60593733106042141756b54a3", + "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1730157240, + "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724134185, - "narHash": "sha256-nDqpGjz7cq3ThdC98BPe1ANCNlsJds/LLZ3/MdIXjA0=", + "lastModified": 1736884309, + "narHash": "sha256-eiCqmKl0BIRiYk5/ZhZozwn4/7Km9CWTbc15Cv+VX5k=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "5ee730a8752264e463c0eaf06cc060fd07f6dae9", + "rev": "75d0515332b7ca269f6d7abfd2c44c47a7cbca7b", "type": "github" }, "original": { @@ -114,6 +130,7 @@ "root": { "inputs": { "flakelight": "flakelight", + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix" } }, @@ -142,8 +159,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "treefmt-nix": { @@ -154,11 +172,11 @@ ] }, "locked": { - "lastModified": 1719749022, - "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "type": "github" }, "original": { From 64992831af39aebdd8515b05ca06132ecb4b5c15 Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Thu, 16 Jan 2025 11:50:27 -0800 Subject: [PATCH 3/3] Automate updating lockfiles --- .github/workflows/update.yml | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/update.yml diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 000000000..4115afaa4 --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,38 @@ +name: Automatic updates + +on: + schedule: + - cron: "0 12 ? * WED" + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + update-lockfiles: + name: Update lockfiles + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@master + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + - name: Switch branch + run: | + git switch -c lockfile-update + git reset --hard main + - name: Update Nix flake + run: nix flake update --commit-lock-file + - name: Update poetry + run: | + nix develop -c bash -c "cd misc; poetry update" + git add . + git commit -m "Update poetry lockfile" || + echo "Did not update lockfile" + - run: git push -f origin lockfile-update + - run: gh pr create -B main -H lockfile-update -t "Update lockfiles" -b "" + env: + GH_TOKEN: ${{ github.token }}