From 699fc69bd3999aed5f73237765438ea4e56f169d Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 15 Apr 2024 19:11:07 +0200 Subject: [PATCH] flake.nix: Rollback nixpkgs for chaosevents input because of broken python deps in newer versions --- flake.lock | 30 ++++++++++++++++++++++-------- flake.nix | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3248487..ab28d6c 100644 --- a/flake.lock +++ b/flake.lock @@ -43,9 +43,7 @@ }, "chaosevents": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1708189846, @@ -107,7 +105,7 @@ "fieldpoc": { "inputs": { "mitel-ommclient2": "mitel-ommclient2", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1711287766, @@ -200,11 +198,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665732960, - "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { @@ -231,6 +229,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1665732960, + "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1712963716, "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", @@ -255,7 +269,7 @@ "fieldpoc": "fieldpoc", "nixos-exporter": "nixos-exporter", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-krypton": "nixpkgs-krypton", "solid-xmpp-alarm": "solid-xmpp-alarm" } diff --git a/flake.nix b/flake.nix index 194db60..5d23a91 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ }; chaosevents = { url = "git+https://git.clerie.de/clerie/chaosevents.git"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; }; fernglas = { url = "github:wobcom/fernglas";