···

       
694
       
694
       
 
       
  This enables mandoc to find manual pages in Nix profiles. To set the manual search paths via the `mandoc.conf` configuration file like before, use `documentation.man.mandoc.settings.manpath` instead.

     

       
695
       
695
       
 
       


     

       
696
       
696
       
 
       
- `grafana-loki` package was updated to 3.0.0 which includes [breaking changes](https://github.com/grafana/loki/releases/tag/v3.0.0)

     

       
697
       
697
       
+
       


     

       
698
       
698
       
+
       
- `programs.fish.package` now allows you to override the package used in the `fish` module

     

···

       
55
       
55
       
 
       
        type = types.bool;

     

       
56
       
56
       
 
       
      };

     

       
57
       
57
       
 
       


     

       
58
       
58
       
+
       
      package = mkPackageOption pkgs "fish" { };

     

       
59
       
59
       
+
       


     

       
58
       
60
       
 
       
      useBabelfish = mkOption {

     

       
59
       
61
       
 
       
        type = types.bool;

     

       
60
       
62
       
 
       
        default = false;

     
···

       
244
       
246
       
 
       
          patchedGenerator = pkgs.stdenv.mkDerivation {

     

       
245
       
247
       
 
       
            name = "fish_patched-completion-generator";

     

       
246
       
248
       
 
       
            srcs = [

     

       
247
       
247
       
-
       
              "${pkgs.fish}/share/fish/tools/create_manpage_completions.py"

     

       
248
       
248
       
-
       
              "${pkgs.fish}/share/fish/tools/deroff.py"

     

       
249
       
249
       
+
       
              "${cfg.package}/share/fish/tools/create_manpage_completions.py"

     

       
250
       
250
       
+
       
              "${cfg.package}/share/fish/tools/deroff.py"

     

       
249
       
251
       
 
       
            ];

     

       
250
       
252
       
 
       
            unpackCmd = "cp $curSrc $(basename $curSrc)";

     

       
251
       
253
       
 
       
            sourceRoot = ".";

     
···

       
287
       
289
       
 
       
        ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";

     

       
288
       
290
       
 
       
      }

     

       
289
       
291
       
 
       


     

       
290
       
290
       
-
       
      { systemPackages = [ pkgs.fish ]; }

     

       
292
       
292
       
+
       
      { systemPackages = [ cfg.package ]; }

     

       
291
       
293
       
 
       


     

       
292
       
294
       
 
       
      {

     

       
293
       
295
       
 
       
        shells = [

     

       
294
       
296
       
 
       
          "/run/current-system/sw/bin/fish"

     

       
295
       
295
       
-
       
          "${pkgs.fish}/bin/fish"

     

       
297
       
297
       
+
       
          (lib.getExe cfg.package)

     

       
296
       
298
       
 
       
        ];

     

       
297
       
299
       
 
       
      }

     

       
298
       
300
       
 
       
    ];

     

···

       
10
       
10
       
 
       
        coreutils

     

       
11
       
11
       
 
       
        procps # kill collides with coreutils' to test https://github.com/NixOS/nixpkgs/issues/56432

     

       
12
       
12
       
 
       
      ];

     

       
13
       
13
       
+
       
      # TODO: remove if/when #267880 is merged and this is a default

     

       
14
       
14
       
+
       
      services.logrotate.enable = false;

     

       
13
       
15
       
 
       
    };

     

       
14
       
16
       
 
       


     

       
15
       
17
       
 
       
  testScript =