From 6b1156875efc37dc2b74c11a2a7f54228b185b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 11 Jun 2022 13:57:31 +0100 Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20use=20pkgs.callPackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 2 +- scripts/clean-s3-cache.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 2df0ace..13685a3 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }; packages = pkgs.lib.lists.foldl (a: b: a // b) { } [ - (pkgs.callPackage ./scripts/clean-s3-cache.nix { inherit inputs; }) + (import ./scripts/clean-s3-cache.nix { inherit pkgs inputs; }) ]; hydraJobs = { diff --git a/scripts/clean-s3-cache.nix b/scripts/clean-s3-cache.nix index 77854ef..d952df2 100644 --- a/scripts/clean-s3-cache.nix +++ b/scripts/clean-s3-cache.nix @@ -1,8 +1,8 @@ -{ stdenvNoCC, python3, python3Packages, inputs }: rec { - clean-s3-cache-env = python3.buildEnv.override { - extraLibs = with python3Packages; [ boto3 ]; +{ pkgs, inputs }: rec { + clean-s3-cache-env = pkgs.python3.buildEnv.override { + extraLibs = with pkgs.python3Packages; [ boto3 ]; }; - clean-s3-cache = stdenvNoCC.mkDerivation { + clean-s3-cache = pkgs.stdenvNoCC.mkDerivation { pname = "clean-s3-cache"; version = inputs.clean-s3-cache.lastModifiedDate; srcs = inputs.clean-s3-cache;