From 1f4c0aef66d8e56ab9ec3a47105b10f7d3d15965 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+julm-nix@sourcephile.fr>
Date: Wed, 29 Dec 2021 20:06:35 +0100
Subject: [PATCH] nix: update to latest Nixpkgs
---
flake.lock | 8 ++++----
flake.nix | 12 +++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
index e8e079b..c6bb486 100644
--- a/flake.lock
+++ b/flake.lock
@@ -241,17 +241,17 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1638376152,
- "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=",
+ "lastModified": 1640319671,
+ "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
+ "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f",
+ "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
index f34f369..a09d535 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
{
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/6daa4a5c045d40e6eae60a3b6e427e8700f1c07f";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/eac07edbd20ed4908b98790ba299250b5527ecdf";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.home-manager.url = "github:nix-community/home-manager";
inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -41,16 +41,18 @@ outputs = inputs: let
inherit hostName inputs;
private = "/root/private"; # Kept out of /nix/store
};
- extraArgs = {
- inherit hostName inputs;
- hosts = inputs.self.nixosConfigurations;
- };
pkgs = import nixpkgsPath {
inherit system;
config.allowUnfree = true; # For hplip
overlays = import nixpkgs/overlays.nix;
};
modules = [
+ {
+ config._module.args = {
+ inherit hostName inputs;
+ hosts = inputs.self.nixosConfigurations;
+ };
+ }
(import (./hosts + "/${hostName}.nix"))
inputs.nixpkgs.nixosModules.notDetected
inputs.home-manager.nixosModules.home-manager
--
2.47.2