Unverified Commit bc95e4b6 authored by Joseph Stahl's avatar Joseph Stahl
Browse files

recyclarr: 7.4.1 -> 8.2.1 

recyclarr: update to latest version and update related module to account
for upstream changes

Removes outdated dotnet-test-sdk and dotnet-tools lines.
Also adds myself (josephst) as maintainer for the module.
parent d1c15b7d

nixos/modules/services/misc/recyclarr.nix

+8 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ let 
  cfg = config.services.recyclarr;

  format = pkgs.formats.yaml { };

  stateDir = "/var/lib/recyclarr";

  configPath = "${stateDir}/config.json";

  configPath = "${stateDir}/config.yml";

  secretsReplacement = utils.genJqSecretsReplacement {

    loadCredential = true;

  } cfg.configuration configPath;
@@ -98,7 +98,6 @@ in 
    systemd.services.recyclarr = {

      description = "Recyclarr Service";



      # YAML is a JSON super-set

      preStart = secretsReplacement.script;



      serviceConfig = {
@@ -106,7 +105,11 @@ in 
        User = cfg.user;

        Group = cfg.group;

        StateDirectory = "recyclarr";

        ExecStart = "${lib.getExe cfg.package} ${cfg.command} --app-data ${stateDir} --config ${configPath}";

        Environment = [

          "RECYCLARR_CONFIG_DIR=${stateDir}"

          "RECYCLARR_DATA_DIR=${stateDir}"

        ];

        ExecStart = "${lib.getExe cfg.package} ${cfg.command} --config ${configPath}";

        LoadCredential = secretsReplacement.credentials;



        ProtectSystem = "strict";
@@ -151,4 +154,6 @@ in 
      };

    };

  };



  meta.maintainers = [ lib.maintainers.josephst ];

}

pkgs/by-name/re/recyclarr/001-Git-Version.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
diff --git a/Directory.Build.props b/Directory.Build.props

index af8e3b12..07dd1898 100644

--- a/Directory.Build.props

+++ b/Directory.Build.props

@@ -9,7 +9,7 @@

     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>

     <TestDirectory>$(RepositoryRoot)tests\</TestDirectory>

     <GitVersionBaseDirectory>$(RepositoryRoot)</GitVersionBaseDirectory>

-    <!--<DisableGitVersionTask>true</DisableGitVersionTask>-->

+    <DisableGitVersionTask>true</DisableGitVersionTask>

   </PropertyGroup>

 

   <!--

   
 No newline at end of file

pkgs/by-name/re/recyclarr/deps.json

+124 −714

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/re/recyclarr/package.nix

+16 −17
Original line number Diff line number Diff line
@@ -9,39 +9,38 @@ 
}:

buildDotnetModule (finalAttrs: {

  pname = "recyclarr";

  version = "7.4.1";

  version = "8.2.1";



  src = fetchFromGitHub {

    owner = "recyclarr";

    repo = "recyclarr";

    tag = "v${finalAttrs.version}";

    hash = "sha256-eutlnIHOcRnucgFDwJIheTPXA7avqvp4H0xUX2Cv2z8=";

    hash = "sha256-pC9HvJQXB1pBAZ7kXRPQaMgZnXoRh96QLsOzwO8CzNE=";

  };



  projectFile = "Recyclarr.sln";

  projectFile = "Recyclarr.slnx";

  nugetDeps = ./deps.json;



  prePatch = ''

    substituteInPlace src/Recyclarr.Cli/Console/CliSetup.cs \

      --replace-fail '$"v{GitVersionInformation.SemVer} ({GitVersionInformation.FullBuildMetaData})"' '"${finalAttrs.version}-nixpkgs"'



    substituteInPlace src/Recyclarr.Cli/Console/Setup/ProgramInformationDisplayTask.cs \

      --replace-fail 'GitVersionInformation.InformationalVersion' '"${finalAttrs.version}-nixpkgs"'



    substituteInPlace Recyclarr.sln \

      --replace-fail ".config\dotnet-tools.json = .config\dotnet-tools.json" ""

    cat > src/Recyclarr.Core/GitVersionInformation.g.cs <<'EOF'

    public static class GitVersionInformation

    {

        public static string SemVer => "${finalAttrs.version}";

        public static string FullBuildMetaData => "nixpkgs";

        public static string InformationalVersion => "${finalAttrs.version}+nixpkgs";

        public static int Major => ${lib.versions.major finalAttrs.version};

    }

    EOF



    rm .config/dotnet-tools.json

  '';

  patches = [ ./001-Git-Version.patch ];



  enableParallelBuilding = false;



  doCheck = false;



  dotnet-sdk = dotnetCorePackages.sdk_9_0;

  dotnet-runtime = dotnetCorePackages.runtime_9_0;

  dotnet-test-sdk = dotnetCorePackages.sdk_9_0;

  dotnetBuildFlags = [ "-p:DisableGitVersionTask=true" ];



  dotnet-sdk = dotnetCorePackages.sdk_10_0;

  dotnet-runtime = dotnetCorePackages.runtime_10_0;



  executables = [ "recyclarr" ];

  makeWrapperArgs = [