From 1399f74e875545f1dc2f3c8f991807e4d20dfd69 Mon Sep 17 00:00:00 2001 From: hexchen Date: Mon, 11 Jan 2021 00:11:40 +0000 Subject: [PATCH] pkgs: pass nixpkgs config properly see https://gitlab.com/hexchen/nixfiles/-/commit/cee4094d91f7e928df54814902bb99366e4d4da5 for details of upstream changes --- nix/sources.json | 2 +- pkgs/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index b7bd853..ed9e21b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -32,7 +32,7 @@ "nix-hexchen": { "ref": "main", "repo": "https://gitlab.com/hexchen/nixfiles.git", - "rev": "ea33a93da0bac59b757e7a059028526f47c2b852", + "rev": "5369d696f5381bf410408224fd8fa68480a96ff1", "type": "git" }, "nixos-mailserver": { diff --git a/pkgs/default.nix b/pkgs/default.nix index 053a4a9..286a3b4 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,8 +1,8 @@ -{ ... }: +{ config ? {}, system ? builtins.currentSystem, ... }@args: let sources = import ../nix/sources.nix; - pkgs = import sources.nixpkgs { config = { allowUnfree = true; }; }; + pkgs = import sources.nixpkgs args; callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);