From d596295ae5fe775fe502af036caeefbb3f01c8ab Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Tue, 20 Aug 2024 12:25:27 -0400 Subject: [PATCH] fix overlay --- flake.nix | 7 +------ modules/common/nix.nix | 3 +++ overlays/recyclarr.nix | 12 ++++++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index b734ea8..5ac7ef6 100644 --- a/flake.nix +++ b/flake.nix @@ -30,12 +30,7 @@ outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, deploy-rs , impermanence, stylix, nixos-hardware, nixunstable, ... }: let - pkgs = import nixpkgs { - system = "x86_64-linux"; - overlays = [ - (import ./overlays/recyclarr.nix) - ]; - }; + pkgs = import nixpkgs { system = "x86_64-linux"; }; aarch64Pkgs = import nixpkgs { system = "aarch64-linux"; }; pkgs-unstable = import nixunstable { system = "x86_64-linux"; }; deployAarch64Pkgs = import nixpkgs { diff --git a/modules/common/nix.nix b/modules/common/nix.nix index c178aba..613d893 100644 --- a/modules/common/nix.nix +++ b/modules/common/nix.nix @@ -9,6 +9,9 @@ settings = { experimental-features = [ "nix-command" "flakes" ]; }; optimise.automatic = true; }; + nixpkgs.overlays = [ + (import ../../overlays/recyclarr.nix) + ]; system.autoUpgrade = { enable = true; flake = "git+https://git.icanttype.org/cdombroski/nix-configs.git"; diff --git a/overlays/recyclarr.nix b/overlays/recyclarr.nix index ee8c3f7..53d2520 100644 --- a/overlays/recyclarr.nix +++ b/overlays/recyclarr.nix @@ -1,15 +1,15 @@ -{ config, pkgs, fetchurl, ...}: -self: super: +final: prev: let os = "linux"; arch = "x64"; + hash = "sha256:04vg1s86krg7baifcpnqr5zg6jd6nfw0jhjsq09zzpxwg5skxlf7"; + version = "7.2.1"; in { - recyclarr = super.recyclarr.overrideAttrs (old: rec { - version = "7.2.1"; + recyclarr = prev.recyclarr.overrideAttrs (old: { + inherit version; name = "recyclarr-${version}"; - hash = "sha256:04vg1s86krg7baifcpnqr5zg6jd6nfw0jhjsq09zzpxwg5skxlf7"; - src = fetchurl { + src = prev.fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; inherit hash; };