From f6ea1f03322d7da79366525ec702730a8a15abad Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 10 Jan 2022 01:54:20 +0100 Subject: [PATCH] Revert "flake.nix: comment out inputs.*.inputs.*.follows to avoid nix-2.5 issue" This reverts commit f719288916a976d37da55c2eb751fbaf1142d84d. --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 6204a9fa..442a4e4b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,11 @@ nixpkgs-mobilizon.url = "github:erictapen/nixpkgs/mobilizon"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; secrets.url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"; - # secrets.inputs.sops-nix.follows = "sops-nix"; + secrets.inputs.sops-nix.follows = "sops-nix"; nixos-hardware.url = "github:nixos/nixos-hardware"; zentralwerk.url = "git+https://gitea.c3d2.de/zentralwerk/network.git"; yammat.url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix"; - # yammat.inputs.nixpkgs.follows = "nixpkgs"; + yammat.inputs.nixpkgs.follows = "nixpkgs"; scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git"; scrapers.flake = false; spacemsg.url = "github:astro/spacemsg"; @@ -20,12 +20,12 @@ ticker.url = "git+https://gitea.c3d2.de/astro/ticker.git"; ticker.flake = false; heliwatch.url = "git+https://gitea.c3d2.de/astro/heliwatch.git"; - # heliwatch.inputs.nixpkgs.follows = "nixpkgs"; + heliwatch.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; naersk.url = "github:mhuesch/naersk"; - # naersk.inputs.nixpkgs.follows = "nixpkgs"; + naersk.inputs.nixpkgs.follows = "nixpkgs"; fenix.url = "github:nix-community/fenix"; - # fenix.inputs.nixpkgs.follows = "nixpkgs"; + fenix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, ... }: