From 8fdea63c59fe2149e50685f41d8ada9e4eb7acb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sun, 28 Jan 2024 18:36:29 +0200 Subject: [PATCH] devShell: use django5 --- django5.nix | 7 +++++++ flake.nix | 2 +- overlay.nix | 8 +------- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 django5.nix diff --git a/django5.nix b/django5.nix new file mode 100644 index 0000000..78a5d6c --- /dev/null +++ b/django5.nix @@ -0,0 +1,7 @@ +_: prev: { + python3 = prev.python3.override { + packageOverrides = _: python-prev: { + django = python-prev.django_5; + }; + }; +} diff --git a/flake.nix b/flake.nix index 6f5d73c..d7d7e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [overlay]; + overlays = [overlay (import ./django5.nix)]; }; in { packages = { diff --git a/overlay.nix b/overlay.nix index 43f7ca8..9c4d103 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,11 +1,5 @@ geoip2-tarball: let - django5 = _: prev: { - python3 = prev.python3.override { - packageOverrides = _: python-prev: { - django = python-prev.django_5; - }; - }; - }; + django5 = import ./django5.nix; in _: prev: { geoip-mmdb = (prev.extend django5).callPackage ./pkgs/geoip-mmdb.nix {