commit 85f1ba3e51676fa8cc604a3d863d729026a6b8eb · pyrox.dev/nixpkgs

+3 -3

nixos/modules/services/web-apps/freshrss.nix

···

       220
       220
        
                   "catch_workers_output" = true;

     

       221
       221
        
                 };

     

       222
       222
        
                 phpEnv = {

     

       223
       223
       -
                   FRESHRSS_DATA_PATH = "${cfg.dataDir}";

     

       223
       223
       +
                   DATA_PATH = "${cfg.dataDir}";

     

       224
       224
        
                 };

     

       225
       225
        
               };

     

       226
       226
        
             };

     
···

       267
       267
        
                   WorkingDirectory = cfg.package;

     

       268
       268
        
                 };

     

       269
       269
        
                 environment = {

     

       270
       270
       -
                   FRESHRSS_DATA_PATH = cfg.dataDir;

     

       270
       270
       +
                   DATA_PATH = cfg.dataDir;

     

       271
       271
        
                 };

     

       272
       272
        
       

     

       273
       273
        
                 script =

     
···

       302
       302
        
               wantedBy = [ "multi-user.target" ];

     

       303
       303
        
               startAt = "*:0/5";

     

       304
       304
        
               environment = {

     

       305
       305
       -
                 FRESHRSS_DATA_PATH = cfg.dataDir;

     

       305
       305
       +
                 DATA_PATH = cfg.dataDir;

     

       306
       306
        
               };

     

       307
       307
        
               serviceConfig = defaultServiceConfig //{

     

       308
       308
        
                 ExecStart = "${cfg.package}/app/actualize_script.php";

+2 -10

pkgs/servers/web-apps/freshrss/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation rec {

     

       10
       10
        
         pname = "FreshRSS";

     

       11
       11
       -
         version = "1.21.0";

     

       11
       11
       +
         version = "1.22.1";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "FreshRSS";

     

       15
       15
        
           repo = "FreshRSS";

     

       16
       16
        
           rev = version;

     

       17
       17
       -
           hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI=";

     

       17
       17
       +
           hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         passthru.tests = {

     
···

       26
       26
        
         # There's nothing to build.

     

       27
       27
        
         dontBuild = true;

     

       28
       28
        
       

     

       29
       29
       -
         # the data folder is no in this package and thereby declared by an env-var

     

       30
       30
       -
         overrideConfig = pkgs.writeText "constants.local.php" ''

     

       31
       31
       -
           <?php

     

       32
       32
       -
             define('DATA_PATH', getenv('FRESHRSS_DATA_PATH'));

     

       33
       33
       -
         '';

     

       34
       34
       -
       

     

       35
       29
        
         postPatch = ''

     

       36
       30
        
           patchShebangs cli/*.php app/actualize_script.php

     

       37
       31
        
         '';

     
···

       39
       33
        
         installPhase = ''

     

       40
       34
        
           mkdir -p $out

     

       41
       35
        
           cp -vr * $out/

     

       42
       42
       -
       

     

       43
       43
       -
           cp $overrideConfig $out/constants.local.php

     

       44
       36
        
         '';

     

       45
       37
        
       

     

       46
       38
        
         meta = with lib; {