From a17cd69a52f4f2a06de00182c0d08062769a9f7e Mon Sep 17 00:00:00 2001 From: stuebinm Date: Wed, 27 Sep 2023 17:14:05 +0200 Subject: [PATCH] keep using the old uffd's pythonPackages, lol --- flake.lock | 17 +++++++++++++++++ flake.nix | 1 + pkgs/default.nix | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 0c0323b..111ade0 100644 --- a/flake.lock +++ b/flake.lock @@ -625,6 +625,22 @@ "type": "indirect" } }, + "nixpkgs-oldstable": { + "locked": { + "lastModified": 1678761643, + "narHash": "sha256-tapXZvg6Kg5Fm7Fm6i+7cRC5Exp2lX7cgMrqsfrGhuc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c4aec3c021620d98861639946123214207e98344", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c4aec3c021620d98861639946123214207e98344", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1695318763, @@ -776,6 +792,7 @@ "nix-hexchen": "nix-hexchen", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", + "nixpkgs-oldstable": "nixpkgs-oldstable", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "tracktrain": "tracktrain" diff --git a/flake.nix b/flake.nix index c4f97e9..eeb5c82 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; + nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344"; nix-hexchen.url = "gitlab:hexchen/nixfiles"; nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; tracktrain.url = "git+https://stuebinm.eu/git/tracktrain?ref=main"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 6d25aa3..4a80cae 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,6 +3,7 @@ let pkgs = import sources.nixpkgs args; unstable = import sources.nixpkgs-unstable args; + oldstable = import sources.nixpkgs-oldstable args; callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); @@ -34,7 +35,7 @@ let ''; }; - uffd = callPackage ./uffd {}; + uffd = oldstable.callPackage ./uffd { }; netbox = pkgs.netbox.override (super: rec { python3 = super.python3.override (oldpy: { @@ -48,6 +49,9 @@ let }); inherit (unstable) vaultwarden vaultwarden-vault; + inherit oldstable; + + inherit (oldstable) uwsgi flask; }; in pkgs.extend(_: _: newpkgs)