From 10268c8bfe69278ecd7e772010c16f9efe1f6a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 26 Jan 2024 10:18:46 +0200 Subject: [PATCH] fix `nix flake check` --- flake.nix | 2 +- modules/e11sync/default.nix | 2 +- overlays.nix => overlay.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) rename overlays.nix => overlay.nix (63%) diff --git a/flake.nix b/flake.nix index 0048fca..4dbd794 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ geoip2-tarball, ... }: let - overlay = import ./overlays.nix geoip2-tarball; + overlay = import ./overlay.nix geoip2-tarball; in flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { diff --git a/modules/e11sync/default.nix b/modules/e11sync/default.nix index 23b2e4f..1d1431b 100644 --- a/modules/e11sync/default.nix +++ b/modules/e11sync/default.nix @@ -4,7 +4,7 @@ geoip2-tarball: { pkgs, ... }: let - overlay = import ../../overlays.nix geoip2-tarball; + overlay = import ../../overlay.nix geoip2-tarball; pkgs1 = pkgs.extend overlay; inherit (pkgs1) e11sync-backend e11sync-caddyfile; in { diff --git a/overlays.nix b/overlay.nix similarity index 63% rename from overlays.nix rename to overlay.nix index 3c70982..5645dc2 100644 --- a/overlays.nix +++ b/overlay.nix @@ -1,9 +1,9 @@ -geoip2-tarball: (_: super: let - withDjango5 = super.extend ( - _: super: { - python3 = super.python3.override { - packageOverrides = _: python-super: { - django = python-super.django_5; +geoip2-tarball: (_: prev: let + withDjango5 = prev.extend ( + _: prev1: { + python3 = prev1.python3.override { + packageOverrides = _: python-prev: { + django = python-prev.django_5; }; }; }