From dd4cdb5cfa90a41a26f019156270e15749544361 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Fri, 29 Dec 2023 00:58:33 -0500 Subject: [PATCH] [HACK] aarch64 --- flake.lock | 79 +++++++++++++++-------------------------------------- flake.nix | 10 +++---- mkImage.nix | 6 ++-- 3 files changed, 30 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 8e2b625..a9f9209 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692225040, - "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=", + "lastModified": 1702969472, + "narHash": "sha256-IJP9sC+/gLUdWhm6TsnWpw6A1zQWUfn53ym63KeLXvU=", "owner": "zhaofengli", "repo": "attic", - "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd", + "rev": "bdafd64910bb2b861cf90fa15f1fc93318b6fbf6", "type": "github" }, "original": { @@ -24,26 +24,17 @@ }, "crane": { "inputs": { - "flake-compat": [ - "attic", - "flake-compat" - ], - "flake-utils": [ - "attic", - "flake-utils" - ], "nixpkgs": [ "attic", "nixpkgs" - ], - "rust-overlay": "rust-overlay" + ] }, "locked": { - "lastModified": 1677892403, - "narHash": "sha256-/Wi0L1spSWLFj+UQxN3j0mPYMoc7ZoAujpUF/juFVII=", + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", "owner": "ipetkov", "repo": "crane", - "rev": "105e27adb70a9890986b6d543a67761cbc1964a2", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", "type": "github" }, "original": { @@ -85,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1691853136, - "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0451844bbdf545f696f029d1448de4906c7f753", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { @@ -101,33 +92,34 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685004253, - "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=", + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1691965785, - "narHash": "sha256-5lq2454ysIgv+g/1vHMae0C1MaTU51fZqjW8PcEq+4s=", - "owner": "NixOS", + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "771b86d407c567b57d791197ec464b46a5480b0b", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "type": "github" }, "original": { - "id": "nixpkgs", - "rev": "771b86d407c567b57d791197ec464b46a5480b0b", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" } }, "root": { @@ -135,33 +127,6 @@ "attic": "attic", "nixpkgs": "nixpkgs_2" } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "attic", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "attic", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 21dae98..0a150e6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Woodpecker plugin to run nix commands and cache builds using attic"; - inputs.nixpkgs.url = "nixpkgs/771b86d407c567b57d791197ec464b46a5480b0b"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; inputs.attic.url = "github:zhaofengli/attic"; outputs = { @@ -10,14 +10,14 @@ attic, }: let pkgs = import nixpkgs { - system = "x86_64-linux"; + system = "aarch64-linux"; overlays = [attic.overlays.default]; }; entrypoint = import ./entrypoint.nix {inherit pkgs;}; mkImage = import ./mkImage.nix {inherit pkgs entrypoint;}; in { - packages.x86_64-linux.default = mkImage null; - packages.x86_64-linux.attic-client = pkgs.attic-client; - packages.x86_64-linux.woodpecker-plugin-nix-attic-release = mkImage "0.1.1"; + packages.aarch64-linux.default = mkImage null; + packages.aarch64-linux.attic-client = pkgs.attic-client; + packages.aarch64-linux.woodpecker-plugin-nix-attic-release = mkImage "0.2.0"; }; } diff --git a/mkImage.nix b/mkImage.nix index 7e2b5c5..64ef927 100644 --- a/mkImage.nix +++ b/mkImage.nix @@ -5,10 +5,10 @@ }: let nixImage = pkgs.dockerTools.pullImage { imageName = "nixos/nix"; - imageDigest = "sha256:cee9f1cda2d794c53ca0db0794ee54cfea32748dddb718beba9bf654416e437a"; - sha256 = "1angy2h02q3smpcyja3h3rzqx6nip50w56pn3yc56qcr9q896ffb"; + imageDigest = "sha256:6b7e838ff8176915c2df766efa2b2d7eb5904a8b10928e52c77d9564cff40f17"; + sha256 = "0m8ad1z44zfcbv424qnhkqdjq1dl9ib4mhqh9swn1hy1hw463qm3"; finalImageName = "nixos/nix"; - finalImageTag = "2.15.1"; + finalImageTag = "2.19.2"; }; in tag: