From 60e27b1b594201751c8dc0dba67197621d5c04ff Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 16 Apr 2024 07:51:57 -0700 Subject: [PATCH] chore: remove unnecessary overlay --- nixos/base/nixpkgs.nix | 1 - nixos/unifi.nix | 14 ++++++++++++-- overlays/default.nix | 1 - overlays/unifi.nix | 14 -------------- 4 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 overlays/unifi.nix diff --git a/nixos/base/nixpkgs.nix b/nixos/base/nixpkgs.nix index c99eb47e..6404e809 100644 --- a/nixos/base/nixpkgs.nix +++ b/nixos/base/nixpkgs.nix @@ -5,7 +5,6 @@ in { overlays = [ inputs.arcexprs.overlays.default overlays.default - overlays.unifi ]; config = { allowUnfree = true; diff --git a/nixos/unifi.nix b/nixos/unifi.nix index 995e6b79..fe9aa9d8 100644 --- a/nixos/unifi.nix +++ b/nixos/unifi.nix @@ -10,8 +10,18 @@ in { services.unifi = { enable = mkDefault true; unifiPackage = mkDefault pkgs.unifi8; - #seems to be *much* harder to compile so not going with this for now... - #mongodbPackage = mkDefault pkgs.mongodb-5_0; + mongodbPackage = let + mongodb-5_0_26 = pkgs.mongodb-5_0.overrideAttrs (old: rec { + version = "5.0.26"; + name = "${old.pname}-${version}"; + src = pkgs.fetchurl { + url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "sha256-GGvE52zCu2tg4p35XJ5I78nBxRUp4KwBqlmtiv50N7w="; + }; + }); + isUpdated = lib.versionAtLeast pkgs.mongodb-5_0.version "5.0.26"; + message = "mongodb 5.0 updated in upstream nixpkgs, override no longer needed"; + in if !isUpdated then mongodb-5_0_26 else lib.warn message pkgs.mongodb-5_0; }; networking.firewall = mkIf cfg.enable { diff --git a/overlays/default.nix b/overlays/default.nix index 1c1d278c..116b888d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,7 +16,6 @@ in rec { nfs = import ./nfs.nix; nginx = import ./nginx.nix; samba = import ./samba.nix; - unifi = import ./unifi.nix; deploy-rs = inputs.deploy-rs.overlays.default or inputs.deploy-rs.overlay; arc = inputs.arcexprs.overlays.default; } diff --git a/overlays/unifi.nix b/overlays/unifi.nix deleted file mode 100644 index a020eda0..00000000 --- a/overlays/unifi.nix +++ /dev/null @@ -1,14 +0,0 @@ -final: prev: let - inherit (final) lib; -in { - mongodb-5_0 = let - mongodb-5_0_26 = prev.mongodb-5_0.overrideAttrs (old: rec { - version = "5.0.26"; - name = "${old.pname}-${version}"; - src = final.fetchurl { - url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "sha256-GGvE52zCu2tg4p35XJ5I78nBxRUp4KwBqlmtiv50N7w="; - }; - }); - in lib.warnIf (lib.versionAtLeast prev.mongodb-5_0.version "5.0.26") "mongodb 5.0 updated in upstream nixpkgs, overlay no longer needed" mongodb-5_0_26; -}