commit 52c99d862c7cae7ce9505a8c5a935d9536a10e11 · pyrox.dev/nixpkgs

+3 -4

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

···

       2526
       2526
        
             <listitem>

     

       2527
       2527
        
               <para>

     

       2528
       2528
        
                 The logrotate module also has been updated to freeform syntax:

     

       2529
       2529
       -
                 <link linkend="opt-services.logrotate.paths">services.logrotate.paths</link>

     

       2530
       2530
       -
                 and

     

       2531
       2531
       -
                 <link linkend="opt-services.logrotate.extraConfig">services.logrotate.extraConfig</link>

     

       2532
       2532
       -
                 will work, but issue deprecation warnings and

     

       2529
       2529
       +
                 <literal>services.logrotate.paths</literal> and

     

       2530
       2530
       +
                 <literal>services.logrotate.extraConfig</literal> will work,

     

       2531
       2531
       +
                 but issue deprecation warnings and

     

       2533
       2532
        
                 <link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>

     

       2534
       2533
        
                 should now be used instead.

     

       2535
       2534
        
               </para>

+9

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       509
       509
        
             </listitem>

     

       510
       510
        
             <listitem>

     

       511
       511
        
               <para>

     

       512
       512
       +
                 Deprecated settings <literal>logrotate.paths</literal> and

     

       513
       513
       +
                 <literal>logrotate.extraConfig</literal> have been removed.

     

       514
       514
       +
                 Please convert any uses to

     

       515
       515
       +
                 <link linkend="opt-services.logrotate.settings">services.logrotate.settings</link>

     

       516
       516
       +
                 instead.

     

       517
       517
       +
               </para>

     

       518
       518
       +
             </listitem>

     

       519
       519
       +
             <listitem>

     

       520
       520
       +
               <para>

     

       512
       521
        
                 The <literal>isPowerPC</literal> predicate, found on

     

       513
       522
        
                 <literal>platform</literal> attrsets

     

       514
       523
        
                 (<literal>hostPlatform</literal>,

+2 -2

nixos/doc/manual/release-notes/rl-2205.section.md

···

       906
       906
        
       

     

       907
       907
        
       - [services.logrotate.enable](#opt-services.logrotate.enable) now defaults to true if any rotate path has

     

       908
       908
        
         been defined, and some paths have been added by default.

     

       909
       909
       -
       - The logrotate module also has been updated to freeform syntax: [services.logrotate.paths](#opt-services.logrotate.paths)

     

       910
       910
       -
         and [services.logrotate.extraConfig](#opt-services.logrotate.extraConfig) will work, but issue deprecation

     

       909
       909
       +
       - The logrotate module also has been updated to freeform syntax: `services.logrotate.paths`

     

       910
       910
       +
         and `services.logrotate.extraConfig` will work, but issue deprecation

     

       911
       911
        
         warnings and [services.logrotate.settings](#opt-services.logrotate.settings) should now be used instead.

     

       912
       912
        
       

     

       913
       913
        
       - `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh).

+4

nixos/doc/manual/release-notes/rl-2211.section.md

···

171
171

This got partially copied over from the minimal profile and reduces the final system size by up to 200MB.

172
172

If you require all locales installed set the option to ``[ "all" ]``.

173
173

174
174
+
- Deprecated settings `logrotate.paths` and `logrotate.extraConfig` have

175
175
+
been removed. Please convert any uses to

176
176
+
[services.logrotate.settings](#opt-services.logrotate.settings) instead.

177
177
+

174
178

- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.

175
179

176
180

- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.

+1 -1

nixos/modules/programs/fish.nix

···

       35
       35
        
           '';

     

       36
       36
        
       

     

       37
       37
        
         babelfishTranslate = path: name:

     

       38
       38
       -
           pkgs.runCommand "${name}.fish" {

     

       38
       38
       +
           pkgs.runCommandLocal "${name}.fish" {

     

       39
       39
        
             nativeBuildInputs = [ pkgs.babelfish ];

     

       40
       40
        
           } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;";

     

       41
       41

+23 -179

nixos/modules/services/logging/logrotate.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.logrotate;

     

       7
       7
        
       

     

       8
       8
       -
         # deprecated legacy compat settings

     

       9
       9
       -
         # these options will be removed before 22.11 in the following PR:

     

       10
       10
       -
         # https://github.com/NixOS/nixpkgs/pull/164169

     

       11
       11
       -
         pathOpts = { name, ... }: {

     

       12
       12
       -
           options = {

     

       13
       13
       -
             enable = mkOption {

     

       14
       14
       -
               type = types.bool;

     

       15
       15
       -
               default = true;

     

       16
       16
       -
               description = lib.mdDoc ''

     

       17
       17
       -
                 Whether to enable log rotation for this path. This can be used to explicitly disable

     

       18
       18
       -
                 logging that has been configured by NixOS.

     

       19
       19
       -
               '';

     

       20
       20
       -
             };

     

       21
       21
       -
       

     

       22
       22
       -
             name = mkOption {

     

       23
       23
       -
               type = types.str;

     

       24
       24
       -
               internal = true;

     

       25
       25
       -
             };

     

       26
       26
       -
       

     

       27
       27
       -
             path = mkOption {

     

       28
       28
       -
               type = with types; either str (listOf str);

     

       29
       29
       -
               default = name;

     

       30
       30
       -
               defaultText = "attribute name";

     

       31
       31
       -
               description = lib.mdDoc ''

     

       32
       32
       -
                 The path to log files to be rotated.

     

       33
       33
       -
                 Spaces are allowed and normal shell quoting rules apply,

     

       34
       34
       -
                 with ', ", and \ characters supported.

     

       35
       35
       -
               '';

     

       36
       36
       -
             };

     

       37
       37
       -
       

     

       38
       38
       -
             user = mkOption {

     

       39
       39
       -
               type = with types; nullOr str;

     

       40
       40
       -
               default = null;

     

       41
       41
       -
               description = lib.mdDoc ''

     

       42
       42
       -
                 The user account to use for rotation.

     

       43
       43
       -
               '';

     

       44
       44
       -
             };

     

       45
       45
       -
       

     

       46
       46
       -
             group = mkOption {

     

       47
       47
       -
               type = with types; nullOr str;

     

       48
       48
       -
               default = null;

     

       49
       49
       -
               description = lib.mdDoc ''

     

       50
       50
       -
                 The group to use for rotation.

     

       51
       51
       -
               '';

     

       52
       52
       -
             };

     

       53
       53
       -
       

     

       54
       54
       -
             frequency = mkOption {

     

       55
       55
       -
               type = types.enum [ "hourly" "daily" "weekly" "monthly" "yearly" ];

     

       56
       56
       -
               default = "daily";

     

       57
       57
       -
               description = lib.mdDoc ''

     

       58
       58
       -
                 How often to rotate the logs.

     

       59
       59
       -
               '';

     

       60
       60
       -
             };

     

       61
       61
       -
       

     

       62
       62
       -
             keep = mkOption {

     

       63
       63
       -
               type = types.int;

     

       64
       64
       -
               default = 20;

     

       65
       65
       -
               description = lib.mdDoc ''

     

       66
       66
       -
                 How many rotations to keep.

     

       67
       67
       -
               '';

     

       68
       68
       -
             };

     

       69
       69
       -
       

     

       70
       70
       -
             extraConfig = mkOption {

     

       71
       71
       -
               type = types.lines;

     

       72
       72
       -
               default = "";

     

       73
       73
       -
               description = lib.mdDoc ''

     

       74
       74
       -
                 Extra logrotate config options for this path. Refer to

     

       75
       75
       -
                 <https://linux.die.net/man/8/logrotate> for details.

     

       76
       76
       -
               '';

     

       77
       77
       -
             };

     

       78
       78
       -
       

     

       79
       79
       -
             priority = mkOption {

     

       80
       80
       -
               type = types.int;

     

       81
       81
       -
               default = 1000;

     

       82
       82
       -
               description = lib.mdDoc ''

     

       83
       83
       -
                 Order of this logrotate block in relation to the others. The semantics are

     

       84
       84
       -
                 the same as with `lib.mkOrder`. Smaller values have a greater priority.

     

       85
       85
       -
               '';

     

       86
       86
       -
             };

     

       87
       87
       -
           };

     

       88
       88
       -
       

     

       89
       89
       -
           config.name = name;

     

       90
       90
       -
         };

     

       91
       91
       -
       

     

       92
       8
        
         generateLine = n: v:

     

       93
       9
        
           if builtins.elem n [ "files" "priority" "enable" "global" ] || v == null then null

     

       94
       94
       -
           else if builtins.elem n [ "extraConfig" "frequency" ] then "${v}\n"

     

       10
       10
       +
           else if builtins.elem n [ "frequency" ] then "${v}\n"

     

       95
       11
        
           else if builtins.elem n [ "firstaction" "lastaction" "prerotate" "postrotate" "preremove" ]

     

       96
       12
        
                then "${n}\n    ${v}\n  endscript\n"

     

       97
       13
        
           else if isInt v then "${n} ${toString v}\n"

     
···

       110
       26
        
               ${generateSection 2 settings}}

     

       111
       27
        
           '';

     

       112
       28
        
       

     

       113
       113
       -
         # below two mapPaths are compat functions

     

       114
       114
       -
         mapPathOptToSetting = n: v:

     

       115
       115
       -
           if n == "keep" then nameValuePair "rotate" v

     

       116
       116
       -
           else if n == "path" then nameValuePair "files" v

     

       117
       117
       -
           else nameValuePair n v;

     

       118
       118
       -
       

     

       119
       119
       -
         mapPathsToSettings = path: pathOpts:

     

       120
       120
       -
           nameValuePair path (

     

       121
       121
       -
             filterAttrs (n: v: ! builtins.elem n [ "user" "group" "name" ] && v != "") (

     

       122
       122
       -
               (mapAttrs' mapPathOptToSetting pathOpts) //

     

       123
       123
       -
               {

     

       124
       124
       -
                 su =

     

       125
       125
       -
                   if pathOpts.user != null

     

       126
       126
       -
                   then "${pathOpts.user} ${pathOpts.group}"

     

       127
       127
       -
                   else null;

     

       128
       128
       -
               }

     

       129
       129
       -
             )

     

       130
       130
       -
           );

     

       131
       131
       -
       

     

       132
       29
        
         settings = sortProperties (attrValues (filterAttrs (_: settings: settings.enable) (

     

       133
       30
        
           foldAttrs recursiveUpdate { } [

     

       134
       31
        
             {

     
···

       139
       36
        
                 frequency = "weekly";

     

       140
       37
        
                 rotate = 4;

     

       141
       38
        
               };

     

       142
       142
       -
               # compat section

     

       143
       143
       -
               extraConfig = {

     

       144
       144
       -
                 enable = (cfg.extraConfig != "");

     

       145
       145
       -
                 global = true;

     

       146
       146
       -
                 extraConfig = cfg.extraConfig;

     

       147
       147
       -
                 priority = 101;

     

       148
       148
       -
               };

     

       149
       39
        
             }

     

       150
       150
       -
             (mapAttrs' mapPathsToSettings cfg.paths)

     

       151
       40
        
             cfg.settings

     

       152
       41
        
             { header = { global = true; priority = 100; }; }

     

       153
       42
        
           ]

     
···

       200
       89
        
       in

     

       201
       90
        
       {

     

       202
       91
        
         imports = [

     

       203
       203
       -
           (mkRenamedOptionModule [ "services" "logrotate" "config" ] [ "services" "logrotate" "extraConfig" ])

     

       92
       92
       +
           (mkRemovedOptionModule [ "services" "logrotate" "config" ] "Modify services.logrotate.settings.header instead")

     

       93
       93
       +
           (mkRemovedOptionModule [ "services" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.header instead")

     

       94
       94
       +
           (mkRemovedOptionModule [ "services" "logrotate" "paths" ] "Add attributes to services.logrotate.settings instead")

     

       204
       95
        
         ];

     

       205
       96
        
       

     

       206
       97
        
         options = {

     
···

       218
       109
        
                 or settings common to all further files settings.

     

       219
       110
        
                 Refer to <https://linux.die.net/man/8/logrotate> for details.

     

       220
       111
        
               '';

     

       112
       112
       +
               example = literalExpression ''

     

       113
       113
       +
                 {

     

       114
       114
       +
                   # global options

     

       115
       115
       +
                   header = {

     

       116
       116
       +
                     dateext = true;

     

       117
       117
       +
                   };

     

       118
       118
       +
                   # example custom files

     

       119
       119
       +
                   "/var/log/mylog.log" = {

     

       120
       120
       +
                     frequency = "daily";

     

       121
       121
       +
                     rotate = 3;

     

       122
       122
       +
                   };

     

       123
       123
       +
                   "multiple paths" = {

     

       124
       124
       +
                      files = [

     

       125
       125
       +
                       "/var/log/first*.log"

     

       126
       126
       +
                       "/var/log/second.log"

     

       127
       127
       +
                     ];

     

       128
       128
       +
                   };

     

       129
       129
       +
                 };

     

       130
       130
       +
                 '';

     

       221
       131
        
               type = types.attrsOf (types.submodule ({ name, ... }: {

     

       222
       132
        
                 freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ]));

     

       223
       133
        
       

     
···

       311
       221
        
                 in this case you can disable the failing check with this option.

     

       312
       222
        
               '';

     

       313
       223
        
             };

     

       314
       314
       -
       

     

       315
       315
       -
             # deprecated legacy compat settings

     

       316
       316
       -
             paths = mkOption {

     

       317
       317
       -
               type = with types; attrsOf (submodule pathOpts);

     

       318
       318
       -
               default = { };

     

       319
       319
       -
               description = lib.mdDoc ''

     

       320
       320
       -
                 Attribute set of paths to rotate. The order each block appears in the generated configuration file

     

       321
       321
       -
                 can be controlled by the [priority](#opt-services.logrotate.paths._name_.priority) option

     

       322
       322
       -
                 using the same semantics as `lib.mkOrder`. Smaller values have a greater priority.

     

       323
       323
       -
                 This setting has been deprecated in favor of [logrotate settings](#opt-services.logrotate.settings).

     

       324
       324
       -
               '';

     

       325
       325
       -
               example = literalExpression ''

     

       326
       326
       -
                 {

     

       327
       327
       -
                   httpd = {

     

       328
       328
       -
                     path = "/var/log/httpd/*.log";

     

       329
       329
       -
                     user = config.services.httpd.user;

     

       330
       330
       -
                     group = config.services.httpd.group;

     

       331
       331
       -
                     keep = 7;

     

       332
       332
       -
                   };

     

       333
       333
       -
       

     

       334
       334
       -
                   myapp = {

     

       335
       335
       -
                     path = "/var/log/myapp/*.log";

     

       336
       336
       -
                     user = "myuser";

     

       337
       337
       -
                     group = "mygroup";

     

       338
       338
       -
                     frequency = "weekly";

     

       339
       339
       -
                     keep = 5;

     

       340
       340
       -
                     priority = 1;

     

       341
       341
       -
                   };

     

       342
       342
       -
                 }

     

       343
       343
       -
               '';

     

       344
       344
       -
             };

     

       345
       345
       -
       

     

       346
       346
       -
             extraConfig = mkOption {

     

       347
       347
       -
               default = "";

     

       348
       348
       -
               type = types.lines;

     

       349
       349
       -
               description = lib.mdDoc ''

     

       350
       350
       -
                 Extra contents to append to the logrotate configuration file. Refer to

     

       351
       351
       -
                 <https://linux.die.net/man/8/logrotate> for details.

     

       352
       352
       -
                 This setting has been deprecated in favor of

     

       353
       353
       -
                 [logrotate settings](#opt-services.logrotate.settings).

     

       354
       354
       -
               '';

     

       355
       355
       -
             };

     

       356
       224
        
           };

     

       357
       225
        
         };

     

       358
       226
        
       

     

       359
       227
        
         config = mkIf cfg.enable {

     

       360
       360
       -
           assertions =

     

       361
       361
       -
             mapAttrsToList

     

       362
       362
       -
               (name: pathOpts:

     

       363
       363
       -
                 {

     

       364
       364
       -
                   assertion = (pathOpts.user != null) == (pathOpts.group != null);

     

       365
       365
       -
                   message = ''

     

       366
       366
       -
                     If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified.

     

       367
       367
       -
                   '';

     

       368
       368
       -
                 })

     

       369
       369
       -
               cfg.paths;

     

       370
       370
       -
       

     

       371
       371
       -
           warnings =

     

       372
       372
       -
             (mapAttrsToList

     

       373
       373
       -
               (name: pathOpts: ''

     

       374
       374
       -
                 Using config.services.logrotate.paths.${name} is deprecated and will become unsupported in a future release.

     

       375
       375
       -
                 Please use services.logrotate.settings instead.

     

       376
       376
       -
               '')

     

       377
       377
       -
               cfg.paths

     

       378
       378
       -
             ) ++

     

       379
       379
       -
             (optional (cfg.extraConfig != "") ''

     

       380
       380
       -
               Using config.services.logrotate.extraConfig is deprecated and will become unsupported in a future release.

     

       381
       381
       -
               Please use services.logrotate.settings with globals=true instead.

     

       382
       382
       -
             '');

     

       383
       383
       -
       

     

       384
       228
        
           systemd.services.logrotate = {

     

       385
       229
        
             description = "Logrotate Service";

     

       386
       230
        
             startAt = "hourly";

+1 -10

nixos/modules/services/misc/gitlab.nix

···

       260
       260
        
           (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])

     

       261
       261
        
           (mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ])

     

       262
       262
        
           (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")

     

       263
       263
       +
           (mkRemovedOptionModule [ "services" "gitlab" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.gitlab directly instead")

     

       263
       264
        
         ];

     

       264
       265
        
       

     

       265
       266
        
         options = {

     
···

       871
       872
        
                 default = 30;

     

       872
       873
        
                 description = lib.mdDoc "How many rotations to keep.";

     

       873
       874
        
               };

     

       874
       874
       -
       

     

       875
       875
       -
               extraConfig = mkOption {

     

       876
       876
       -
                 type = types.lines;

     

       877
       877
       -
                 default = "";

     

       878
       878
       -
                 description = lib.mdDoc ''

     

       879
       879
       -
                   Extra logrotate config options for this path. Refer to

     

       880
       880
       -
                   <https://linux.die.net/man/8/logrotate> for details.

     

       881
       881
       -
                 '';

     

       882
       882
       -
               };

     

       883
       875
        
             };

     

       884
       876
        
       

     

       885
       877
        
             workhorse.config = mkOption {

     
···

       1042
       1034
        
                 rotate = cfg.logrotate.keep;

     

       1043
       1035
        
                 copytruncate = true;

     

       1044
       1036
        
                 compress = true;

     

       1045
       1045
       -
                 extraConfig = cfg.logrotate.extraConfig;

     

       1046
       1037
        
               };

     

       1047
       1038
        
             };

     

       1048
       1039
        
           };

-29

nixos/tests/logrotate.nix

···

       64
       64
        
                 notifempty = true;

     

       65
       65
        
               };

     

       66
       66
        
             };

     

       67
       67
       -
             # extraConfig compatibility - should be added to top level, early.

     

       68
       68
       -
             services.logrotate.extraConfig = ''

     

       69
       69
       -
               nomail

     

       70
       70
       -
             '';

     

       71
       71
       -
             # paths compatibility

     

       72
       72
       -
             services.logrotate.paths = {

     

       73
       73
       -
               compat_path = {

     

       74
       74
       -
                 path = "compat_test_path";

     

       75
       75
       -
               };

     

       76
       76
       -
               # user/group should be grouped as 'su user group'

     

       77
       77
       -
               compat_user = {

     

       78
       78
       -
                 user = config.users.users.root.name;

     

       79
       79
       -
                 group = "root";

     

       80
       80
       -
               };

     

       81
       81
       -
               # extraConfig in path should be added to block

     

       82
       82
       -
               compat_extraConfig = {

     

       83
       83
       -
                 extraConfig = "dateext";

     

       84
       84
       -
               };

     

       85
       85
       -
               # keep -> rotate

     

       86
       86
       -
               compat_keep = {

     

       87
       87
       -
                 keep = 1;

     

       88
       88
       -
               };

     

       89
       89
       -
             };

     

       90
       67
        
           };

     

       91
       68
        
         };

     

       92
       69
        
       

     
···

       127
       104
        
                     "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript",

     

       128
       105
        
                     "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf",

     

       129
       106
        
                     "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir",

     

       130
       130
       -
                     "sed -ne '1,/^\"/p' /tmp/logrotate.conf | grep nomail",

     

       131
       131
       -
                     "grep '\"compat_test_path\" {' /tmp/logrotate.conf",

     

       132
       132
       -
                     "sed -ne '/\"compat_user\" {/,/}/p' /tmp/logrotate.conf | grep 'su root root'",

     

       133
       133
       -
                     "sed -ne '/\"compat_extraConfig\" {/,/}/p' /tmp/logrotate.conf | grep dateext",

     

       134
       134
       -
                     "[[ $(sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w rotate) = \"  rotate 1\" ]]",

     

       135
       135
       -
                     "! sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w keep",

     

       136
       107
        
                 )

     

       137
       108
        
                 # also check configFile option

     

       138
       109
        
                 failingMachine.succeed(

+2 -2

pkgs/applications/misc/calibre/default.nix

···

       30
       30
        
       

     

       31
       31
        
       stdenv.mkDerivation rec {

     

       32
       32
        
         pname = "calibre";

     

       33
       33
       -
         version = "6.7.1";

     

       33
       33
       +
         version = "6.8.0";

     

       34
       34
        
       

     

       35
       35
        
         src = fetchurl {

     

       36
       36
        
           url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";

     

       37
       37
       -
           hash = "sha256-B//rBsvOXA5UqGjd2MLcAhDFCvreI7UmtfEpuxaIsa0=";

     

       37
       37
       +
           hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         # https://sources.debian.org/patches/calibre/${version}+dfsg-1

+2 -2

pkgs/applications/networking/cluster/terragrunt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "terragrunt";

     

       5
       5
       -
         version = "0.39.2";

     

       5
       5
       +
         version = "0.40.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-YHPtOcWhUDcCqtAmxy/veBgpYY+UmnmK2IwplI5uRh0=";

     

       11
       11
       +
           sha256 = "sha256-ZDoGlm/H2xh9+azb7N1EWUXwfF919K9B4PmQZol4RV8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";

+2 -2

pkgs/applications/version-management/got/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "got";

     

       7
       7
       -
         version = "0.77";

     

       7
       7
       +
         version = "0.78";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o=";

     

       11
       11
       +
           sha256 = "sha256-fi0YF0YCOtzA02Ix42BU6fi1UKgF/X6mG3S0fP/ZwxE=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkg-config bison ];

+3 -3

pkgs/data/misc/v2ray-geoip/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "v2ray-geoip";

     

       5
       5
       -
         version = "202210270100";

     

       5
       5
       +
         version = "202211030059";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "v2fly";

     

       9
       9
        
           repo = "geoip";

     

       10
       10
       -
           rev = "7558586fefca29c5d1705777187677fd8a4c4e6f";

     

       11
       11
       -
           sha256 = "sha256-8UKcmkaRe51X4JgQ5pqPE46BnVF0AlXETD/Pliwx9xk=";

     

       10
       10
       +
           rev = "b7d16c8aea9bbe2555fe4aabddd1fb86f9785229";

     

       11
       11
       +
           sha256 = "sha256-1WxqD9a0uJY+/DiFwESkEceN2EJvDl5qhLg4oEs5uSA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

+2 -2

pkgs/development/libraries/aws-c-sdkutils/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "aws-c-sdkutils";

     

       9
       9
       -
         version = "0.1.3";

     

       9
       9
       +
         version = "0.1.4";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "awslabs";

     

       13
       13
        
           repo = "aws-c-sdkutils";

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "sha256-mbleTBNZegfYeaRgEup36+mAwYs/2FReA3gW2tp4ctk=";

     

       15
       15
       +
           sha256 = "sha256-B7BTafeN60csYhhscuHsynI183AvCqLljQgm8NgE6xo=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/jellyfin-ffmpeg/default.nix

···

       8
       8
        
         nv-codec-headers = nv-codec-headers-11;

     

       9
       9
        
       }).overrideAttrs (old: rec {

     

       10
       10
        
         pname = "jellyfin-ffmpeg";

     

       11
       11
       -
         version = "5.1.2-2";

     

       11
       11
       +
         version = "5.1.2-4";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "jellyfin";

     

       15
       15
        
           repo = "jellyfin-ffmpeg";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "sha256-7Icp1vFnvhuohipGK7BqnxhhtX0iB02v5TXvh5sss3c=";

     

       17
       17
       +
           sha256 = "sha256-yzaS50sPgyRRLnvzaOiKOEaHKL3Yuf89KsHyPebjoL8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         configureFlags = old.configureFlags ++ [

+2 -2

pkgs/development/python-modules/aiomysensors/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "aiomysensors";

     

       18
       18
       -
         version = "0.3.1";

     

       18
       18
       +
         version = "0.3.2";

     

       19
       19
        
         format = "pyproject";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.9";

     
···

       24
       24
        
           owner = "MartinHjelmare";

     

       25
       25
        
           repo = pname;

     

       26
       26
        
           rev = "v${version}";

     

       27
       27
       -
           hash = "sha256-uzVtgJ4R2MK6lqruvmoqgkzVCLhjyaEV92X6U6+lwG4=";

     

       27
       27
       +
           hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+18 -12

pkgs/development/python-modules/asyncio_mqtt/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , pythonOlder

     

       4
       4
       -
       , fetchPypi

     

       5
       5
       -
       , async_generator

     

       3
       3
       +
       , fetchFromGitHub

     

       6
       4
        
       , paho-mqtt

     

       5
       5
       +
       , pythonOlder

     

       6
       6
       +
       , typing-extensions

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "asyncio-mqtt";

     

       11
       11
       -
         version = "0.12.1";

     

       11
       11
       +
         version = "0.13.0";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
       -
         src = fetchPypi {

     

       15
       15
       -
           pname = "asyncio_mqtt";

     

       16
       16
       -
           inherit version;

     

       17
       17
       -
           sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg=";

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "sbtinstruments";

     

       18
       18
       +
           repo = pname;

     

       19
       19
       +
           rev = "refs/tags/v${version}";

     

       20
       20
       +
           hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ=";

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       23
        
         propagatedBuildInputs = [

     

       21
       24
        
           paho-mqtt

     

       22
       22
       -
         ] ++ lib.optionals (pythonOlder "3.7") [

     

       23
       23
       -
           async_generator

     

       25
       25
       +
         ] ++ lib.optionals (pythonOlder "3.10") [

     

       26
       26
       +
           typing-extensions

     

       24
       27
        
         ];

     

       25
       28
        
       

     

       26
       26
       -
         doCheck = false; # no tests

     

       29
       29
       +
         # Module will have tests starting with > 0.13.0

     

       30
       30
       +
         doCheck = false;

     

       27
       31
        
       

     

       28
       28
       -
         pythonImportsCheck = [ "asyncio_mqtt" ];

     

       32
       32
       +
         pythonImportsCheck = [

     

       33
       33
       +
           "asyncio_mqtt"

     

       34
       34
       +
         ];

     

       29
       35
        
       

     

       30
       36
        
         meta = with lib; {

     

       31
       37
        
           description = "Idomatic asyncio wrapper around paho-mqtt";

+2 -2

pkgs/development/python-modules/canonicaljson/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "canonicaljson";

     

       13
       13
       -
         version = "1.6.3";

     

       13
       13
       +
         version = "1.6.4";

     

       14
       14
        
         format = "pyproject";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           hash = "sha256-yll2C8J0qJmg2nWAnWkJrkPlEjOB/W7wQKRNGVLAtEg=";

     

       20
       20
       +
           hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/jsonmerge/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "jsonmerge";

     

       10
       10
       -
         version = "1.8.0";

     

       10
       10
       +
         version = "1.9.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558";

     

       14
       14
       +
           sha256 = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [ jsonschema ];

+28 -4

pkgs/development/python-modules/mockupdb/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       2
       4
        
       , pymongo

     

       5
       5
       +
       , pythonOlder

     

       6
       6
       +
       , pytestCheckHook

     

       3
       7
        
       }:

     

       4
       8
        
       

     

       5
       9
        
       buildPythonPackage rec {

     

       6
       10
        
         pname = "mockupdb";

     

       7
       11
        
         version = "1.8.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.9";

     

       8
       15
        
       

     

       9
       16
        
         src = fetchPypi {

     

       10
       17
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e";

     

       18
       18
       +
           hash = "sha256-020OW2RF/5FB400BL6K13+WJhHqh4+y413QHSWKvlE4=";

     

       12
       19
        
         };

     

       13
       20
        
       

     

       14
       14
       -
         propagatedBuildInputs = [ pymongo ];

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           pymongo

     

       23
       23
       +
         ];

     

       15
       24
        
       

     

       16
       16
       -
         pythonImportsCheck = [ "mockupdb" ];

     

       25
       25
       +
         checkInputs = [

     

       26
       26
       +
           pytestCheckHook

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [

     

       30
       30
       +
           "mockupdb"

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         disabledTests = [

     

       34
       34
       +
           # AssertionError: expected to receive Request(), got nothing

     

       35
       35
       +
           "test_flags"

     

       36
       36
       +
           "test_iteration"

     

       37
       37
       +
           "test_ok"

     

       38
       38
       +
           "test_ssl_basic"

     

       39
       39
       +
           "test_unix_domain_socket"

     

       40
       40
       +
         ];

     

       17
       41
        
       

     

       18
       42
        
         meta = with lib; {

     

       19
       43
        
           description = "Simulate a MongoDB server";

+2 -2

pkgs/development/python-modules/shtab/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "shtab";

     

       13
       13
       -
         version = "1.5.6";

     

       13
       13
       +
         version = "1.5.7";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "iterative";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = "refs/tags/v${version}";

     

       22
       22
       -
           hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0=";

     

       22
       22
       +
           hash = "sha256-BIUUg+Y6bbgjnIWPU/bZO2axSLSzIsRJwyu7lBVQz/Q=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

+2 -2

pkgs/development/python-modules/slither-analyzer/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "slither-analyzer";

     

       16
       16
       -
         version = "0.9.0";

     

       16
       16
       +
         version = "0.9.1";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.8";

     
···

       22
       22
        
           owner = "crytic";

     

       23
       23
        
           repo = "slither";

     

       24
       24
        
           rev = "refs/tags/${version}";

     

       25
       25
       -
           hash = "sha256-Td7WBPpc+ZYlFroZNzvUqQZJag0lbkCgj8TVOPrAAPY=";

     

       25
       25
       +
           hash = "sha256-u9uA4eq6gYQXHhZ1ruk1vkEIRTKsgN87zENuR1Fhew4=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+2 -2

pkgs/development/tools/oh-my-posh/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "oh-my-posh";

     

       5
       5
       -
         version = "12.10.0";

     

       5
       5
       +
         version = "12.12.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "jandedobbeleer";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-iPSaJL1mvPjzZjXtgqeFS1p1jlOqc6B/R1/Zwym0j3g=";

     

       11
       11
       +
           sha256 = "sha256-6h/TV9Ddv+1pYPV7ZvOfEOOvbocRpLXdeR6EchTvV/A=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

+3 -3

pkgs/development/tools/pgloader/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }:

     

       2
       2
        
       stdenv.mkDerivation rec {

     

       3
       3
        
         pname = "pgloader";

     

       4
       4
       -
         version = "3.6.8";

     

       4
       4
       +
         version = "3.6.9";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
       -
           url = "https://github.com/dimitri/pgloader/releases/download/v3.6.8/pgloader-bundle-3.6.8.tgz";

     

       8
       8
       -
           sha256 = "sha256-h5vB+KOapbXsSVNIVWEsaanyczaCfl81+SXdiNmNboE=";

     

       7
       7
       +
           url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz";

     

       8
       8
       +
           sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA=";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ git makeWrapper ];

+3 -3

pkgs/development/tools/ruff/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "ruff";

     

       11
       11
       -
         version = "0.0.99";

     

       11
       11
       +
         version = "0.0.100";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "charliermarsh";

     

       15
       15
        
           repo = pname;

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           sha256 = "sha256-nDquTrdHv7t4XBuO1HUe6ZF+QKy06F2kjzNxlINZcPQ=";

     

       17
       17
       +
           sha256 = "sha256-kFWYSaRKx63X6Nfxd1knkusiJRKVRTNdd1jOQXBCRFQ=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoSha256 = "sha256-QG1EXsYuzrUgPCUWz/2NrtOpbFQHZjr9TVIyalnTvCc=";

     

       20
       20
       +
         cargoSha256 = "sha256-eew1ZTCm/C3qY/eZvWYkcLprgM/cRaTb6e2O66SNwk8=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       23
       23
        
           CoreServices

+2 -2

pkgs/development/web/nodejs/v14.nix

···

       8
       8
        
       in

     

       9
       9
        
         buildNodejs {

     

       10
       10
        
           inherit enableNpm;

     

       11
       11
       -
           version = "14.21.0";

     

       12
       12
       -
           sha256 = "sha256-O0vawbrMxUuu4uPbyre7Y1Ikxxbudu5Jqk9vVMKPeZE=";

     

       11
       11
       +
           version = "14.21.1";

     

       12
       12
       +
           sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w=";

     

       13
       13
        
           patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

     

       14
       14
        
         }

+2 -2

pkgs/development/web/nodejs/v16.nix

···

       8
       8
        
       in

     

       9
       9
        
         buildNodejs {

     

       10
       10
        
           inherit enableNpm;

     

       11
       11
       -
           version = "16.18.0";

     

       12
       12
       -
           sha256 = "sha256-/P5q0jQPIpBh0+galN8Wf+P3fgFxLe3AFEoOfVjixps=";

     

       11
       11
       +
           version = "16.18.1";

     

       12
       12
       +
           sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg=";

     

       13
       13
        
           patches = [

     

       14
       14
        
             ./disable-darwin-v8-system-instrumentation.patch

     

       15
       15
        
             ./bypass-darwin-xcrun-node16.patch

+2 -2

pkgs/development/web/nodejs/v18.nix

···

       8
       8
        
       in

     

       9
       9
        
       buildNodejs {

     

       10
       10
        
         inherit enableNpm;

     

       11
       11
       -
         version = "18.12.0";

     

       12
       12
       -
         sha256 = "sha256-c6fwHimZ6xl3Y87WZqbNVErVgOrvtz4KhJYDs+gE9C4=";

     

       11
       11
       +
         version = "18.12.1";

     

       12
       12
       +
         sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8=";

     

       13
       13
        
         patches = [

     

       14
       14
        
           (fetchpatch {

     

       15
       15
        
             # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200

+2 -2

pkgs/development/web/nodejs/v19.nix

···

       8
       8
        
       in

     

       9
       9
        
       buildNodejs {

     

       10
       10
        
         inherit enableNpm;

     

       11
       11
       -
         version = "19.0.0";

     

       12
       12
       -
         sha256 = "sha256-C3LSB6WBXxznskezPL+aLIb20BJT+jmQyXROJdl1BQ0=";

     

       11
       11
       +
         version = "19.0.1";

     

       12
       12
       +
         sha256 = "sha256-7OXCjOtHY/Xn8nb4ySUbNiHh+m5FyULnV8TRUfi/AW0=";

     

       13
       13
        
         patches = [

     

       14
       14
        
           (fetchpatch {

     

       15
       15
        
             # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200

+2 -2

pkgs/tools/admin/syft/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "syft";

     

       5
       5
       -
         version = "0.60.2";

     

       5
       5
       +
         version = "0.60.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "anchore";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-qOsKpJwX+8wFvVt/vLdVJ47rfoOn+11phq4HsQVLV6M=";

     

       11
       11
       +
           sha256 = "sha256-btPH92cLCAZFzlVoRxivBBhqzDK1bASrKbk3jvwDNo8=";

     

       12
       12
        
           # populate values that require us to use git. By doing this in postFetch we

     

       13
       13
        
           # can delete .git afterwards and maintain better reproducibility of the src.

     

       14
       14
        
           leaveDotGit = true;

+2 -2

pkgs/tools/misc/debootstrap/default.nix

···

       16
       16
        
         ];

     

       17
       17
        
       in stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "debootstrap";

     

       19
       19
       -
         version = "1.0.127";

     

       19
       19
       +
         version = "1.0.128";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitLab {

     

       22
       22
        
           domain = "salsa.debian.org";

     

       23
       23
        
           owner = "installer-team";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "sha256-KKH9F0e4HEO2FFh1/V5UIY5C95ZOUm4nUhVUGqpZWaI=";

     

       26
       26
       +
           sha256 = "sha256-WybWWyRPreokjUAdWfZ2MUjgZhF1GTncpbLajQ3rh0E=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [ makeWrapper ];

+4 -4

pkgs/tools/misc/mutagen/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "mutagen";

     

       5
       5
       -
         version = "0.14.0";

     

       5
       5
       +
         version = "0.16.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "mutagen-io";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE=";

     

       11
       11
       +
           sha256 = "sha256-nKt/A1LIr+cPWASWFYiOebxsuWcbzd23CQ32GgnWvLA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc=";

     

       14
       14
       +
         vendorSha256 = "sha256-feQOrZmJ656yD3HsxnN8JFXoP/XM2Gobyzj5MHyH/Xw=";

     

       15
       15
        
       

     

       16
       16
        
         agents = fetchzip {

     

       17
       17
        
           name = "mutagen-agents-${version}";

     
···

       21
       21
        
           postFetch = ''

     

       22
       22
        
             rm $out/mutagen # Keep only mutagen-agents.tar.gz.

     

       23
       23
        
           '';

     

       24
       24
       -
           sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8=";

     

       24
       24
       +
           sha256 = "sha256-QkleSf/Npbqrx2049tKxxwJk+996gM5AU/BIoyplDYo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         doCheck = false;

+3 -21

pkgs/tools/misc/vector/default.nix

···

       32
       32
        
       

     

       33
       33
        
       let

     

       34
       34
        
         pname = "vector";

     

       35
       35
       -
         version = "0.24.1";

     

       35
       35
       +
         version = "0.25.0";

     

       36
       36
        
       in

     

       37
       37
        
       rustPlatform.buildRustPackage {

     

       38
       38
        
         inherit pname version;

     
···

       41
       41
        
           owner = "vectordotdev";

     

       42
       42
        
           repo = pname;

     

       43
       43
        
           rev = "v${version}";

     

       44
       44
       -
           hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ=";

     

       44
       44
       +
           hash = "sha256-2hCgHf7iBPl9BQITXyUDwgAz/i2HhXT4eczWrExCUDk=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
       -
         patches = [

     

       48
       48
       -
           (fetchpatch {

     

       49
       49
       -
             name = "rust-1.64-part1.patch";

     

       50
       50
       -
             url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch";

     

       51
       51
       -
             hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs=";

     

       52
       52
       -
           })

     

       53
       53
       -
           (fetchpatch {

     

       54
       54
       -
             name = "rust-1.64-part2.patch";

     

       55
       55
       -
             url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch";

     

       56
       56
       -
             hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8=";

     

       57
       57
       -
             excludes = [

     

       58
       58
       -
               # There are too many conflicts to easily resolve patching this file, but

     

       59
       59
       -
               # the changes here do not block compilation.

     

       60
       60
       -
               "lib/lookup/src/lookup_v2/owned.rs"

     

       61
       61
       -
             ];

     

       62
       62
       -
           })

     

       63
       63
       -
         ];

     

       64
       64
       -
       

     

       65
       65
       -
         cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk=";

     

       47
       47
       +
         cargoHash = "sha256-E23m8/XCEXeEpz1itIzCit9RpoB1/PRrYVWxt+VVfxA=";

     

       66
       48
        
         nativeBuildInputs = [ pkg-config cmake perl ];

     

       67
       49
        
         buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]

     

       68
       50
        
           ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

+2 -2

pkgs/tools/networking/netbird/default.nix

···

       14
       14
        
       in

     

       15
       15
        
       buildGoModule rec {

     

       16
       16
        
         pname = "netbird";

     

       17
       17
       -
         version = "0.10.3";

     

       17
       17
       +
         version = "0.10.4";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "netbirdio";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = "v${version}";

     

       23
       23
       -
           sha256 = "sha256-JytK4wmQepSSml6jmP2TWRICt/s26E56ntACpFdiTDU=";

     

       23
       23
       +
           sha256 = "sha256-Z67imUrs/NUoBfbqIBmfTNMb1+X1NpYX4KxB5jU4C9c=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk=";

+3 -3

pkgs/tools/networking/s3cmd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "s3cmd";

     

       5
       5
       -
         version = "2.2.0";

     

       5
       5
       +
         version = "2.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "s3tools";

     

       9
       9
        
           repo = "s3cmd";

     

       10
       10
       -
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri";

     

       10
       10
       +
           rev = "refs/tags/v${version}";

     

       11
       11
       +
           sha256 = "sha256-nb4WEH8ELaG/bIe4NtjD4p99VJoG90UQ662iWyvnr2U=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ python-magic python-dateutil ];

+3 -3

pkgs/tools/virtualization/cloud-init/default.nix

···

       14
       14
        
       

     

       15
       15
        
       python3.pkgs.buildPythonApplication rec {

     

       16
       16
        
         pname = "cloud-init";

     

       17
       17
       -
         version = "22.3.3";

     

       17
       17
       +
         version = "22.3.4";

     

       18
       18
        
         namePrefix = "";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "canonical";

     

       22
       22
        
           repo = "cloud-init";

     

       23
       23
       -
           rev = version;

     

       24
       24
       -
           hash = "sha256-9vdFPSmkkdJDlVfA9DgqczRoOBMmSMezdl3D/0OSbsQ=";

     

       23
       23
       +
           rev = "refs/tags/${version}";

     

       24
       24
       +
           hash = "sha256-agffkTEaURjw/Ro8znYRQLKhDP2Ey0LimuzqbW5xb28=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         patches = [ ./0001-add-nixos-support.patch ];