diff --git a/flake.lock b/flake.lock index e7db699df..ffa6b2777 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ "docker-nixpkgs": { "flake": false, "locked": { - "lastModified": 1631525111, - "narHash": "sha256-dJKw280B1Hp0f6tSkBtkY0nrMT0DR/bmerrS3cQdBjI=", + "lastModified": 1678089139, + "narHash": "sha256-cK0RDcxR4eWMrdZIcqNVqnjo9k2LwVmNZO3qj1ctDXU=", "owner": "nix-community", "repo": "docker-nixpkgs", - "rev": "df7f64139a0b2384fb2448dc2a406815f8d03867", + "rev": "2205fb4968adf683324e6d0401b74b9d250d8f56", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 160631eed..c9b610c43 100644 --- a/flake.nix +++ b/flake.nix @@ -120,7 +120,7 @@ (final: prev: let pkgs-recent = import nixpkgs-recent { inherit system; }; - in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata; inherit (pkgs-recent.stdenv) fetchurlBoot; }) + in { inherit (pkgs-recent) dockerTools node2nix stack glibcLocalesUtf8 tzdata chromium minio minio-client; inherit (pkgs-recent.stdenv) fetchurlBoot; }) (import ./nix/maildev) haskell-nix.overlay diff --git a/nix/docker/default.nix b/nix/docker/default.nix index ad93c3a23..139ab2f7d 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -168,11 +168,14 @@ in tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version; fromImage = prev.docker-nixpkgs.nix-unstable; - contents = with final; [ - bash coreutils - minio-client - xz - ]; + copyToRoot = prev.buildEnv { + name = "uniworx-ci-root"; + paths = with final; [ + bash coreutils + minio-client + xz + ]; + }; runAsRoot = '' #!${final.stdenv.shell}