From ec4e45e785faeb600b39c79cf4b04845bf558193 Mon Sep 17 00:00:00 2001 From: Teo Camarasu <teofilcamarasu@gmail.com> Date: Thu, 16 Feb 2023 12:21:35 +0000 Subject: [PATCH] Fix build under nix restricted eval mode --- ci/default.nix | 5 +---- flake.nix | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/default.nix b/ci/default.nix index e9de9373..d53badd2 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -1,7 +1,4 @@ -let sources = import ./nix/sources.nix; -in - -{ nixpkgs ? (import sources.nixpkgs.outPath {}) }: +{ sources ? import ./nix/sources.nix, nixpkgs ? (import sources.nixpkgs.outPath {}) }: with nixpkgs; let diff --git a/flake.nix b/flake.nix index e81a94a1..c857bf28 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,10 @@ inputs.overlay-tool.flake = false; inputs.flake-compat.url = "github:edolstra/flake-compat"; inputs.flake-compat.flake = false; - outputs = {nixpkgs, ...}: + outputs = sources@{nixpkgs, ...}: let system = "x86_64-linux"; - env = import ./ci/default.nix { nixpkgs = nixpkgs.legacyPackages."${system}"; }; + env = import ./ci/default.nix { inherit sources; nixpkgs = nixpkgs.legacyPackages."${system}"; }; in { devShells."${system}".default = env; hydraJobs.env."${system}" = env; -- GitLab