From 8e83285f425dacda751bd393c5086c9c43861861 Mon Sep 17 00:00:00 2001 From: Simon Walker Date: Thu, 3 Aug 2023 17:20:52 +0100 Subject: [PATCH] Pin docker https://github.com/NixOS/nixpkgs/issues/245365 --- flake.lock | 17 +++++++++++++++++ flake.nix | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 77bae449..94e2f244 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "docker-pinned-nixpkgs": { + "locked": { + "lastModified": 1689254525, + "narHash": "sha256-JVFoTY3rs1uDHbh0llRb1BcTNx26fGSLSiPmjojT+KY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -151,6 +167,7 @@ "root": { "inputs": { "darwin": "darwin", + "docker-pinned-nixpkgs": "docker-pinned-nixpkgs", "flake-utils": "flake-utils", "home-manager": "home-manager", "jetbrains-updater": "jetbrains-updater", diff --git a/flake.nix b/flake.nix index 2a63162f..268b9aa6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + docker-pinned-nixpkgs.url = "github:nixos/nixpkgs/b6bbc53029a31f788ffed9ea2d459f0bb0f0fbfc"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; darwin = { @@ -32,7 +33,7 @@ , vscode-extensions , vscode-server , ... - }: + }@inputs: let mkOverlays = system: [ (final: prev: { @@ -46,6 +47,12 @@ wally = final.callPackage ./derivations/wally { }; cert-info = final.callPackage ./derivations/cert-info { }; }) + # pin docker client + ( + self: super: { + docker = inputs.docker-pinned-nixpkgs.legacyPackages.${system}.docker; + } + ) # override the version of xattr for poetry ( let