From a695f2a0b63414eeb903d509051c90b7acb2e2bd Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 3 Dec 2021 20:59:48 +0100 Subject: [PATCH] nixpkgs: update to 21.11 --- flake.lock | 8 ++++---- flake.nix | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0593b2815..264ace893 100644 --- a/flake.lock +++ b/flake.lock @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638452135, - "narHash": "sha256-5Il6hgrTgcWIsB7zug0yDFccYXx7pJCw8cwJdXMuLfM=", + "lastModified": 1638371214, + "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "43cdc5b364511eabdcad9fde639777ffd9e5bab1", + "rev": "a640d8394f34714578f3e6335fc767d0755d78f9", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-21.05", + "ref": "nixos-21.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 4f6e88b2d..eca4f474f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "flake:nixpkgs/nixos-21.05"; + nixpkgs.url = "flake:nixpkgs/nixos-21.11"; nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable"; utils.url = "github:gytis-ivaskevicius/flake-utils-plus/1.3.0"; simple-nixos-mailserver = { @@ -23,6 +23,14 @@ supportedSystems = [ "x86_64-linux" ]; + channels.nixpkgs.patches = [ + (nixpkgs.legacyPackages."x86_64-linux".fetchpatch { + name = "fix-homeassistant.patch"; + url = "https://github.com/NixOS/nixpkgs/commit/8e87ea556605e6947d1edb7cd81e58814eeadcae.patch"; + sha256 = "sha256-au5JwwmdRBsbiG9H8nh5n56QVZUFajx1ALMtzu+Nfq0="; + }) + ]; + hostDefaults.modules = [ nixpkgs.nixosModules.notDetected { @@ -33,7 +41,6 @@ ]; hosts.loutreos.modules = [ - "${nixpkgs-unstable}/nixos/modules/services/audio/navidrome.nix" simple-nixos-mailserver.nixosModule dogetipbot-telegram.nixosModule ipmihddtemp.nixosModule