diff --git a/flake.lock b/flake.lock index 104545f2e4..66bfca6d32 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,46 @@ { "nodes": { + "concourse-shared": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1702030610, + "narHash": "sha256-xJnGnTKcn9Glo1m24P7JOvndpOnw1dcPQlvyTEMknho=", + "owner": "galoymoney", + "repo": "concourse-shared", + "rev": "a5c23563a206e818cac2169522bf199c78f1bd65", + "type": "github" + }, + "original": { + "owner": "galoymoney", + "repo": "concourse-shared", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -19,6 +56,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1701718080, + "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1701336116, "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", @@ -36,8 +89,9 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "concourse-shared": "concourse-shared", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" } }, @@ -78,6 +132,21 @@ "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", diff --git a/flake.nix b/flake.nix index f218d9fa84..63075379b2 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; + concourse-shared.url = "github:galoymoney/concourse-shared"; rust-overlay = { url = "github:oxalica/rust-overlay"; @@ -18,6 +19,7 @@ self, nixpkgs, flake-utils, + concourse-shared, rust-overlay, }: flake-utils.lib.eachDefaultSystem (system: let @@ -208,6 +210,8 @@ cp -rpv "build/$name-$system/bin" "$out/" ''; }; + + gh-token = concourse-shared.packages.${system}.gh-token; in with pkgs; { packages = { @@ -250,6 +254,7 @@ bash yq-go google-cloud-sdk + gh-token openssh rsync git-cliff