commit 6863d678bc8ab86cb219b477dcbaf6afa6bd7824 · pyrox.dev/nixpkgs

+62 -12

lib/modules.nix

···

       9
       9
        
           catAttrs

     

       10
       10
        
           concatLists

     

       11
       11
        
           concatMap

     

       12
       12
       -
           count

     

       12
       12
       +
           concatStringsSep

     

       13
       13
        
           elem

     

       14
       14
        
           filter

     

       15
       15
        
           findFirst

     
···

       47
       47
        
           showOption

     

       48
       48
        
           unknownModule

     

       49
       49
        
           ;

     

       50
       50
       +
       

     

       51
       51
       +
         showDeclPrefix = loc: decl: prefix:

     

       52
       52
       +
           " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'";

     

       53
       53
       +
         showRawDecls = loc: decls:

     

       54
       54
       +
           concatStringsSep "\n"

     

       55
       55
       +
             (sort (a: b: a < b)

     

       56
       56
       +
               (concatMap

     

       57
       57
       +
                 (decl: map

     

       58
       58
       +
                   (showDeclPrefix loc decl)

     

       59
       59
       +
                   (attrNames decl.options)

     

       60
       60
       +
                 )

     

       61
       61
       +
                 decls

     

       62
       62
       +
             ));

     

       63
       63
       +
       

     

       50
       64
        
       in

     

       51
       65
        
       

     

       52
       66
        
       rec {

     
···

       474
       488
        
                 [{ inherit (module) file; inherit value; }]

     

       475
       489
        
               ) configs;

     

       476
       490
        
       

     

       491
       491
       +
             # Convert an option tree decl to a submodule option decl

     

       492
       492
       +
             optionTreeToOption = decl:

     

       493
       493
       +
               if isOption decl.options

     

       494
       494
       +
               then decl

     

       495
       495
       +
               else decl // {

     

       496
       496
       +
                   options = mkOption {

     

       497
       497
       +
                     type = types.submoduleWith {

     

       498
       498
       +
                       modules = [ { options = decl.options; } ];

     

       499
       499
       +
                       # `null` is not intended for use by modules. It is an internal

     

       500
       500
       +
                       # value that means "whatever the user has declared elsewhere".

     

       501
       501
       +
                       # This might become obsolete with https://github.com/NixOS/nixpkgs/issues/162398

     

       502
       502
       +
                       shorthandOnlyDefinesConfig = null;

     

       503
       503
       +
                     };

     

       504
       504
       +
                   };

     

       505
       505
       +
                 };

     

       506
       506
       +
       

     

       477
       507
        
             resultsByName = mapAttrs (name: decls:

     

       478
       508
        
               # We're descending into attribute ‘name’.

     

       479
       509
        
               let

     

       480
       510
        
                 loc = prefix ++ [name];

     

       481
       511
        
                 defns = defnsByName.${name} or [];

     

       482
       512
        
                 defns' = defnsByName'.${name} or [];

     

       483
       483
       -
                 nrOptions = count (m: isOption m.options) decls;

     

       513
       513
       +
                 optionDecls = filter (m: isOption m.options) decls;

     

       484
       514
        
               in

     

       485
       485
       -
                 if nrOptions == length decls then

     

       515
       515
       +
                 if length optionDecls == length decls then

     

       486
       516
        
                   let opt = fixupOptionType loc (mergeOptionDecls loc decls);

     

       487
       517
        
                   in {

     

       488
       518
        
                     matchedOptions = evalOptionValue loc opt defns';

     

       489
       519
        
                     unmatchedDefns = [];

     

       490
       520
        
                   }

     

       491
       491
       -
                 else if nrOptions != 0 then

     

       492
       492
       -
                   let

     

       493
       493
       -
                     firstOption = findFirst (m: isOption m.options) "" decls;

     

       494
       494
       -
                     firstNonOption = findFirst (m: !isOption m.options) "" decls;

     

       495
       495
       -
                   in

     

       496
       496
       -
                     throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."

     

       521
       521
       +
                 else if optionDecls != [] then

     

       522
       522
       +
                     if all (x: x.options.type.name == "submodule") optionDecls

     

       523
       523
       +
                     # Raw options can only be merged into submodules. Merging into

     

       524
       524
       +
                     # attrsets might be nice, but ambiguous. Suppose we have

     

       525
       525
       +
                     # attrset as a `attrsOf submodule`. User declares option

     

       526
       526
       +
                     # attrset.foo.bar, this could mean:

     

       527
       527
       +
                     #  a. option `bar` is only available in `attrset.foo`

     

       528
       528
       +
                     #  b. option `foo.bar` is available in all `attrset.*`

     

       529
       529
       +
                     #  c. reject and require "<name>" as a reminder that it behaves like (b).

     

       530
       530
       +
                     #  d. magically combine (a) and (c).

     

       531
       531
       +
                     # All of the above are merely syntax sugar though.

     

       532
       532
       +
                     then

     

       533
       533
       +
                       let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls));

     

       534
       534
       +
                       in {

     

       535
       535
       +
                         matchedOptions = evalOptionValue loc opt defns';

     

       536
       536
       +
                         unmatchedDefns = [];

     

       537
       537
       +
                       }

     

       538
       538
       +
                     else

     

       539
       539
       +
                       let

     

       540
       540
       +
                         firstNonOption = findFirst (m: !isOption m.options) "" decls;

     

       541
       541
       +
                         nonOptions = filter (m: !isOption m.options) decls;

     

       542
       542
       +
                       in

     

       543
       543
       +
                       throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or "<no description>"}' does not support nested options.\n${

     

       544
       544
       +
                         showRawDecls loc nonOptions

     

       545
       545
       +
                       }"

     

       497
       546
        
                 else

     

       498
       547
        
                   mergeModules' loc decls defns) declsByName;

     

       499
       548
        
       

     
···

       753
       802
        
             compare = a: b: (a.priority or 1000) < (b.priority or 1000);

     

       754
       803
        
           in sort compare defs';

     

       755
       804
        
       

     

       756
       756
       -
         /* Hack for backward compatibility: convert options of type

     

       757
       757
       -
            optionSet to options of type submodule.  FIXME: remove

     

       758
       758
       -
            eventually. */

     

       759
       805
        
         fixupOptionType = loc: opt:

     

       760
       806
        
           let

     

       761
       807
        
             options = opt.options or

     

       762
       808
        
               (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");

     

       809
       809
       +
       

     

       810
       810
       +
             # Hack for backward compatibility: convert options of type

     

       811
       811
       +
             # optionSet to options of type submodule.  FIXME: remove

     

       812
       812
       +
             # eventually.

     

       763
       813
        
             f = tp:

     

       764
       814
        
               if tp.name == "option set" || tp.name == "submodule" then

     

       765
       815
        
                 throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."

+1 -1

lib/options.nix

···

       231
       231
        
                   then true

     

       232
       232
        
                   else opt.visible or true;

     

       233
       233
        
                 readOnly = opt.readOnly or false;

     

       234
       234
       -
                 type = opt.type.description or null;

     

       234
       234
       +
                 type = opt.type.description or "unspecified";

     

       235
       235
        
               }

     

       236
       236
        
               // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; }

     

       237
       237
        
               // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }

+13

lib/tests/modules.sh

···

       62
       62
        
       checkConfigOutput '^false$' config.enable ./declare-enable.nix

     

       63
       63
        
       checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix

     

       64
       64
        
       

     

       65
       65
       +
       checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix

     

       66
       66
       +
       checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix

     

       67
       67
       +
       checkConfigOutput '^42$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix

     

       68
       68
       +
       checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix

     

       69
       69
       +
       checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix

     

       70
       70
       +
       checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix  ./declare-bare-submodule-deep-option-duplicate.nix

     

       71
       71
       +
       

     

       65
       72
        
       # Check integer types.

     

       66
       73
        
       # unsigned

     

       67
       74
        
       checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix

     
···

       303
       310
        
       checkConfigOutput "10" config.processedToplevel ./raw.nix

     

       304
       311
        
       checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix

     

       305
       312
        
       checkConfigOutput "bar" config.priorities ./raw.nix

     

       313
       313
       +
       

     

       314
       314
       +
       ## Option collision

     

       315
       315
       +
       checkConfigError \

     

       316
       316
       +
         'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \

     

       317
       317
       +
         config.set \

     

       318
       318
       +
         ./declare-set.nix ./declare-enable-nested.nix

     

       306
       319
        
       

     

       307
       320
        
       # Test that types.optionType merges types correctly

     

       308
       321
        
       checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix

+10

lib/tests/modules/declare-bare-submodule-deep-option-duplicate.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) mkOption types;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.bare-submodule.deep = mkOption {

     

       7
       7
       +
           type = types.int;

     

       8
       8
       +
           default = 2;

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+10

lib/tests/modules/declare-bare-submodule-deep-option.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) mkOption types;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.bare-submodule.deep = mkOption {

     

       7
       7
       +
           type = types.int;

     

       8
       8
       +
           default = 2;

     

       9
       9
       +
         };

     

       10
       10
       +
       }

+19

lib/tests/modules/declare-bare-submodule-nested-option.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) mkOption types;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.bare-submodule = mkOption {

     

       7
       7
       +
           type = types.submoduleWith {

     

       8
       8
       +
             shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;

     

       9
       9
       +
             modules = [

     

       10
       10
       +
               {

     

       11
       11
       +
                 options.nested = mkOption {

     

       12
       12
       +
                   type = types.int;

     

       13
       13
       +
                   default = 1;

     

       14
       14
       +
                 };

     

       15
       15
       +
               }

     

       16
       16
       +
             ];

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+18

lib/tests/modules/declare-bare-submodule.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) mkOption types;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options.bare-submodule = mkOption {

     

       7
       7
       +
           type = types.submoduleWith {

     

       8
       8
       +
             modules = [ ];

     

       9
       9
       +
             shorthandOnlyDefinesConfig = config.shorthandOnlyDefinesConfig;

     

       10
       10
       +
           };

     

       11
       11
       +
           default = {};

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         # config-dependent options: won't recommend, but useful for making this test parameterized

     

       15
       15
       +
         options.shorthandOnlyDefinesConfig = mkOption {

     

       16
       16
       +
           default = false;

     

       17
       17
       +
         };

     

       18
       18
       +
       }

+12

lib/tests/modules/declare-set.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         options.set = lib.mkOption {

     

       5
       5
       +
           default = { };

     

       6
       6
       +
           example = { a = 1; };

     

       7
       7
       +
           type = lib.types.attrsOf lib.types.int;

     

       8
       8
       +
           description = ''

     

       9
       9
       +
             Some descriptive text

     

       10
       10
       +
           '';

     

       11
       11
       +
         };

     

       12
       12
       +
       }

+4

lib/tests/modules/define-bare-submodule-values.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         bare-submodule.nested = 42;

     

       3
       3
       +
         bare-submodule.deep = 420;

     

       4
       4
       +
       }

+1

lib/tests/modules/define-shorthandOnlyDefinesConfig-true.nix

···

       1
       1
       +
       { shorthandOnlyDefinesConfig = true; }

+15 -7

lib/types.nix

···

       572
       572
        
             let

     

       573
       573
        
               inherit (lib.modules) evalModules;

     

       574
       574
        
       

     

       575
       575
       -
               coerce = unify: value: if isFunction value

     

       576
       576
       -
                 then setFunctionArgs (args: unify (value args)) (functionArgs value)

     

       577
       577
       -
                 else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);

     

       575
       575
       +
               shorthandToModule = if shorthandOnlyDefinesConfig == false

     

       576
       576
       +
                 then value: value

     

       577
       577
       +
                 else value: { config = value; };

     

       578
       578
        
       

     

       579
       579
        
               allModules = defs: imap1 (n: { value, file }:

     

       580
       580
       -
                 if isAttrs value || isFunction value then

     

       581
       581
       -
                   # Annotate the value with the location of its definition for better error messages

     

       582
       582
       -
                   coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value

     

       580
       580
       +
                 if isFunction value

     

       581
       581
       +
                 then setFunctionArgs

     

       582
       582
       +
                       (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (value args))

     

       583
       583
       +
                       (functionArgs value)

     

       584
       584
       +
                 else if isAttrs value

     

       585
       585
       +
                 then

     

       586
       586
       +
                   lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (shorthandToModule value)

     

       583
       587
        
                 else value

     

       584
       588
        
               ) defs;

     

       585
       589
        
       

     
···

       647
       651
        
                     then lhs.specialArgs // rhs.specialArgs

     

       648
       652
        
                     else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\"";

     

       649
       653
        
                   shorthandOnlyDefinesConfig =

     

       650
       650
       -
                     if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig

     

       654
       654
       +
                     if lhs.shorthandOnlyDefinesConfig == null

     

       655
       655
       +
                     then rhs.shorthandOnlyDefinesConfig

     

       656
       656
       +
                     else if rhs.shorthandOnlyDefinesConfig == null

     

       657
       657
       +
                     then lhs.shorthandOnlyDefinesConfig

     

       658
       658
       +
                     else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig

     

       651
       659
        
                     then lhs.shorthandOnlyDefinesConfig

     

       652
       660
        
                     else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values";

     

       653
       661
        
                 };

+6

maintainers/maintainer-list.nix

···

       1901
       1901
        
           githubId = 82591;

     

       1902
       1902
        
           name = "Carl Sverre";

     

       1903
       1903
        
         };

     

       1904
       1904
       +
         carpinchomug = {

     

       1905
       1905
       +
           email = "aki.suda@protonmail.com";

     

       1906
       1906
       +
           github = "carpinchomug";

     

       1907
       1907
       +
           githubId = 101536256;

     

       1908
       1908
       +
           name = "Akiyoshi Suda";

     

       1909
       1909
       +
         };

     

       1904
       1910
        
         cartr = {

     

       1905
       1911
        
           email = "carter.sande@duodecima.technology";

     

       1906
       1912
        
           github = "cartr";

+4 -3

nixos/doc/manual/development/option-declarations.section.md

···

       27
       27
        
       

     

       28
       28
        
       `type`

     

       29
       29
        
       

     

       30
       30
       -
       :   The type of the option (see [](#sec-option-types)). It may be

     

       31
       31
       -
           omitted, but that's not advisable since it may lead to errors that

     

       32
       32
       -
           are hard to diagnose.

     

       30
       30
       +
       :   The type of the option (see [](#sec-option-types)). This

     

       31
       31
       +
           argument is mandatory for nixpkgs modules. Setting this is highly

     

       32
       32
       +
           recommended for the sake of documentation and type checking. In case it is

     

       33
       33
       +
           not set, a fallback type with unspecified behavior is used.

     

       33
       34
        
       

     

       34
       35
        
       `default`

     

       35
       36

+5 -3

nixos/doc/manual/from_md/development/option-declarations.section.xml

···

       38
       38
        
             <listitem>

     

       39
       39
        
               <para>

     

       40
       40
        
                 The type of the option (see

     

       41
       41
       -
                 <xref linkend="sec-option-types" />). It may be omitted, but

     

       42
       42
       -
                 that’s not advisable since it may lead to errors that are hard

     

       43
       43
       -
                 to diagnose.

     

       41
       41
       +
                 <xref linkend="sec-option-types" />). This argument is

     

       42
       42
       +
                 mandatory for nixpkgs modules. Setting this is highly

     

       43
       43
       +
                 recommended for the sake of documentation and type checking.

     

       44
       44
       +
                 In case it is not set, a fallback type with unspecified

     

       45
       45
       +
                 behavior is used.

     

       44
       46
        
               </para>

     

       45
       47
        
             </listitem>

     

       46
       48
        
           </varlistentry>

+132

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

···

       571
       571
        
             </listitem>

     

       572
       572
        
             <listitem>

     

       573
       573
        
               <para>

     

       574
       574
       +
                 Services in the <literal>hadoop</literal> module previously

     

       575
       575
       +
                 set <literal>openFirewall</literal> to true by default. This

     

       576
       576
       +
                 has now been changed to false. Node definitions for multi-node

     

       577
       577
       +
                 clusters would need <literal>openFirewall = true;</literal> to

     

       578
       578
       +
                 be added to to hadoop services when upgrading from NixOS

     

       579
       579
       +
                 21.11.

     

       580
       580
       +
               </para>

     

       581
       581
       +
             </listitem>

     

       582
       582
       +
             <listitem>

     

       583
       583
       +
               <para>

     

       584
       584
       +
                 <literal>services.hadoop.yarn.nodemanager</literal> now uses

     

       585
       585
       +
                 cgroup-based CPU limit enforcement by default. Additionally,

     

       586
       586
       +
                 the option <literal>useCGroups</literal> was added to

     

       587
       587
       +
                 nodemanagers as an easy way to switch back to the old

     

       588
       588
       +
                 behavior.

     

       589
       589
       +
               </para>

     

       590
       590
       +
             </listitem>

     

       591
       591
       +
             <listitem>

     

       592
       592
       +
               <para>

     

       574
       593
        
                 The <literal>wafHook</literal> hook now honors

     

       575
       594
        
                 <literal>NIX_BUILD_CORES</literal> when

     

       576
       595
        
                 <literal>enableParallelBuilding</literal> is not set

     
···

       1175
       1194
        
             </listitem>

     

       1176
       1195
        
             <listitem>

     

       1177
       1196
        
               <para>

     

       1197
       1197
       +
                 Some improvements have been made to the

     

       1198
       1198
       +
                 <literal>hadoop</literal> module:

     

       1199
       1199
       +
               </para>

     

       1200
       1200
       +
               <itemizedlist spacing="compact">

     

       1201
       1201
       +
                 <listitem>

     

       1202
       1202
       +
                   <para>

     

       1203
       1203
       +
                     A <literal>gatewayRole</literal> option has been added,

     

       1204
       1204
       +
                     for deploying hadoop cluster configuration files to a node

     

       1205
       1205
       +
                     that does not have any active services

     

       1206
       1206
       +
                   </para>

     

       1207
       1207
       +
                 </listitem>

     

       1208
       1208
       +
                 <listitem>

     

       1209
       1209
       +
                   <para>

     

       1210
       1210
       +
                     Support for older versions of hadoop have been added to

     

       1211
       1211
       +
                     the module

     

       1212
       1212
       +
                   </para>

     

       1213
       1213
       +
                 </listitem>

     

       1214
       1214
       +
                 <listitem>

     

       1215
       1215
       +
                   <para>

     

       1216
       1216
       +
                     Overriding and extending site XML files has been made

     

       1217
       1217
       +
                     easier

     

       1218
       1218
       +
                   </para>

     

       1219
       1219
       +
                 </listitem>

     

       1220
       1220
       +
               </itemizedlist>

     

       1221
       1221
       +
             </listitem>

     

       1222
       1222
       +
             <listitem>

     

       1223
       1223
       +
               <para>

     

       1178
       1224
        
                 If you are using Wayland you can choose to use the Ozone

     

       1179
       1225
        
                 Wayland support in Chrome and several Electron apps by setting

     

       1180
       1226
        
                 the environment variable <literal>NIXOS_OZONE_WL=1</literal>

     
···

       1288
       1334
        
             </listitem>

     

       1289
       1335
        
             <listitem>

     

       1290
       1336
        
               <para>

     

       1337
       1337
       +
                 ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which

     

       1338
       1338
       +
                 introduces some breaking changes:

     

       1339
       1339
       +
               </para>

     

       1340
       1340
       +
               <itemizedlist spacing="compact">

     

       1341
       1341
       +
                 <listitem>

     

       1342
       1342
       +
                   <para>

     

       1343
       1343
       +
                     If you are relying on the SQLite images, update your

     

       1344
       1344
       +
                     Docker Pull commands as follows:

     

       1345
       1345
       +
                   </para>

     

       1346
       1346
       +
                   <itemizedlist spacing="compact">

     

       1347
       1347
       +
                     <listitem>

     

       1348
       1348
       +
                       <para>

     

       1349
       1349
       +
                         <literal>docker pull oryd/kratos:{version}</literal>

     

       1350
       1350
       +
                       </para>

     

       1351
       1351
       +
                     </listitem>

     

       1352
       1352
       +
                   </itemizedlist>

     

       1353
       1353
       +
                 </listitem>

     

       1354
       1354
       +
                 <listitem>

     

       1355
       1355
       +
                   <para>

     

       1356
       1356
       +
                     Additionally, all passwords now have to be at least 8

     

       1357
       1357
       +
                     characters long.

     

       1358
       1358
       +
                   </para>

     

       1359
       1359
       +
                 </listitem>

     

       1360
       1360
       +
                 <listitem>

     

       1361
       1361
       +
                   <para>

     

       1362
       1362
       +
                     For more details, see:

     

       1363
       1363
       +
                   </para>

     

       1364
       1364
       +
                   <itemizedlist spacing="compact">

     

       1365
       1365
       +
                     <listitem>

     

       1366
       1366
       +
                       <para>

     

       1367
       1367
       +
                         <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1">Release

     

       1368
       1368
       +
                         Notes for v0.8.1-alpha-1</link>

     

       1369
       1369
       +
                       </para>

     

       1370
       1370
       +
                     </listitem>

     

       1371
       1371
       +
                     <listitem>

     

       1372
       1372
       +
                       <para>

     

       1373
       1373
       +
                         <link xlink:href="https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1">Release

     

       1374
       1374
       +
                         Notes for v0.8.2-alpha-1</link>

     

       1375
       1375
       +
                       </para>

     

       1376
       1376
       +
                     </listitem>

     

       1377
       1377
       +
                   </itemizedlist>

     

       1378
       1378
       +
                 </listitem>

     

       1379
       1379
       +
               </itemizedlist>

     

       1380
       1380
       +
             </listitem>

     

       1381
       1381
       +
             <listitem>

     

       1382
       1382
       +
               <para>

     

       1291
       1383
        
                 <literal>fetchFromSourcehut</literal> now allows fetching

     

       1292
       1384
        
                 repositories recursively using <literal>fetchgit</literal> or

     

       1293
       1385
        
                 <literal>fetchhg</literal> if the argument

     
···

       1455
       1547
        
                 default. It will automatically be enabled through services and

     

       1456
       1548
        
                 desktop environments as needed.

     

       1457
       1549
        
               </para>

     

       1550
       1550
       +
             </listitem>

     

       1551
       1551
       +
             <listitem>

     

       1552
       1552
       +
               <para>

     

       1553
       1553
       +
                 The <literal>hadoop</literal> package has added support for

     

       1554
       1554
       +
                 <literal>aarch64-linux</literal> and

     

       1555
       1555
       +
                 <literal>aarch64-darwin</literal> as of 3.3.1

     

       1556
       1556
       +
                 (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>).

     

       1557
       1557
       +
               </para>

     

       1558
       1558
       +
             </listitem>

     

       1559
       1559
       +
             <listitem>

     

       1560
       1560
       +
               <para>

     

       1561
       1561
       +
                 The <literal>R</literal> package now builds again on

     

       1562
       1562
       +
                 <literal>aarch64-darwin</literal>

     

       1563
       1563
       +
                 (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>).

     

       1564
       1564
       +
               </para>

     

       1565
       1565
       +
             </listitem>

     

       1566
       1566
       +
             <listitem>

     

       1567
       1567
       +
               <para>

     

       1568
       1568
       +
                 The <literal>spark3</literal> package has been updated from

     

       1569
       1569
       +
                 3.1.2 to 3.2.1

     

       1570
       1570
       +
                 (<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>):

     

       1571
       1571
       +
               </para>

     

       1572
       1572
       +
               <itemizedlist spacing="compact">

     

       1573
       1573
       +
                 <listitem>

     

       1574
       1574
       +
                   <para>

     

       1575
       1575
       +
                     Testing has been enabled for

     

       1576
       1576
       +
                     <literal>aarch64-linux</literal> in addition to

     

       1577
       1577
       +
                     <literal>x86_64-linux</literal>.

     

       1578
       1578
       +
                   </para>

     

       1579
       1579
       +
                 </listitem>

     

       1580
       1580
       +
                 <listitem>

     

       1581
       1581
       +
                   <para>

     

       1582
       1582
       +
                     The <literal>spark3</literal> package is now usable on

     

       1583
       1583
       +
                     <literal>aarch64-darwin</literal> as a result of

     

       1584
       1584
       +
                     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>

     

       1585
       1585
       +
                     and

     

       1586
       1586
       +
                     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>.

     

       1587
       1587
       +
                   </para>

     

       1588
       1588
       +
                 </listitem>

     

       1589
       1589
       +
               </itemizedlist>

     

       1458
       1590
        
             </listitem>

     

       1459
       1591
        
           </itemizedlist>

     

       1460
       1592
        
         </section>

+30

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

···

       244
       244
        
       

     

       245
       245
        
       - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs.

     

       246
       246
        
       

     

       247
       247
       +
       - Services in the `hadoop` module previously set `openFirewall` to true by default.

     

       248
       248
       +
         This has now been changed to false. Node definitions for multi-node clusters would need

     

       249
       249
       +
         `openFirewall = true;` to be added to to hadoop services when upgrading from NixOS 21.11.

     

       250
       250
       +
       

     

       251
       251
       +
       - `services.hadoop.yarn.nodemanager` now uses cgroup-based CPU limit enforcement by default.

     

       252
       252
       +
         Additionally, the option `useCGroups` was added to nodemanagers as an easy way to switch

     

       253
       253
       +
         back to the old behavior.

     

       254
       254
       +
       

     

       247
       255
        
       - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.

     

       248
       256
        
       

     

       249
       257
        
       - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.

     
···

       436
       444
        
       

     

       437
       445
        
       - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.

     

       438
       446
        
       

     

       447
       447
       +
       - Some improvements have been made to the `hadoop` module:

     

       448
       448
       +
         - A `gatewayRole` option has been added, for deploying hadoop cluster configuration files to a node that does not have any active services

     

       449
       449
       +
         - Support for older versions of hadoop have been added to the module

     

       450
       450
       +
         - Overriding and extending site XML files has been made easier

     

       451
       451
       +
       

     

       439
       452
        
       - If you are using Wayland you can choose to use the Ozone Wayland support

     

       440
       453
        
         in Chrome and several Electron apps by setting the environment variable

     

       441
       454
        
         `NIXOS_OZONE_WL=1` (for example via

     
···

       482
       495
        
       

     

       483
       496
        
       - `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.

     

       484
       497
        
       

     

       498
       498
       +
       - ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes:

     

       499
       499
       +
         - If you are relying on the SQLite images, update your Docker Pull commands as follows:

     

       500
       500
       +
           - `docker pull oryd/kratos:{version}`

     

       501
       501
       +
         - Additionally, all passwords now have to be at least 8 characters long.

     

       502
       502
       +
         - For more details, see:

     

       503
       503
       +
           - [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1)

     

       504
       504
       +
           - [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1)

     

       505
       505
       +
       

     

       485
       506
        
       - `fetchFromSourcehut` now allows fetching repositories recursively

     

       486
       507
        
         using `fetchgit` or `fetchhg` if the argument `fetchSubmodules`

     

       487
       508
        
         is set to `true`.

     
···

       536
       557
        
       - `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`.

     

       537
       558
        
       

     

       538
       559
        
       - The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.

     

       560
       560
       +
       

     

       561
       561
       +
       - The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).

     

       562
       562
       +
       

     

       563
       563
       +
       - The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).

     

       564
       564
       +
       

     

       565
       565
       +
       - The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):

     

       566
       566
       +
       

     

       567
       567
       +
         - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.

     

       568
       568
       +
         - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992).

     

       539
       569
        
       

     

       540
       570
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

+8 -1

nixos/lib/make-options-doc/mergeJSON.py

···

       66
       66
        
               elif ov is not None or cur.get(ok, None) is None:

     

       67
       67
        
                   cur[ok] = ov

     

       68
       68
        
       

     

       69
       69
       +
       severity = "error" if warningsAreErrors else "warning"

     

       70
       70
       +
       

     

       69
       71
        
       # check that every option has a description

     

       70
       72
        
       hasWarnings = False

     

       71
       73
        
       for (k, v) in options.items():

     

       72
       74
        
           if v.value.get('description', None) is None:

     

       73
       73
       -
               severity = "error" if warningsAreErrors else "warning"

     

       74
       75
        
               hasWarnings = True

     

       75
       76
        
               print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr)

     

       76
       77
        
               v.value['description'] = "This option has no description."

     

       78
       78
       +
           if v.value.get('type', "unspecified") == "unspecified":

     

       79
       79
       +
               hasWarnings = True

     

       80
       80
       +
               print(

     

       81
       81
       +
                   f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " +

     

       82
       82
       +
                   "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr)

     

       83
       83
       +
       

     

       77
       84
        
       if hasWarnings and warningsAreErrors:

     

       78
       85
        
           print(

     

       79
       86
        
               "\x1b[1;31m" +

+202

nixos/lib/systemd-lib.nix

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.systemd;

     

       7
       7
        
         lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";

     

       8
       8
       +
         systemd = cfg.package;

     

       8
       9
        
       in rec {

     

       9
       10
        
       

     

       10
       11
        
         shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);

     
···

       235
       236
        
             ''}

     

       236
       237
        
           ''; # */

     

       237
       238
        
       

     

       239
       239
       +
         makeJobScript = name: text:

     

       240
       240
       +
           let

     

       241
       241
       +
             scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name);

     

       242
       242
       +
             out = (pkgs.writeShellScriptBin scriptName ''

     

       243
       243
       +
               set -e

     

       244
       244
       +
               ${text}

     

       245
       245
       +
             '').overrideAttrs (_: {

     

       246
       246
       +
               # The derivation name is different from the script file name

     

       247
       247
       +
               # to keep the script file name short to avoid cluttering logs.

     

       248
       248
       +
               name = "unit-script-${scriptName}";

     

       249
       249
       +
             });

     

       250
       250
       +
           in "${out}/bin/${scriptName}";

     

       251
       251
       +
       

     

       252
       252
       +
         unitConfig = { config, options, ... }: {

     

       253
       253
       +
           config = {

     

       254
       254
       +
             unitConfig =

     

       255
       255
       +
               optionalAttrs (config.requires != [])

     

       256
       256
       +
                 { Requires = toString config.requires; }

     

       257
       257
       +
               // optionalAttrs (config.wants != [])

     

       258
       258
       +
                 { Wants = toString config.wants; }

     

       259
       259
       +
               // optionalAttrs (config.after != [])

     

       260
       260
       +
                 { After = toString config.after; }

     

       261
       261
       +
               // optionalAttrs (config.before != [])

     

       262
       262
       +
                 { Before = toString config.before; }

     

       263
       263
       +
               // optionalAttrs (config.bindsTo != [])

     

       264
       264
       +
                 { BindsTo = toString config.bindsTo; }

     

       265
       265
       +
               // optionalAttrs (config.partOf != [])

     

       266
       266
       +
                 { PartOf = toString config.partOf; }

     

       267
       267
       +
               // optionalAttrs (config.conflicts != [])

     

       268
       268
       +
                 { Conflicts = toString config.conflicts; }

     

       269
       269
       +
               // optionalAttrs (config.requisite != [])

     

       270
       270
       +
                 { Requisite = toString config.requisite; }

     

       271
       271
       +
               // optionalAttrs (config.restartTriggers != [])

     

       272
       272
       +
                 { X-Restart-Triggers = toString config.restartTriggers; }

     

       273
       273
       +
               // optionalAttrs (config.reloadTriggers != [])

     

       274
       274
       +
                 { X-Reload-Triggers = toString config.reloadTriggers; }

     

       275
       275
       +
               // optionalAttrs (config.description != "") {

     

       276
       276
       +
                 Description = config.description; }

     

       277
       277
       +
               // optionalAttrs (config.documentation != []) {

     

       278
       278
       +
                 Documentation = toString config.documentation; }

     

       279
       279
       +
               // optionalAttrs (config.onFailure != []) {

     

       280
       280
       +
                 OnFailure = toString config.onFailure; }

     

       281
       281
       +
               // optionalAttrs (options.startLimitIntervalSec.isDefined) {

     

       282
       282
       +
                 StartLimitIntervalSec = toString config.startLimitIntervalSec;

     

       283
       283
       +
               } // optionalAttrs (options.startLimitBurst.isDefined) {

     

       284
       284
       +
                 StartLimitBurst = toString config.startLimitBurst;

     

       285
       285
       +
               };

     

       286
       286
       +
           };

     

       287
       287
       +
         };

     

       288
       288
       +
       

     

       289
       289
       +
         serviceConfig = { name, config, ... }: {

     

       290
       290
       +
           config = mkMerge

     

       291
       291
       +
             [ { # Default path for systemd services.  Should be quite minimal.

     

       292
       292
       +
                 path = mkAfter

     

       293
       293
       +
                   [ pkgs.coreutils

     

       294
       294
       +
                     pkgs.findutils

     

       295
       295
       +
                     pkgs.gnugrep

     

       296
       296
       +
                     pkgs.gnused

     

       297
       297
       +
                     systemd

     

       298
       298
       +
                   ];

     

       299
       299
       +
                 environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";

     

       300
       300
       +
               }

     

       301
       301
       +
               (mkIf (config.preStart != "")

     

       302
       302
       +
                 { serviceConfig.ExecStartPre =

     

       303
       303
       +
                     [ (makeJobScript "${name}-pre-start" config.preStart) ];

     

       304
       304
       +
                 })

     

       305
       305
       +
               (mkIf (config.script != "")

     

       306
       306
       +
                 { serviceConfig.ExecStart =

     

       307
       307
       +
                     makeJobScript "${name}-start" config.script + " " + config.scriptArgs;

     

       308
       308
       +
                 })

     

       309
       309
       +
               (mkIf (config.postStart != "")

     

       310
       310
       +
                 { serviceConfig.ExecStartPost =

     

       311
       311
       +
                     [ (makeJobScript "${name}-post-start" config.postStart) ];

     

       312
       312
       +
                 })

     

       313
       313
       +
               (mkIf (config.reload != "")

     

       314
       314
       +
                 { serviceConfig.ExecReload =

     

       315
       315
       +
                     makeJobScript "${name}-reload" config.reload;

     

       316
       316
       +
                 })

     

       317
       317
       +
               (mkIf (config.preStop != "")

     

       318
       318
       +
                 { serviceConfig.ExecStop =

     

       319
       319
       +
                     makeJobScript "${name}-pre-stop" config.preStop;

     

       320
       320
       +
                 })

     

       321
       321
       +
               (mkIf (config.postStop != "")

     

       322
       322
       +
                 { serviceConfig.ExecStopPost =

     

       323
       323
       +
                     makeJobScript "${name}-post-stop" config.postStop;

     

       324
       324
       +
                 })

     

       325
       325
       +
             ];

     

       326
       326
       +
         };

     

       327
       327
       +
       

     

       328
       328
       +
         mountConfig = { config, ... }: {

     

       329
       329
       +
           config = {

     

       330
       330
       +
             mountConfig =

     

       331
       331
       +
               { What = config.what;

     

       332
       332
       +
                 Where = config.where;

     

       333
       333
       +
               } // optionalAttrs (config.type != "") {

     

       334
       334
       +
                 Type = config.type;

     

       335
       335
       +
               } // optionalAttrs (config.options != "") {

     

       336
       336
       +
                 Options = config.options;

     

       337
       337
       +
               };

     

       338
       338
       +
           };

     

       339
       339
       +
         };

     

       340
       340
       +
       

     

       341
       341
       +
         automountConfig = { config, ... }: {

     

       342
       342
       +
           config = {

     

       343
       343
       +
             automountConfig =

     

       344
       344
       +
               { Where = config.where;

     

       345
       345
       +
               };

     

       346
       346
       +
           };

     

       347
       347
       +
         };

     

       348
       348
       +
       

     

       349
       349
       +
         commonUnitText = def: ''

     

       350
       350
       +
             [Unit]

     

       351
       351
       +
             ${attrsToSection def.unitConfig}

     

       352
       352
       +
           '';

     

       353
       353
       +
       

     

       354
       354
       +
         targetToUnit = name: def:

     

       355
       355
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       356
       356
       +
             text =

     

       357
       357
       +
               ''

     

       358
       358
       +
                 [Unit]

     

       359
       359
       +
                 ${attrsToSection def.unitConfig}

     

       360
       360
       +
               '';

     

       361
       361
       +
           };

     

       362
       362
       +
       

     

       363
       363
       +
         serviceToUnit = name: def:

     

       364
       364
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       365
       365
       +
             text = commonUnitText def +

     

       366
       366
       +
               ''

     

       367
       367
       +
                 [Service]

     

       368
       368
       +
                 ${let env = cfg.globalEnvironment // def.environment;

     

       369
       369
       +
                   in concatMapStrings (n:

     

       370
       370
       +
                     let s = optionalString (env.${n} != null)

     

       371
       371
       +
                       "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";

     

       372
       372
       +
                     # systemd max line length is now 1MiB

     

       373
       373
       +
                     # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af

     

       374
       374
       +
                     in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}

     

       375
       375
       +
                 ${if def.reloadIfChanged then ''

     

       376
       376
       +
                   X-ReloadIfChanged=true

     

       377
       377
       +
                 '' else if !def.restartIfChanged then ''

     

       378
       378
       +
                   X-RestartIfChanged=false

     

       379
       379
       +
                 '' else ""}

     

       380
       380
       +
                 ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}

     

       381
       381
       +
                 ${attrsToSection def.serviceConfig}

     

       382
       382
       +
               '';

     

       383
       383
       +
           };

     

       384
       384
       +
       

     

       385
       385
       +
         socketToUnit = name: def:

     

       386
       386
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       387
       387
       +
             text = commonUnitText def +

     

       388
       388
       +
               ''

     

       389
       389
       +
                 [Socket]

     

       390
       390
       +
                 ${attrsToSection def.socketConfig}

     

       391
       391
       +
                 ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}

     

       392
       392
       +
                 ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)}

     

       393
       393
       +
               '';

     

       394
       394
       +
           };

     

       395
       395
       +
       

     

       396
       396
       +
         timerToUnit = name: def:

     

       397
       397
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       398
       398
       +
             text = commonUnitText def +

     

       399
       399
       +
               ''

     

       400
       400
       +
                 [Timer]

     

       401
       401
       +
                 ${attrsToSection def.timerConfig}

     

       402
       402
       +
               '';

     

       403
       403
       +
           };

     

       404
       404
       +
       

     

       405
       405
       +
         pathToUnit = name: def:

     

       406
       406
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       407
       407
       +
             text = commonUnitText def +

     

       408
       408
       +
               ''

     

       409
       409
       +
                 [Path]

     

       410
       410
       +
                 ${attrsToSection def.pathConfig}

     

       411
       411
       +
               '';

     

       412
       412
       +
           };

     

       413
       413
       +
       

     

       414
       414
       +
         mountToUnit = name: def:

     

       415
       415
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       416
       416
       +
             text = commonUnitText def +

     

       417
       417
       +
               ''

     

       418
       418
       +
                 [Mount]

     

       419
       419
       +
                 ${attrsToSection def.mountConfig}

     

       420
       420
       +
               '';

     

       421
       421
       +
           };

     

       422
       422
       +
       

     

       423
       423
       +
         automountToUnit = name: def:

     

       424
       424
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       425
       425
       +
             text = commonUnitText def +

     

       426
       426
       +
               ''

     

       427
       427
       +
                 [Automount]

     

       428
       428
       +
                 ${attrsToSection def.automountConfig}

     

       429
       429
       +
               '';

     

       430
       430
       +
           };

     

       431
       431
       +
       

     

       432
       432
       +
         sliceToUnit = name: def:

     

       433
       433
       +
           { inherit (def) aliases wantedBy requiredBy enable;

     

       434
       434
       +
             text = commonUnitText def +

     

       435
       435
       +
               ''

     

       436
       436
       +
                 [Slice]

     

       437
       437
       +
                 ${attrsToSection def.sliceConfig}

     

       438
       438
       +
               '';

     

       439
       439
       +
           };

     

       238
       440
        
       }

+5 -1

nixos/modules/misc/locate.nix

···

       183
       183
        
       

     

       184
       184
        
           pruneNames = mkOption {

     

       185
       185
        
             type = listOf str;

     

       186
       186
       -
             default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ];

     

       186
       186
       +
             default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ];

     

       187
       187
       +
             defaultText = literalDocBook ''

     

       188
       188
       +
               <literal>[ ".bzr" ".cache" ".git" ".hg" ".svn" ]</literal>, if

     

       189
       189
       +
               supported by the locate implementation (i.e. mlocate or plocate).

     

       190
       190
       +
             '';

     

       187
       191
        
             description = ''

     

       188
       192
        
               Directory components which should exclude paths containing them from indexing

     

       189
       193
        
             '';

+5 -1

nixos/modules/misc/version.nix

···

       8
       8
        
           concatStringsSep mapAttrsToList toLower

     

       9
       9
        
           literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;

     

       10
       10
        
       

     

       11
       11
       +
         needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s;

     

       12
       12
       +
         escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"'';

     

       11
       13
        
         attrsToText = attrs:

     

       12
       12
       -
           concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs);

     

       14
       14
       +
           concatStringsSep "\n" (

     

       15
       15
       +
             mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs

     

       16
       16
       +
           );

     

       13
       17
        
       

     

       14
       18
        
       in

     

       15
       19
        
       {

+11 -11

nixos/modules/services/cluster/hadoop/conf.nix

···

       1
       1
        
       { cfg, pkgs, lib }:

     

       2
       2
        
       let

     

       3
       3
       -
         propertyXml = name: value: ''

     

       3
       3
       +
         propertyXml = name: value: lib.optionalString (value != null) ''

     

       4
       4
        
           <property>

     

       5
       5
        
             <name>${name}</name>

     

       6
       6
        
             <value>${builtins.toString value}</value>

     
···

       29
       29
        
           export HADOOP_LOG_DIR=/tmp/hadoop/$USER

     

       30
       30
        
         '';

     

       31
       31
        
       in

     

       32
       32
       -
       pkgs.runCommand "hadoop-conf" {} ''

     

       32
       32
       +
       pkgs.runCommand "hadoop-conf" {} (with cfg; ''

     

       33
       33
        
         mkdir -p $out/

     

       34
       34
       -
         cp ${siteXml "core-site.xml" cfg.coreSite}/* $out/

     

       35
       35
       -
         cp ${siteXml "hdfs-site.xml" cfg.hdfsSite}/* $out/

     

       36
       36
       -
         cp ${siteXml "mapred-site.xml" cfg.mapredSite}/* $out/

     

       37
       37
       -
         cp ${siteXml "yarn-site.xml" cfg.yarnSite}/* $out/

     

       38
       38
       -
         cp ${siteXml "httpfs-site.xml" cfg.httpfsSite}/* $out/

     

       39
       39
       -
         cp ${cfgFile "container-executor.cfg" cfg.containerExecutorCfg}/* $out/

     

       34
       34
       +
         cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/

     

       35
       35
       +
         cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/

     

       36
       36
       +
         cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/

     

       37
       37
       +
         cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/

     

       38
       38
       +
         cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/

     

       39
       39
       +
         cp ${cfgFile "container-executor.cfg" containerExecutorCfg}/* $out/

     

       40
       40
        
         cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/

     

       41
       41
        
         cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/

     

       42
       42
       -
         cp ${cfg.log4jProperties} $out/log4j.properties

     

       43
       43
       -
         ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") cfg.extraConfDirs}

     

       44
       44
       -
       ''

     

       42
       42
       +
         cp ${log4jProperties} $out/log4j.properties

     

       43
       43
       +
         ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs}

     

       44
       44
       +
       '')

+72 -25

nixos/modules/services/cluster/hadoop/default.nix

···

       21
       21
        
               <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/core-default.xml"/>

     

       22
       22
        
             '';

     

       23
       23
        
           };

     

       24
       24
       +
           coreSiteInternal = mkOption {

     

       25
       25
       +
             default = {};

     

       26
       26
       +
             type = types.attrsOf types.anything;

     

       27
       27
       +
             internal = true;

     

       28
       28
       +
             description = ''

     

       29
       29
       +
               Internal option to add configs to core-site.xml based on module options

     

       30
       30
       +
             '';

     

       31
       31
       +
           };

     

       24
       32
        
       

     

       25
       25
       -
           hdfsSite = mkOption {

     

       33
       33
       +
           hdfsSiteDefault = mkOption {

     

       26
       34
        
             default = {

     

       27
       35
        
               "dfs.namenode.rpc-bind-host" = "0.0.0.0";

     

       36
       36
       +
               "dfs.namenode.http-address" = "0.0.0.0:9870";

     

       37
       37
       +
               "dfs.namenode.servicerpc-bind-host" = "0.0.0.0";

     

       38
       38
       +
               "dfs.namenode.http-bind-host" = "0.0.0.0";

     

       28
       39
        
             };

     

       29
       40
        
             type = types.attrsOf types.anything;

     

       41
       41
       +
             description = ''

     

       42
       42
       +
               Default options for hdfs-site.xml

     

       43
       43
       +
             '';

     

       44
       44
       +
           };

     

       45
       45
       +
           hdfsSite = mkOption {

     

       46
       46
       +
             default = {};

     

       47
       47
       +
             type = types.attrsOf types.anything;

     

       30
       48
        
             example = literalExpression ''

     

       31
       49
        
               {

     

       32
       50
        
                 "dfs.nameservices" = "namenode1";

     

       33
       51
        
               }

     

       34
       52
        
             '';

     

       35
       53
        
             description = ''

     

       36
       36
       -
               Hadoop hdfs-site.xml definition

     

       54
       54
       +
               Additional options and overrides for hdfs-site.xml

     

       37
       55
        
               <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>

     

       38
       56
        
             '';

     

       39
       57
        
           };

     

       58
       58
       +
           hdfsSiteInternal = mkOption {

     

       59
       59
       +
             default = {};

     

       60
       60
       +
             type = types.attrsOf types.anything;

     

       61
       61
       +
             internal = true;

     

       62
       62
       +
             description = ''

     

       63
       63
       +
               Internal option to add configs to hdfs-site.xml based on module options

     

       64
       64
       +
             '';

     

       65
       65
       +
           };

     

       40
       66
        
       

     

       41
       41
       -
           mapredSite = mkOption {

     

       67
       67
       +
           mapredSiteDefault = mkOption {

     

       42
       68
        
             default = {

     

       43
       69
        
               "mapreduce.framework.name" = "yarn";

     

       44
       70
        
               "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}";

     
···

       54
       80
        
               }

     

       55
       81
        
             '';

     

       56
       82
        
             type = types.attrsOf types.anything;

     

       83
       83
       +
             description = ''

     

       84
       84
       +
               Default options for mapred-site.xml

     

       85
       85
       +
             '';

     

       86
       86
       +
           };

     

       87
       87
       +
           mapredSite = mkOption {

     

       88
       88
       +
             default = {};

     

       89
       89
       +
             type = types.attrsOf types.anything;

     

       57
       90
        
             example = literalExpression ''

     

       58
       58
       -
               options.services.hadoop.mapredSite.default // {

     

       91
       91
       +
               {

     

       59
       92
        
                 "mapreduce.map.java.opts" = "-Xmx900m -XX:+UseParallelGC";

     

       60
       93
        
               }

     

       61
       94
        
             '';

     

       62
       95
        
             description = ''

     

       63
       63
       -
               Hadoop mapred-site.xml definition

     

       96
       96
       +
               Additional options and overrides for mapred-site.xml

     

       64
       97
        
               <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>

     

       65
       98
        
             '';

     

       66
       99
        
           };

     

       67
       100
        
       

     

       68
       68
       -
           yarnSite = mkOption {

     

       101
       101
       +
           yarnSiteDefault = mkOption {

     

       69
       102
        
             default = {

     

       70
       103
        
               "yarn.nodemanager.admin-env" = "PATH=$PATH";

     

       71
       104
        
               "yarn.nodemanager.aux-services" = "mapreduce_shuffle";

     
···

       77
       110
        
               "yarn.nodemanager.linux-container-executor.path" = "/run/wrappers/yarn-nodemanager/bin/container-executor";

     

       78
       111
        
               "yarn.nodemanager.log-dirs" = "/var/log/hadoop/yarn/nodemanager";

     

       79
       112
        
               "yarn.resourcemanager.bind-host" = "0.0.0.0";

     

       80
       80
       -
               "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler";

     

       113
       113
       +
               "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler";

     

       81
       114
        
             };

     

       82
       115
        
             type = types.attrsOf types.anything;

     

       116
       116
       +
             description = ''

     

       117
       117
       +
               Default options for yarn-site.xml

     

       118
       118
       +
             '';

     

       119
       119
       +
           };

     

       120
       120
       +
           yarnSite = mkOption {

     

       121
       121
       +
             default = {};

     

       122
       122
       +
             type = types.attrsOf types.anything;

     

       83
       123
        
             example = literalExpression ''

     

       84
       84
       -
               options.services.hadoop.yarnSite.default // {

     

       124
       124
       +
               {

     

       85
       125
        
                 "yarn.resourcemanager.hostname" = "''${config.networking.hostName}";

     

       86
       126
        
               }

     

       87
       127
        
             '';

     

       88
       128
        
             description = ''

     

       89
       89
       -
               Hadoop yarn-site.xml definition

     

       129
       129
       +
               Additional options and overrides for yarn-site.xml

     

       90
       130
        
               <link xlink:href="https://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>

     

       91
       131
        
             '';

     

       92
       132
        
           };

     

       133
       133
       +
           yarnSiteInternal = mkOption {

     

       134
       134
       +
             default = {};

     

       135
       135
       +
             type = types.attrsOf types.anything;

     

       136
       136
       +
             internal = true;

     

       137
       137
       +
             description = ''

     

       138
       138
       +
               Internal option to add configs to yarn-site.xml based on module options

     

       139
       139
       +
             '';

     

       140
       140
       +
           };

     

       93
       141
        
       

     

       94
       142
        
           httpfsSite = mkOption {

     

       95
       143
        
             default = { };

     
···

       123
       171
        
               "yarn.nodemanager.linux-container-executor.group"="hadoop";

     

       124
       172
        
               "min.user.id"=1000;

     

       125
       173
        
               "feature.terminal.enabled"=1;

     

       174
       174
       +
               "feature.mount-cgroup.enabled" = 1;

     

       126
       175
        
             };

     

       127
       176
        
             type = types.attrsOf types.anything;

     

       128
       177
        
             example = literalExpression ''

     
···

       148
       197
        
             description = "Directories containing additional config files to be added to HADOOP_CONF_DIR";

     

       149
       198
        
           };

     

       150
       199
        
       

     

       200
       200
       +
           gatewayRole.enable = mkEnableOption "gateway role for deploying hadoop configs";

     

       201
       201
       +
       

     

       151
       202
        
           package = mkOption {

     

       152
       203
        
             type = types.package;

     

       153
       204
        
             default = pkgs.hadoop;

     
···

       157
       208
        
         };

     

       158
       209
        
       

     

       159
       210
        
       

     

       160
       160
       -
         config = mkMerge [

     

       161
       161
       -
           (mkIf (builtins.hasAttr "yarn" config.users.users ||

     

       162
       162
       -
                  builtins.hasAttr "hdfs" config.users.users ||

     

       163
       163
       -
                  builtins.hasAttr "httpfs" config.users.users) {

     

       164
       164
       -
             users.groups.hadoop = {

     

       165
       165
       -
               gid = config.ids.gids.hadoop;

     

       166
       166
       -
             };

     

       167
       167
       -
             environment = {

     

       168
       168
       -
               systemPackages = [ cfg.package ];

     

       169
       169
       -
               etc."hadoop-conf".source = let

     

       170
       170
       -
                 hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";

     

       171
       171
       -
               in "${hadoopConf}";

     

       172
       172
       -
             };

     

       173
       173
       -
           })

     

       174
       174
       -
       

     

       175
       175
       -
         ];

     

       211
       211
       +
         config = mkIf cfg.gatewayRole.enable {

     

       212
       212
       +
           users.groups.hadoop = {

     

       213
       213
       +
             gid = config.ids.gids.hadoop;

     

       214
       214
       +
           };

     

       215
       215
       +
           environment = {

     

       216
       216
       +
             systemPackages = [ cfg.package ];

     

       217
       217
       +
             etc."hadoop-conf".source = let

     

       218
       218
       +
               hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";

     

       219
       219
       +
             in "${hadoopConf}";

     

       220
       220
       +
             variables.HADOOP_CONF_DIR = "/etc/hadoop-conf/";

     

       221
       221
       +
           };

     

       222
       222
       +
         };

     

       176
       223
        
       }

+147 -146

nixos/modules/services/cluster/hadoop/hdfs.nix

···

       1
       1
       -
       { config, lib, pkgs, ...}:

     

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
        
       with lib;

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.hadoop;

     

       5
       5
       +
       

     

       6
       6
       +
         # Config files for hadoop services

     

       5
       7
        
         hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/";

     

       6
       6
       -
         restartIfChanged  = mkOption {

     

       7
       7
       -
           type = types.bool;

     

       8
       8
       -
           description = ''

     

       9
       9
       -
             Automatically restart the service on config change.

     

       10
       10
       -
             This can be set to false to defer restarts on clusters running critical applications.

     

       11
       11
       -
             Please consider the security implications of inadvertently running an older version,

     

       12
       12
       -
             and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.

     

       13
       13
       -
           '';

     

       14
       14
       -
           default = false;

     

       15
       15
       -
         };

     

       8
       8
       +
       

     

       9
       9
       +
         # Generator for HDFS service options

     

       10
       10
       +
         hadoopServiceOption = { serviceName, firewallOption ? true, extraOpts ? null }: {

     

       11
       11
       +
           enable = mkEnableOption serviceName;

     

       12
       12
       +
           restartIfChanged = mkOption {

     

       13
       13
       +
             type = types.bool;

     

       14
       14
       +
             description = ''

     

       15
       15
       +
               Automatically restart the service on config change.

     

       16
       16
       +
               This can be set to false to defer restarts on clusters running critical applications.

     

       17
       17
       +
               Please consider the security implications of inadvertently running an older version,

     

       18
       18
       +
               and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.

     

       19
       19
       +
             '';

     

       20
       20
       +
             default = false;

     

       21
       21
       +
           };

     

       22
       22
       +
           extraFlags = mkOption{

     

       23
       23
       +
             type = with types; listOf str;

     

       24
       24
       +
             default = [];

     

       25
       25
       +
             description = "Extra command line flags to pass to ${serviceName}";

     

       26
       26
       +
             example = [

     

       27
       27
       +
               "-Dcom.sun.management.jmxremote"

     

       28
       28
       +
               "-Dcom.sun.management.jmxremote.port=8010"

     

       29
       29
       +
             ];

     

       30
       30
       +
           };

     

       31
       31
       +
           extraEnv = mkOption{

     

       32
       32
       +
             type = with types; attrsOf str;

     

       33
       33
       +
             default = {};

     

       34
       34
       +
             description = "Extra environment variables for ${serviceName}";

     

       35
       35
       +
           };

     

       36
       36
       +
         } // (optionalAttrs firewallOption {

     

       37
       37
       +
           openFirewall = mkOption {

     

       38
       38
       +
             type = types.bool;

     

       39
       39
       +
             default = false;

     

       40
       40
       +
             description = "Open firewall ports for ${serviceName}.";

     

       41
       41
       +
           };

     

       42
       42
       +
         }) // (optionalAttrs (extraOpts != null) extraOpts);

     

       43
       43
       +
       

     

       44
       44
       +
         # Generator for HDFS service configs

     

       45
       45
       +
         hadoopServiceConfig =

     

       46
       46
       +
           { name

     

       47
       47
       +
           , serviceOptions ? cfg.hdfs."${toLower name}"

     

       48
       48
       +
           , description ? "Hadoop HDFS ${name}"

     

       49
       49
       +
           , User ? "hdfs"

     

       50
       50
       +
           , allowedTCPPorts ? [ ]

     

       51
       51
       +
           , preStart ? ""

     

       52
       52
       +
           , environment ? { }

     

       53
       53
       +
           , extraConfig ? { }

     

       54
       54
       +
           }: (

     

       55
       55
       +
       

     

       56
       56
       +
             mkIf serviceOptions.enable ( mkMerge [{

     

       57
       57
       +
               systemd.services."hdfs-${toLower name}" = {

     

       58
       58
       +
                 inherit description preStart;

     

       59
       59
       +
                 environment = environment // serviceOptions.extraEnv;

     

       60
       60
       +
                 wantedBy = [ "multi-user.target" ];

     

       61
       61
       +
                 inherit (serviceOptions) restartIfChanged;

     

       62
       62
       +
                 serviceConfig = {

     

       63
       63
       +
                   inherit User;

     

       64
       64
       +
                   SyslogIdentifier = "hdfs-${toLower name}";

     

       65
       65
       +
                   ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} ${toLower name} ${escapeShellArgs serviceOptions.extraFlags}";

     

       66
       66
       +
                   Restart = "always";

     

       67
       67
       +
                 };

     

       68
       68
       +
               };

     

       69
       69
       +
       

     

       70
       70
       +
               services.hadoop.gatewayRole.enable = true;

     

       71
       71
       +
       

     

       72
       72
       +
               networking.firewall.allowedTCPPorts = mkIf

     

       73
       73
       +
                 ((builtins.hasAttr "openFirewall" serviceOptions) && serviceOptions.openFirewall)

     

       74
       74
       +
                 allowedTCPPorts;

     

       75
       75
       +
             } extraConfig])

     

       76
       76
       +
           );

     

       77
       77
       +
       

     

       16
       78
        
       in

     

       17
       79
        
       {

     

       18
       80
        
         options.services.hadoop.hdfs = {

     

       19
       19
       -
           namenode = {

     

       20
       20
       -
             enable = mkEnableOption "Whether to run the HDFS NameNode";

     

       81
       81
       +
       

     

       82
       82
       +
           namenode = hadoopServiceOption { serviceName = "HDFS NameNode"; } // {

     

       21
       83
        
             formatOnInit = mkOption {

     

       22
       84
        
               type = types.bool;

     

       23
       85
        
               default = false;

     

       24
       86
        
               description = ''

     

       25
       25
       -
                 Format HDFS namenode on first start. This is useful for quickly spinning up ephemeral HDFS clusters with a single namenode.

     

       26
       26
       -
                 For HA clusters, initialization involves multiple steps across multiple nodes. Follow [this guide](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html)

     

       27
       27
       -
                 to initialize an HA cluster manually.

     

       28
       28
       -
               '';

     

       29
       29
       -
             };

     

       30
       30
       -
             inherit restartIfChanged;

     

       31
       31
       -
             openFirewall = mkOption {

     

       32
       32
       -
               type = types.bool;

     

       33
       33
       -
               default = true;

     

       34
       34
       -
               description = ''

     

       35
       35
       -
                 Open firewall ports for namenode

     

       87
       87
       +
                 Format HDFS namenode on first start. This is useful for quickly spinning up

     

       88
       88
       +
                 ephemeral HDFS clusters with a single namenode.

     

       89
       89
       +
                 For HA clusters, initialization involves multiple steps across multiple nodes.

     

       90
       90
       +
                 Follow this guide to initialize an HA cluster manually:

     

       91
       91
       +
                 <link xlink:href="https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html"/>

     

       36
       92
        
               '';

     

       37
       93
        
             };

     

       38
       94
        
           };

     

       39
       39
       -
           datanode = {

     

       40
       40
       -
             enable = mkEnableOption "Whether to run the HDFS DataNode";

     

       41
       41
       -
             inherit restartIfChanged;

     

       42
       42
       -
             openFirewall = mkOption {

     

       43
       43
       -
               type = types.bool;

     

       44
       44
       -
               default = true;

     

       45
       45
       -
               description = ''

     

       46
       46
       -
                 Open firewall ports for datanode

     

       47
       47
       -
               '';

     

       95
       95
       +
       

     

       96
       96
       +
           datanode = hadoopServiceOption { serviceName = "HDFS DataNode"; } // {

     

       97
       97
       +
             dataDirs = mkOption {

     

       98
       98
       +
               default = null;

     

       99
       99
       +
               description = "Tier and path definitions for datanode storage.";

     

       100
       100
       +
               type = with types; nullOr (listOf (submodule {

     

       101
       101
       +
                 options = {

     

       102
       102
       +
                   type = mkOption {

     

       103
       103
       +
                     type = enum [ "SSD" "DISK" "ARCHIVE" "RAM_DISK" ];

     

       104
       104
       +
                     description = ''

     

       105
       105
       +
                       Storage types ([SSD]/[DISK]/[ARCHIVE]/[RAM_DISK]) for HDFS storage policies.

     

       106
       106
       +
                     '';

     

       107
       107
       +
                   };

     

       108
       108
       +
                   path = mkOption {

     

       109
       109
       +
                     type = path;

     

       110
       110
       +
                     example = [ "/var/lib/hadoop/hdfs/dn" ];

     

       111
       111
       +
                     description = "Determines where on the local filesystem a data node should store its blocks.";

     

       112
       112
       +
                   };

     

       113
       113
       +
                 };

     

       114
       114
       +
               }));

     

       48
       115
        
             };

     

       49
       116
        
           };

     

       50
       50
       -
           journalnode = {

     

       51
       51
       -
             enable = mkEnableOption "Whether to run the HDFS JournalNode";

     

       52
       52
       -
             inherit restartIfChanged;

     

       53
       53
       -
             openFirewall = mkOption {

     

       54
       54
       -
               type = types.bool;

     

       55
       55
       -
               default = true;

     

       56
       56
       -
               description = ''

     

       57
       57
       -
                 Open firewall ports for journalnode

     

       58
       58
       -
               '';

     

       59
       59
       -
             };

     

       117
       117
       +
       

     

       118
       118
       +
           journalnode = hadoopServiceOption { serviceName = "HDFS JournalNode"; };

     

       119
       119
       +
       

     

       120
       120
       +
           zkfc = hadoopServiceOption {

     

       121
       121
       +
             serviceName = "HDFS ZooKeeper failover controller";

     

       122
       122
       +
             firewallOption = false;

     

       60
       123
        
           };

     

       61
       61
       -
           zkfc = {

     

       62
       62
       -
             enable = mkEnableOption "Whether to run the HDFS ZooKeeper failover controller";

     

       63
       63
       -
             inherit restartIfChanged;

     

       64
       64
       -
           };

     

       65
       65
       -
           httpfs = {

     

       66
       66
       -
             enable = mkEnableOption "Whether to run the HDFS HTTPfs server";

     

       124
       124
       +
       

     

       125
       125
       +
           httpfs = hadoopServiceOption { serviceName = "HDFS JournalNode"; } // {

     

       67
       126
        
             tempPath = mkOption {

     

       68
       127
        
               type = types.path;

     

       69
       128
        
               default = "/tmp/hadoop/httpfs";

     

       70
       70
       -
               description = ''

     

       71
       71
       -
                 HTTPFS_TEMP path used by HTTPFS

     

       72
       72
       -
               '';

     

       73
       73
       -
             };

     

       74
       74
       -
             inherit restartIfChanged;

     

       75
       75
       -
             openFirewall = mkOption {

     

       76
       76
       -
               type = types.bool;

     

       77
       77
       -
               default = true;

     

       78
       78
       -
               description = ''

     

       79
       79
       -
                 Open firewall ports for HTTPFS

     

       80
       80
       -
               '';

     

       129
       129
       +
               description = "HTTPFS_TEMP path used by HTTPFS";

     

       81
       130
        
             };

     

       82
       131
        
           };

     

       132
       132
       +
       

     

       83
       133
        
         };

     

       84
       134
        
       

     

       85
       135
        
         config = mkMerge [

     

       86
       86
       -
           (mkIf cfg.hdfs.namenode.enable {

     

       87
       87
       -
             systemd.services.hdfs-namenode = {

     

       88
       88
       -
               description = "Hadoop HDFS NameNode";

     

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

     

       90
       90
       -
               inherit (cfg.hdfs.namenode) restartIfChanged;

     

       91
       91
       -
       

     

       92
       92
       -
               preStart = (mkIf cfg.hdfs.namenode.formatOnInit ''

     

       93
       93
       -
                 ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true

     

       94
       94
       -
               '');

     

       95
       95
       -
       

     

       96
       96
       -
               serviceConfig = {

     

       97
       97
       -
                 User = "hdfs";

     

       98
       98
       -
                 SyslogIdentifier = "hdfs-namenode";

     

       99
       99
       -
                 ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode";

     

       100
       100
       -
                 Restart = "always";

     

       101
       101
       -
               };

     

       102
       102
       -
             };

     

       103
       103
       -
       

     

       104
       104
       -
             networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.namenode.openFirewall [

     

       136
       136
       +
           (hadoopServiceConfig {

     

       137
       137
       +
             name = "NameNode";

     

       138
       138
       +
             allowedTCPPorts = [

     

       105
       139
        
               9870 # namenode.http-address

     

       106
       140
        
               8020 # namenode.rpc-address

     

       107
       107
       -
               8022 # namenode. servicerpc-address

     

       108
       108
       -
             ]);

     

       141
       141
       +
               8022 # namenode.servicerpc-address

     

       142
       142
       +
               8019 # dfs.ha.zkfc.port

     

       143
       143
       +
             ];

     

       144
       144
       +
             preStart = (mkIf cfg.hdfs.namenode.formatOnInit

     

       145
       145
       +
               "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true"

     

       146
       146
       +
             );

     

       109
       147
        
           })

     

       110
       110
       -
           (mkIf cfg.hdfs.datanode.enable {

     

       111
       111
       -
             systemd.services.hdfs-datanode = {

     

       112
       112
       -
               description = "Hadoop HDFS DataNode";

     

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

     

       114
       114
       -
               inherit (cfg.hdfs.datanode) restartIfChanged;

     

       115
       148
        
       

     

       116
       116
       -
               serviceConfig = {

     

       117
       117
       -
                 User = "hdfs";

     

       118
       118
       -
                 SyslogIdentifier = "hdfs-datanode";

     

       119
       119
       -
                 ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode";

     

       120
       120
       -
                 Restart = "always";

     

       121
       121
       -
               };

     

       122
       122
       -
             };

     

       123
       123
       -
       

     

       124
       124
       -
             networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.datanode.openFirewall [

     

       149
       149
       +
           (hadoopServiceConfig {

     

       150
       150
       +
             name = "DataNode";

     

       151
       151
       +
             # port numbers for datanode changed between hadoop 2 and 3

     

       152
       152
       +
             allowedTCPPorts = if versionAtLeast cfg.package.version "3" then [

     

       125
       153
        
               9864 # datanode.http.address

     

       126
       154
        
               9866 # datanode.address

     

       127
       155
        
               9867 # datanode.ipc.address

     

       128
       128
       -
             ]);

     

       156
       156
       +
             ] else [

     

       157
       157
       +
               50075 # datanode.http.address

     

       158
       158
       +
               50010 # datanode.address

     

       159
       159
       +
               50020 # datanode.ipc.address

     

       160
       160
       +
             ];

     

       161
       161
       +
             extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in

     

       162
       162
       +
               if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d;

     

       129
       163
        
           })

     

       130
       130
       -
           (mkIf cfg.hdfs.journalnode.enable {

     

       131
       131
       -
             systemd.services.hdfs-journalnode = {

     

       132
       132
       -
               description = "Hadoop HDFS JournalNode";

     

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

     

       134
       134
       -
               inherit (cfg.hdfs.journalnode) restartIfChanged;

     

       135
       164
        
       

     

       136
       136
       -
               serviceConfig = {

     

       137
       137
       -
                 User = "hdfs";

     

       138
       138
       -
                 SyslogIdentifier = "hdfs-journalnode";

     

       139
       139
       -
                 ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} journalnode";

     

       140
       140
       -
                 Restart = "always";

     

       141
       141
       -
               };

     

       142
       142
       -
             };

     

       143
       143
       -
       

     

       144
       144
       -
             networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.journalnode.openFirewall [

     

       165
       165
       +
           (hadoopServiceConfig {

     

       166
       166
       +
             name = "JournalNode";

     

       167
       167
       +
             allowedTCPPorts = [

     

       145
       168
        
               8480 # dfs.journalnode.http-address

     

       146
       169
        
               8485 # dfs.journalnode.rpc-address

     

       147
       147
       -
             ]);

     

       170
       170
       +
             ];

     

       148
       171
        
           })

     

       149
       149
       -
           (mkIf cfg.hdfs.zkfc.enable {

     

       150
       150
       -
             systemd.services.hdfs-zkfc = {

     

       151
       151
       -
               description = "Hadoop HDFS ZooKeeper failover controller";

     

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

     

       153
       153
       -
               inherit (cfg.hdfs.zkfc) restartIfChanged;

     

       154
       172
        
       

     

       155
       155
       -
               serviceConfig = {

     

       156
       156
       -
                 User = "hdfs";

     

       157
       157
       -
                 SyslogIdentifier = "hdfs-zkfc";

     

       158
       158
       -
                 ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} zkfc";

     

       159
       159
       -
                 Restart = "always";

     

       160
       160
       -
               };

     

       161
       161
       -
             };

     

       173
       173
       +
           (hadoopServiceConfig {

     

       174
       174
       +
             name = "zkfc";

     

       175
       175
       +
             description = "Hadoop HDFS ZooKeeper failover controller";

     

       162
       176
        
           })

     

       163
       163
       -
           (mkIf cfg.hdfs.httpfs.enable {

     

       164
       164
       -
             systemd.services.hdfs-httpfs = {

     

       165
       165
       -
               description = "Hadoop httpfs";

     

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

     

       167
       167
       -
               inherit (cfg.hdfs.httpfs) restartIfChanged;

     

       168
       177
        
       

     

       169
       169
       -
               environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath;

     

       170
       170
       -
       

     

       171
       171
       -
               preStart = ''

     

       172
       172
       -
                 mkdir -p $HTTPFS_TEMP

     

       173
       173
       -
               '';

     

       174
       174
       -
       

     

       175
       175
       -
               serviceConfig = {

     

       176
       176
       -
                 User = "httpfs";

     

       177
       177
       -
                 SyslogIdentifier = "hdfs-httpfs";

     

       178
       178
       -
                 ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} httpfs";

     

       179
       179
       -
                 Restart = "always";

     

       180
       180
       -
               };

     

       181
       181
       -
             };

     

       182
       182
       -
             networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.httpfs.openFirewall [

     

       178
       178
       +
           (hadoopServiceConfig {

     

       179
       179
       +
             name = "HTTPFS";

     

       180
       180
       +
             environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath;

     

       181
       181
       +
             preStart = "mkdir -p $HTTPFS_TEMP";

     

       182
       182
       +
             User = "httpfs";

     

       183
       183
       +
             allowedTCPPorts = [

     

       183
       184
        
               14000 # httpfs.http.port

     

       184
       184
       -
             ]);

     

       185
       185
       +
             ];

     

       185
       186
        
           })

     

       186
       186
       -
           (mkIf (

     

       187
       187
       -
               cfg.hdfs.namenode.enable || cfg.hdfs.datanode.enable || cfg.hdfs.journalnode.enable || cfg.hdfs.zkfc.enable

     

       188
       188
       -
           ) {

     

       187
       187
       +
       

     

       188
       188
       +
           (mkIf cfg.gatewayRole.enable {

     

       189
       189
        
             users.users.hdfs = {

     

       190
       190
        
               description = "Hadoop HDFS user";

     

       191
       191
        
               group = "hadoop";

     
···

       199
       199
        
               isSystemUser = true;

     

       200
       200
        
             };

     

       201
       201
        
           })

     

       202
       202
       +
       

     

       202
       203
        
         ];

     

       203
       204
        
       }

+85 -13

nixos/modules/services/cluster/hadoop/yarn.nix

···

       13
       13
        
           '';

     

       14
       14
        
           default = false;

     

       15
       15
        
         };

     

       16
       16
       +
         extraFlags = mkOption{

     

       17
       17
       +
           type = with types; listOf str;

     

       18
       18
       +
           default = [];

     

       19
       19
       +
           description = "Extra command line flags to pass to the service";

     

       20
       20
       +
           example = [

     

       21
       21
       +
             "-Dcom.sun.management.jmxremote"

     

       22
       22
       +
             "-Dcom.sun.management.jmxremote.port=8010"

     

       23
       23
       +
           ];

     

       24
       24
       +
         };

     

       25
       25
       +
         extraEnv = mkOption{

     

       26
       26
       +
           type = with types; attrsOf str;

     

       27
       27
       +
           default = {};

     

       28
       28
       +
           description = "Extra environment variables";

     

       29
       29
       +
         };

     

       16
       30
        
       in

     

       17
       31
        
       {

     

       18
       32
        
         options.services.hadoop.yarn = {

     

       19
       33
        
           resourcemanager = {

     

       20
       20
       -
             enable = mkEnableOption "Whether to run the Hadoop YARN ResourceManager";

     

       21
       21
       -
             inherit restartIfChanged;

     

       34
       34
       +
             enable = mkEnableOption "Hadoop YARN ResourceManager";

     

       35
       35
       +
             inherit restartIfChanged extraFlags extraEnv;

     

       36
       36
       +
       

     

       22
       37
        
             openFirewall = mkOption {

     

       23
       38
        
               type = types.bool;

     

       24
       24
       -
               default = true;

     

       39
       39
       +
               default = false;

     

       25
       40
        
               description = ''

     

       26
       41
        
                 Open firewall ports for resourcemanager

     

       27
       42
        
               '';

     

       28
       43
        
             };

     

       29
       44
        
           };

     

       30
       45
        
           nodemanager = {

     

       31
       31
       -
             enable = mkEnableOption "Whether to run the Hadoop YARN NodeManager";

     

       32
       32
       -
             inherit restartIfChanged;

     

       46
       46
       +
             enable = mkEnableOption "Hadoop YARN NodeManager";

     

       47
       47
       +
             inherit restartIfChanged extraFlags extraEnv;

     

       48
       48
       +
       

     

       49
       49
       +
             resource = {

     

       50
       50
       +
               cpuVCores = mkOption {

     

       51
       51
       +
                 description = "Number of vcores that can be allocated for containers.";

     

       52
       52
       +
                 type = with types; nullOr ints.positive;

     

       53
       53
       +
                 default = null;

     

       54
       54
       +
               };

     

       55
       55
       +
               maximumAllocationVCores = mkOption {

     

       56
       56
       +
                 description = "The maximum virtual CPU cores any container can be allocated.";

     

       57
       57
       +
                 type = with types; nullOr ints.positive;

     

       58
       58
       +
                 default = null;

     

       59
       59
       +
               };

     

       60
       60
       +
               memoryMB = mkOption {

     

       61
       61
       +
                 description = "Amount of physical memory, in MB, that can be allocated for containers.";

     

       62
       62
       +
                 type = with types; nullOr ints.positive;

     

       63
       63
       +
                 default = null;

     

       64
       64
       +
               };

     

       65
       65
       +
               maximumAllocationMB = mkOption {

     

       66
       66
       +
                 description = "The maximum physical memory any container can be allocated.";

     

       67
       67
       +
                 type = with types; nullOr ints.positive;

     

       68
       68
       +
                 default = null;

     

       69
       69
       +
               };

     

       70
       70
       +
             };

     

       71
       71
       +
       

     

       72
       72
       +
             useCGroups = mkOption {

     

       73
       73
       +
               type = types.bool;

     

       74
       74
       +
               default = true;

     

       75
       75
       +
               description = ''

     

       76
       76
       +
                 Use cgroups to enforce resource limits on containers

     

       77
       77
       +
               '';

     

       78
       78
       +
             };

     

       79
       79
       +
       

     

       80
       80
       +
             localDir = mkOption {

     

       81
       81
       +
               description = "List of directories to store localized files in.";

     

       82
       82
       +
               type = with types; nullOr (listOf path);

     

       83
       83
       +
               example = [ "/var/lib/hadoop/yarn/nm" ];

     

       84
       84
       +
               default = null;

     

       85
       85
       +
             };

     

       86
       86
       +
       

     

       33
       87
        
             addBinBash = mkOption {

     

       34
       88
        
               type = types.bool;

     

       35
       89
        
               default = true;

     
···

       39
       93
        
             };

     

       40
       94
        
             openFirewall = mkOption {

     

       41
       95
        
               type = types.bool;

     

       42
       42
       -
               default = true;

     

       96
       96
       +
               default = false;

     

       43
       97
        
               description = ''

     

       44
       98
        
                 Open firewall ports for nodemanager.

     

       45
       99
        
                 Because containers can listen on any ephemeral port, TCP ports 1024–65535 will be opened.

     
···

       49
       103
        
         };

     

       50
       104
        
       

     

       51
       105
        
         config = mkMerge [

     

       52
       52
       -
           (mkIf (

     

       53
       53
       -
               cfg.yarn.resourcemanager.enable || cfg.yarn.nodemanager.enable

     

       54
       54
       -
           ) {

     

       55
       55
       -
       

     

       106
       106
       +
           (mkIf cfg.gatewayRole.enable {

     

       56
       107
        
             users.users.yarn = {

     

       57
       108
        
               description = "Hadoop YARN user";

     

       58
       109
        
               group = "hadoop";

     
···

       65
       116
        
               description = "Hadoop YARN ResourceManager";

     

       66
       117
        
               wantedBy = [ "multi-user.target" ];

     

       67
       118
        
               inherit (cfg.yarn.resourcemanager) restartIfChanged;

     

       119
       119
       +
               environment = cfg.yarn.resourcemanager.extraEnv;

     

       68
       120
        
       

     

       69
       121
        
               serviceConfig = {

     

       70
       122
        
                 User = "yarn";

     

       71
       123
        
                 SyslogIdentifier = "yarn-resourcemanager";

     

       72
       124
        
                 ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +

     

       73
       73
       -
                             " resourcemanager";

     

       125
       125
       +
                             " resourcemanager ${escapeShellArgs cfg.yarn.resourcemanager.extraFlags}";

     

       74
       126
        
                 Restart = "always";

     

       75
       127
        
               };

     

       76
       128
        
             };

     

       129
       129
       +
       

     

       130
       130
       +
             services.hadoop.gatewayRole.enable = true;

     

       131
       131
       +
       

     

       77
       132
        
             networking.firewall.allowedTCPPorts = (mkIf cfg.yarn.resourcemanager.openFirewall [

     

       78
       133
        
               8088 # resourcemanager.webapp.address

     

       79
       134
        
               8030 # resourcemanager.scheduler.address

     
···

       94
       149
        
               description = "Hadoop YARN NodeManager";

     

       95
       150
        
               wantedBy = [ "multi-user.target" ];

     

       96
       151
        
               inherit (cfg.yarn.nodemanager) restartIfChanged;

     

       152
       152
       +
               environment = cfg.yarn.nodemanager.extraEnv;

     

       97
       153
        
       

     

       98
       154
        
               preStart = ''

     

       99
       155
        
                 # create log dir

     
···

       101
       157
        
                 chown yarn:hadoop /var/log/hadoop/yarn/nodemanager

     

       102
       158
        
       

     

       103
       159
        
                 # set up setuid container executor binary

     

       160
       160
       +
                 umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true

     

       104
       161
        
                 rm -rf /run/wrappers/yarn-nodemanager/ || true

     

       105
       105
       -
                 mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop}

     

       162
       162
       +
                 mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop,cgroup/cpu}

     

       106
       163
        
                 cp ${cfg.package}/lib/${cfg.package.untarDir}/bin/container-executor /run/wrappers/yarn-nodemanager/bin/

     

       107
       164
        
                 chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor

     

       108
       165
        
                 chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor

     
···

       114
       171
        
                 SyslogIdentifier = "yarn-nodemanager";

     

       115
       172
        
                 PermissionsStartOnly = true;

     

       116
       173
        
                 ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " +

     

       117
       117
       -
                             " nodemanager";

     

       174
       174
       +
                             " nodemanager ${escapeShellArgs cfg.yarn.nodemanager.extraFlags}";

     

       118
       175
        
                 Restart = "always";

     

       119
       176
        
               };

     

       177
       177
       +
             };

     

       178
       178
       +
       

     

       179
       179
       +
             services.hadoop.gatewayRole.enable = true;

     

       180
       180
       +
       

     

       181
       181
       +
             services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; {

     

       182
       182
       +
               "yarn.nodemanager.local-dirs" = localDir;

     

       183
       183
       +
               "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores;

     

       184
       184
       +
               "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB;

     

       185
       185
       +
               "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores;

     

       186
       186
       +
               "yarn.nodemanager.resource.memory-mb" = resource.memoryMB;

     

       187
       187
       +
             } // mkIf useCGroups {

     

       188
       188
       +
               "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn";

     

       189
       189
       +
               "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler";

     

       190
       190
       +
               "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true";

     

       191
       191
       +
               "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup";

     

       120
       192
        
             };

     

       121
       193
        
       

     

       122
       194
        
             networking.firewall.allowedTCPPortRanges = [

+8 -12

nixos/modules/services/networking/nsd.nix

···

       194
       194
        
                              zone.children

     

       195
       195
        
             );

     

       196
       196
        
       

     

       197
       197
       -
         # fighting infinite recursion

     

       198
       198
       -
         zoneOptions = zoneOptionsRaw // childConfig zoneOptions1 true;

     

       199
       199
       -
         zoneOptions1 = zoneOptionsRaw // childConfig zoneOptions2 false;

     

       200
       200
       -
         zoneOptions2 = zoneOptionsRaw // childConfig zoneOptions3 false;

     

       201
       201
       -
         zoneOptions3 = zoneOptionsRaw // childConfig zoneOptions4 false;

     

       202
       202
       -
         zoneOptions4 = zoneOptionsRaw // childConfig zoneOptions5 false;

     

       203
       203
       -
         zoneOptions5 = zoneOptionsRaw // childConfig zoneOptions6 false;

     

       204
       204
       -
         zoneOptions6 = zoneOptionsRaw // childConfig null         false;

     

       205
       205
       -
       

     

       206
       206
       -
         childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; };

     

       207
       207
       -
       

     

       208
       197
        
         # options are ordered alphanumerically

     

       209
       209
       -
         zoneOptionsRaw = types.submodule {

     

       198
       198
       +
         zoneOptions = types.submodule {

     

       210
       199
        
           options = {

     

       211
       200
        
       

     

       212
       201
        
             allowAXFRFallback = mkOption {

     
···

       246
       235
        
             };

     

       247
       236
        
       

     

       248
       237
        
             children = mkOption {

     

       238
       238
       +
               # TODO: This relies on the fact that `types.anything` doesn't set any

     

       239
       239
       +
               # values of its own to any defaults, because in the above zoneConfigs',

     

       240
       240
       +
               # values from children override ones from parents, but only if the

     

       241
       241
       +
               # attributes are defined. Because of this, we can't replace the element

     

       242
       242
       +
               # type here with `zoneConfigs`, since that would set all the attributes

     

       243
       243
       +
               # to default values, breaking the parent inheriting function.

     

       244
       244
       +
               type = types.attrsOf types.anything;

     

       249
       245
        
               default = {};

     

       250
       246
        
               description = ''

     

       251
       247
        
                 Children zones inherit all options of their parents. Attributes

+1

nixos/modules/services/networking/unbound.nix

···

       62
       62
        
             };

     

       63
       63
        
       

     

       64
       64
        
             stateDir = mkOption {

     

       65
       65
       +
               type = types.path;

     

       65
       66
        
               default = "/var/lib/unbound";

     

       66
       67
        
               description = "Directory holding all state for unbound to run.";

     

       67
       68
        
             };

+1

nixos/modules/services/networking/vsftpd.nix

···

       153
       153
        
       

     

       154
       154
        
             userlist = mkOption {

     

       155
       155
        
               default = [];

     

       156
       156
       +
               type = types.listOf types.str;

     

       156
       157
        
               description = "See <option>userlistFile</option>.";

     

       157
       158
        
             };

     

       158
       159

+1 -10

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

···

       153
       153
        
           package = mkOption {

     

       154
       154
        
             type = types.package;

     

       155
       155
        
             description = "Which package to use for the Nextcloud instance.";

     

       156
       156
       -
             relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ];

     

       156
       156
       +
             relatedPackages = [ "nextcloud22" "nextcloud23" ];

     

       157
       157
        
           };

     

       158
       158
        
           phpPackage = mkOption {

     

       159
       159
        
             type = types.package;

     
···

       571
       571
        
                     nextcloud defined in an overlay, please set `services.nextcloud.package` to

     

       572
       572
        
                     `pkgs.nextcloud`.

     

       573
       573
        
                   ''

     

       574
       574
       -
                 # 21.03 will not be an official release - it was instead 21.05.

     

       575
       575
       -
                 # This versionOlder statement remains set to 21.03 for backwards compatibility.

     

       576
       576
       -
                 # See https://github.com/NixOS/nixpkgs/pull/108899 and

     

       577
       577
       -
                 # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md.

     

       578
       578
       -
                 # FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here

     

       579
       579
       -
                 # to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with

     

       580
       580
       -
                 # no explicit services.nextcloud.package don't upgrade to v21 by accident (

     

       581
       581
       -
                 # nextcloud20 throws an eval-error because it's dropped).

     

       582
       582
       -
                 else if versionOlder stateVersion "21.03" then nextcloud20

     

       583
       574
        
                 else if versionOlder stateVersion "21.11" then nextcloud21

     

       584
       575
        
                 else if versionOlder stateVersion "22.05" then nextcloud22

     

       585
       576
        
                 else nextcloud23

+18

nixos/modules/services/x11/display-managers/default.nix

···

       219
       219
        
       

     

       220
       220
        
             session = mkOption {

     

       221
       221
        
               default = [];

     

       222
       222
       +
               type = with types; listOf (submodule ({ ... }: {

     

       223
       223
       +
                 options = {

     

       224
       224
       +
                   manage = mkOption {

     

       225
       225
       +
                     description = "Whether this is a desktop or a window manager";

     

       226
       226
       +
                     type = enum [ "desktop" "window" ];

     

       227
       227
       +
                   };

     

       228
       228
       +
       

     

       229
       229
       +
                   name = mkOption {

     

       230
       230
       +
                     description = "Name of this session";

     

       231
       231
       +
                     type = str;

     

       232
       232
       +
                   };

     

       233
       233
       +
       

     

       234
       234
       +
                   start = mkOption {

     

       235
       235
       +
                     description = "Commands to run to start this session";

     

       236
       236
       +
                     type = lines;

     

       237
       237
       +
                   };

     

       238
       238
       +
                 };

     

       239
       239
       +
               }));

     

       222
       240
        
               example = literalExpression

     

       223
       241
        
                 ''

     

       224
       242
        
                   [ { manage = "desktop";

+1 -1

nixos/modules/system/boot/kernel.nix

···

       36
       36
        
       

     

       37
       37
        
           boot.kernelPackages = mkOption {

     

       38
       38
        
             default = pkgs.linuxPackages;

     

       39
       39
       -
             type = types.unspecified // { merge = mergeEqualOption; };

     

       39
       39
       +
             type = types.raw;

     

       40
       40
        
             apply = kernelPackages: kernelPackages.extend (self: super: {

     

       41
       41
        
               kernel = super.kernel.override (originalArgs: {

     

       42
       42
        
                 inherit randstructSeed;

+1 -1

nixos/modules/system/boot/stage-1.nix

···

       581
       581
        
               else "gzip"

     

       582
       582
        
             );

     

       583
       583
        
             defaultText = literalDocBook "<literal>zstd</literal> if the kernel supports it (5.9+), <literal>gzip</literal> if not";

     

       584
       584
       -
             type = types.unspecified; # We don't have a function type...

     

       584
       584
       +
             type = types.either types.str (types.functionTo types.str);

     

       585
       585
        
             description = ''

     

       586
       586
        
               The compressor to use on the initrd image. May be any of:

     

       587
       587

+16 -201

nixos/modules/system/boot/systemd.nix

···

       11
       11
        
       

     

       12
       12
        
         systemd = cfg.package;

     

       13
       13
        
       

     

       14
       14
       +
         inherit (systemdUtils.lib)

     

       15
       15
       +
           makeJobScript

     

       16
       16
       +
           unitConfig

     

       17
       17
       +
           serviceConfig

     

       18
       18
       +
           mountConfig

     

       19
       19
       +
           automountConfig

     

       20
       20
       +
           commonUnitText

     

       21
       21
       +
           targetToUnit

     

       22
       22
       +
           serviceToUnit

     

       23
       23
       +
           socketToUnit

     

       24
       24
       +
           timerToUnit

     

       25
       25
       +
           pathToUnit

     

       26
       26
       +
           mountToUnit

     

       27
       27
       +
           automountToUnit

     

       28
       28
       +
           sliceToUnit;

     

       29
       29
       +
       

     

       14
       30
        
         upstreamSystemUnits =

     

       15
       31
        
           [ # Targets.

     

       16
       32
        
             "basic.target"

     
···

       209
       225
        
             "xdg-desktop-autostart.target"

     

       210
       226
        
           ];

     

       211
       227
        
       

     

       212
       212
       -
         makeJobScript = name: text:

     

       213
       213
       -
           let

     

       214
       214
       -
             scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name);

     

       215
       215
       -
             out = (pkgs.writeShellScriptBin scriptName ''

     

       216
       216
       -
               set -e

     

       217
       217
       -
               ${text}

     

       218
       218
       -
             '').overrideAttrs (_: {

     

       219
       219
       -
               # The derivation name is different from the script file name

     

       220
       220
       -
               # to keep the script file name short to avoid cluttering logs.

     

       221
       221
       -
               name = "unit-script-${scriptName}";

     

       222
       222
       -
             });

     

       223
       223
       -
           in "${out}/bin/${scriptName}";

     

       224
       224
       -
       

     

       225
       225
       -
         unitConfig = { config, options, ... }: {

     

       226
       226
       -
           config = {

     

       227
       227
       -
             unitConfig =

     

       228
       228
       -
               optionalAttrs (config.requires != [])

     

       229
       229
       -
                 { Requires = toString config.requires; }

     

       230
       230
       -
               // optionalAttrs (config.wants != [])

     

       231
       231
       -
                 { Wants = toString config.wants; }

     

       232
       232
       -
               // optionalAttrs (config.after != [])

     

       233
       233
       -
                 { After = toString config.after; }

     

       234
       234
       -
               // optionalAttrs (config.before != [])

     

       235
       235
       -
                 { Before = toString config.before; }

     

       236
       236
       -
               // optionalAttrs (config.bindsTo != [])

     

       237
       237
       -
                 { BindsTo = toString config.bindsTo; }

     

       238
       238
       -
               // optionalAttrs (config.partOf != [])

     

       239
       239
       -
                 { PartOf = toString config.partOf; }

     

       240
       240
       -
               // optionalAttrs (config.conflicts != [])

     

       241
       241
       -
                 { Conflicts = toString config.conflicts; }

     

       242
       242
       -
               // optionalAttrs (config.requisite != [])

     

       243
       243
       -
                 { Requisite = toString config.requisite; }

     

       244
       244
       -
               // optionalAttrs (config.restartTriggers != [])

     

       245
       245
       -
                 { X-Restart-Triggers = toString config.restartTriggers; }

     

       246
       246
       -
               // optionalAttrs (config.reloadTriggers != [])

     

       247
       247
       -
                 { X-Reload-Triggers = toString config.reloadTriggers; }

     

       248
       248
       -
               // optionalAttrs (config.description != "") {

     

       249
       249
       -
                 Description = config.description; }

     

       250
       250
       -
               // optionalAttrs (config.documentation != []) {

     

       251
       251
       -
                 Documentation = toString config.documentation; }

     

       252
       252
       -
               // optionalAttrs (config.onFailure != []) {

     

       253
       253
       -
                 OnFailure = toString config.onFailure; }

     

       254
       254
       -
               // optionalAttrs (options.startLimitIntervalSec.isDefined) {

     

       255
       255
       -
                 StartLimitIntervalSec = toString config.startLimitIntervalSec;

     

       256
       256
       -
               } // optionalAttrs (options.startLimitBurst.isDefined) {

     

       257
       257
       -
                 StartLimitBurst = toString config.startLimitBurst;

     

       258
       258
       -
               };

     

       259
       259
       -
           };

     

       260
       260
       -
         };

     

       261
       261
       -
       

     

       262
       262
       -
         serviceConfig = { name, config, ... }: {

     

       263
       263
       -
           config = mkMerge

     

       264
       264
       -
             [ { # Default path for systemd services.  Should be quite minimal.

     

       265
       265
       -
                 path = mkAfter

     

       266
       266
       -
                   [ pkgs.coreutils

     

       267
       267
       -
                     pkgs.findutils

     

       268
       268
       -
                     pkgs.gnugrep

     

       269
       269
       -
                     pkgs.gnused

     

       270
       270
       -
                     systemd

     

       271
       271
       -
                   ];

     

       272
       272
       -
                 environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";

     

       273
       273
       -
               }

     

       274
       274
       -
               (mkIf (config.preStart != "")

     

       275
       275
       -
                 { serviceConfig.ExecStartPre =

     

       276
       276
       -
                     [ (makeJobScript "${name}-pre-start" config.preStart) ];

     

       277
       277
       -
                 })

     

       278
       278
       -
               (mkIf (config.script != "")

     

       279
       279
       -
                 { serviceConfig.ExecStart =

     

       280
       280
       -
                     makeJobScript "${name}-start" config.script + " " + config.scriptArgs;

     

       281
       281
       -
                 })

     

       282
       282
       -
               (mkIf (config.postStart != "")

     

       283
       283
       -
                 { serviceConfig.ExecStartPost =

     

       284
       284
       -
                     [ (makeJobScript "${name}-post-start" config.postStart) ];

     

       285
       285
       -
                 })

     

       286
       286
       -
               (mkIf (config.reload != "")

     

       287
       287
       -
                 { serviceConfig.ExecReload =

     

       288
       288
       -
                     makeJobScript "${name}-reload" config.reload;

     

       289
       289
       -
                 })

     

       290
       290
       -
               (mkIf (config.preStop != "")

     

       291
       291
       -
                 { serviceConfig.ExecStop =

     

       292
       292
       -
                     makeJobScript "${name}-pre-stop" config.preStop;

     

       293
       293
       -
                 })

     

       294
       294
       -
               (mkIf (config.postStop != "")

     

       295
       295
       -
                 { serviceConfig.ExecStopPost =

     

       296
       296
       -
                     makeJobScript "${name}-post-stop" config.postStop;

     

       297
       297
       -
                 })

     

       298
       298
       -
             ];

     

       299
       299
       -
         };

     

       300
       300
       -
       

     

       301
       301
       -
         mountConfig = { config, ... }: {

     

       302
       302
       -
           config = {

     

       303
       303
       -
             mountConfig =

     

       304
       304
       -
               { What = config.what;

     

       305
       305
       -
                 Where = config.where;

     

       306
       306
       -
               } // optionalAttrs (config.type != "") {

     

       307
       307
       -
                 Type = config.type;

     

       308
       308
       -
               } // optionalAttrs (config.options != "") {

     

       309
       309
       -
                 Options = config.options;

     

       310
       310
       -
               };

     

       311
       311
       -
           };

     

       312
       312
       -
         };

     

       313
       313
       -
       

     

       314
       314
       -
         automountConfig = { config, ... }: {

     

       315
       315
       -
           config = {

     

       316
       316
       -
             automountConfig =

     

       317
       317
       -
               { Where = config.where;

     

       318
       318
       -
               };

     

       319
       319
       -
           };

     

       320
       320
       -
         };

     

       321
       321
       -
       

     

       322
       322
       -
         commonUnitText = def: ''

     

       323
       323
       -
             [Unit]

     

       324
       324
       -
             ${attrsToSection def.unitConfig}

     

       325
       325
       -
           '';

     

       326
       326
       -
       

     

       327
       327
       -
         targetToUnit = name: def:

     

       328
       328
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       329
       329
       -
             text =

     

       330
       330
       -
               ''

     

       331
       331
       -
                 [Unit]

     

       332
       332
       -
                 ${attrsToSection def.unitConfig}

     

       333
       333
       -
               '';

     

       334
       334
       -
           };

     

       335
       335
       -
       

     

       336
       336
       -
         serviceToUnit = name: def:

     

       337
       337
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       338
       338
       -
             text = commonUnitText def +

     

       339
       339
       -
               ''

     

       340
       340
       -
                 [Service]

     

       341
       341
       -
                 ${let env = cfg.globalEnvironment // def.environment;

     

       342
       342
       -
                   in concatMapStrings (n:

     

       343
       343
       -
                     let s = optionalString (env.${n} != null)

     

       344
       344
       -
                       "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";

     

       345
       345
       -
                     # systemd max line length is now 1MiB

     

       346
       346
       -
                     # https://github.com/systemd/systemd/commit/e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af

     

       347
       347
       -
                     in if stringLength s >= 1048576 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}

     

       348
       348
       -
                 ${if def.reloadIfChanged then ''

     

       349
       349
       -
                   X-ReloadIfChanged=true

     

       350
       350
       -
                 '' else if !def.restartIfChanged then ''

     

       351
       351
       -
                   X-RestartIfChanged=false

     

       352
       352
       -
                 '' else ""}

     

       353
       353
       -
                 ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"}

     

       354
       354
       -
                 ${attrsToSection def.serviceConfig}

     

       355
       355
       -
               '';

     

       356
       356
       -
           };

     

       357
       357
       -
       

     

       358
       358
       -
         socketToUnit = name: def:

     

       359
       359
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       360
       360
       -
             text = commonUnitText def +

     

       361
       361
       -
               ''

     

       362
       362
       -
                 [Socket]

     

       363
       363
       -
                 ${attrsToSection def.socketConfig}

     

       364
       364
       -
                 ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)}

     

       365
       365
       -
                 ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)}

     

       366
       366
       -
               '';

     

       367
       367
       -
           };

     

       368
       368
       -
       

     

       369
       369
       -
         timerToUnit = name: def:

     

       370
       370
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       371
       371
       -
             text = commonUnitText def +

     

       372
       372
       -
               ''

     

       373
       373
       -
                 [Timer]

     

       374
       374
       -
                 ${attrsToSection def.timerConfig}

     

       375
       375
       -
               '';

     

       376
       376
       -
           };

     

       377
       377
       -
       

     

       378
       378
       -
         pathToUnit = name: def:

     

       379
       379
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       380
       380
       -
             text = commonUnitText def +

     

       381
       381
       -
               ''

     

       382
       382
       -
                 [Path]

     

       383
       383
       -
                 ${attrsToSection def.pathConfig}

     

       384
       384
       -
               '';

     

       385
       385
       -
           };

     

       386
       386
       -
       

     

       387
       387
       -
         mountToUnit = name: def:

     

       388
       388
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       389
       389
       -
             text = commonUnitText def +

     

       390
       390
       -
               ''

     

       391
       391
       -
                 [Mount]

     

       392
       392
       -
                 ${attrsToSection def.mountConfig}

     

       393
       393
       -
               '';

     

       394
       394
       -
           };

     

       395
       395
       -
       

     

       396
       396
       -
         automountToUnit = name: def:

     

       397
       397
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       398
       398
       -
             text = commonUnitText def +

     

       399
       399
       -
               ''

     

       400
       400
       -
                 [Automount]

     

       401
       401
       -
                 ${attrsToSection def.automountConfig}

     

       402
       402
       -
               '';

     

       403
       403
       -
           };

     

       404
       404
       -
       

     

       405
       405
       -
         sliceToUnit = name: def:

     

       406
       406
       -
           { inherit (def) aliases wantedBy requiredBy enable;

     

       407
       407
       -
             text = commonUnitText def +

     

       408
       408
       -
               ''

     

       409
       409
       -
                 [Slice]

     

       410
       410
       -
                 ${attrsToSection def.sliceConfig}

     

       411
       411
       -
               '';

     

       412
       412
       -
           };

     

       413
       228
        
       

     

       414
       229
        
         logindHandlerType = types.enum [

     

       415
       230
        
           "ignore" "poweroff" "reboot" "halt" "kexec" "suspend"

+4 -4

nixos/tests/all-tests.nix

···

       189
       189
        
         grocy = handleTest ./grocy.nix {};

     

       190
       190
        
         grub = handleTest ./grub.nix {};

     

       191
       191
        
         gvisor = handleTest ./gvisor.nix {};

     

       192
       192
       -
         hadoop.all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hadoop.nix {};

     

       193
       193
       -
         hadoop.hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/hdfs.nix {};

     

       194
       194
       -
         hadoop.yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop/yarn.nix {};

     

       192
       192
       +
         hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };

     

       193
       193
       +
         hadoop_3_2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_2; };

     

       194
       194
       +
         hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; };

     

       195
       195
        
         haka = handleTest ./haka.nix {};

     

       196
       196
        
         haproxy = handleTest ./haproxy.nix {};

     

       197
       197
        
         hardened = handleTest ./hardened.nix {};

     
···

       485
       485
        
         sonarr = handleTest ./sonarr.nix {};

     

       486
       486
        
         sourcehut = handleTest ./sourcehut.nix {};

     

       487
       487
        
         spacecookie = handleTest ./spacecookie.nix {};

     

       488
       488
       -
         spark = handleTestOn ["x86_64-linux"] ./spark {};

     

       488
       488
       +
         spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};

     

       489
       489
        
         sslh = handleTest ./sslh.nix {};

     

       490
       490
        
         sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};

     

       491
       491
        
         sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};

+7

nixos/tests/hadoop/default.nix

···

       1
       1
       +
       { handleTestOn, package, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; };

     

       5
       5
       +
         hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; };

     

       6
       6
       +
         yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; };

     

       7
       7
       +
       }

+146 -119

nixos/tests/hadoop/hadoop.nix

···

       1
       1
        
       # This test is very comprehensive. It tests whether all hadoop services work well with each other.

     

       2
       2
        
       # Run this when updating the Hadoop package or making significant changes to the hadoop module.

     

       3
       3
        
       # For a more basic test, see hdfs.nix and yarn.nix

     

       4
       4
       -
       import ../make-test-python.nix ({pkgs, ...}: {

     

       4
       4
       +
       import ../make-test-python.nix ({ package, ... }: {

     

       5
       5
       +
         name = "hadoop-combined";

     

       5
       6
        
       

     

       6
       6
       -
         nodes = let

     

       7
       7
       -
           package = pkgs.hadoop;

     

       8
       8
       -
           coreSite = {

     

       9
       9
       -
             "fs.defaultFS" = "hdfs://ns1";

     

       10
       10
       -
           };

     

       11
       11
       -
           hdfsSite = {

     

       12
       12
       -
             "dfs.namenode.rpc-bind-host" = "0.0.0.0";

     

       13
       13
       -
             "dfs.namenode.http-bind-host" = "0.0.0.0";

     

       14
       14
       -
             "dfs.namenode.servicerpc-bind-host" = "0.0.0.0";

     

       7
       7
       +
         nodes =

     

       8
       8
       +
           let

     

       9
       9
       +
             coreSite = {

     

       10
       10
       +
               "fs.defaultFS" = "hdfs://ns1";

     

       11
       11
       +
             };

     

       12
       12
       +
             hdfsSite = {

     

       13
       13
       +
               # HA Quorum Journal Manager configuration

     

       14
       14
       +
               "dfs.nameservices" = "ns1";

     

       15
       15
       +
               "dfs.ha.namenodes.ns1" = "nn1,nn2";

     

       16
       16
       +
               "dfs.namenode.shared.edits.dir.ns1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1";

     

       17
       17
       +
               "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020";

     

       18
       18
       +
               "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020";

     

       19
       19
       +
               "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022";

     

       20
       20
       +
               "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022";

     

       21
       21
       +
               "dfs.namenode.http-address.ns1.nn1" = "nn1:9870";

     

       22
       22
       +
               "dfs.namenode.http-address.ns1.nn2" = "nn2:9870";

     

       15
       23
        
       

     

       16
       16
       -
             # HA Quorum Journal Manager configuration

     

       17
       17
       -
             "dfs.nameservices" = "ns1";

     

       18
       18
       -
             "dfs.ha.namenodes.ns1" = "nn1,nn2";

     

       19
       19
       -
             "dfs.namenode.shared.edits.dir.ns1.nn1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1";

     

       20
       20
       -
             "dfs.namenode.shared.edits.dir.ns1.nn2" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1";

     

       21
       21
       -
             "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020";

     

       22
       22
       -
             "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020";

     

       23
       23
       -
             "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022";

     

       24
       24
       -
             "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022";

     

       25
       25
       -
             "dfs.namenode.http-address.ns1.nn1" = "nn1:9870";

     

       26
       26
       -
             "dfs.namenode.http-address.ns1.nn2" = "nn2:9870";

     

       24
       24
       +
               # Automatic failover configuration

     

       25
       25
       +
               "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider";

     

       26
       26
       +
               "dfs.ha.automatic-failover.enabled.ns1" = "true";

     

       27
       27
       +
               "dfs.ha.fencing.methods" = "shell(true)";

     

       28
       28
       +
               "ha.zookeeper.quorum" = "zk1:2181";

     

       29
       29
       +
             };

     

       30
       30
       +
             yarnSite = {

     

       31
       31
       +
               "yarn.resourcemanager.zk-address" = "zk1:2181";

     

       32
       32
       +
               "yarn.resourcemanager.ha.enabled" = "true";

     

       33
       33
       +
               "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2";

     

       34
       34
       +
               "yarn.resourcemanager.hostname.rm1" = "rm1";

     

       35
       35
       +
               "yarn.resourcemanager.hostname.rm2" = "rm2";

     

       36
       36
       +
               "yarn.resourcemanager.ha.automatic-failover.enabled" = "true";

     

       37
       37
       +
               "yarn.resourcemanager.cluster-id" = "cluster1";

     

       38
       38
       +
               # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in

     

       39
       39
       +
               # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70

     

       40
       40
       +
               # that causes AM containers to fail otherwise.

     

       41
       41
       +
               "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088";

     

       42
       42
       +
               "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088";

     

       43
       43
       +
             };

     

       44
       44
       +
           in

     

       45
       45
       +
           {

     

       46
       46
       +
             zk1 = { ... }: {

     

       47
       47
       +
               services.zookeeper.enable = true;

     

       48
       48
       +
               networking.firewall.allowedTCPPorts = [ 2181 ];

     

       49
       49
       +
             };

     

       27
       50
        
       

     

       28
       28
       -
             # Automatic failover configuration

     

       29
       29
       -
             "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider";

     

       30
       30
       -
             "dfs.ha.automatic-failover.enabled.ns1" = "true";

     

       31
       31
       -
             "dfs.ha.fencing.methods" = "shell(true)";

     

       32
       32
       -
             "ha.zookeeper.quorum" = "zk1:2181";

     

       33
       33
       -
           };

     

       34
       34
       -
           yarnSiteHA = {

     

       35
       35
       -
             "yarn.resourcemanager.zk-address" = "zk1:2181";

     

       36
       36
       -
             "yarn.resourcemanager.ha.enabled" = "true";

     

       37
       37
       -
             "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2";

     

       38
       38
       -
             "yarn.resourcemanager.hostname.rm1" = "rm1";

     

       39
       39
       -
             "yarn.resourcemanager.hostname.rm2" = "rm2";

     

       40
       40
       -
             "yarn.resourcemanager.ha.automatic-failover.enabled" = "true";

     

       41
       41
       -
             "yarn.resourcemanager.cluster-id" = "cluster1";

     

       42
       42
       -
             # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in

     

       43
       43
       -
             # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70

     

       44
       44
       -
             # that causes AM containers to fail otherwise.

     

       45
       45
       -
             "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088";

     

       46
       46
       -
             "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088";

     

       47
       47
       -
           };

     

       48
       48
       -
         in {

     

       49
       49
       -
           zk1 = { ... }: {

     

       50
       50
       -
             services.zookeeper.enable = true;

     

       51
       51
       -
             networking.firewall.allowedTCPPorts = [ 2181 ];

     

       52
       52
       -
           };

     

       53
       53
       -
       

     

       54
       54
       -
           # HDFS cluster

     

       55
       55
       -
           nn1 = {pkgs, options, ...}: {

     

       56
       56
       -
             services.hadoop = {

     

       57
       57
       -
               inherit package coreSite hdfsSite;

     

       58
       58
       -
               hdfs.namenode.enable = true;

     

       59
       59
       -
               hdfs.zkfc.enable = true;

     

       51
       51
       +
             # HDFS cluster

     

       52
       52
       +
             nn1 = { ... }: {

     

       53
       53
       +
               services.hadoop = {

     

       54
       54
       +
                 inherit package coreSite hdfsSite;

     

       55
       55
       +
                 hdfs.namenode = {

     

       56
       56
       +
                   enable = true;

     

       57
       57
       +
                   openFirewall = true;

     

       58
       58
       +
                 };

     

       59
       59
       +
                 hdfs.zkfc.enable = true;

     

       60
       60
       +
               };

     

       60
       61
        
             };

     

       61
       61
       -
           };

     

       62
       62
       -
           nn2 = {pkgs, options, ...}: {

     

       63
       63
       -
             services.hadoop = {

     

       64
       64
       -
               inherit package coreSite hdfsSite;

     

       65
       65
       -
               hdfs.namenode.enable = true;

     

       66
       66
       -
               hdfs.zkfc.enable = true;

     

       62
       62
       +
             nn2 = { ... }: {

     

       63
       63
       +
               services.hadoop = {

     

       64
       64
       +
                 inherit package coreSite hdfsSite;

     

       65
       65
       +
                 hdfs.namenode = {

     

       66
       66
       +
                   enable = true;

     

       67
       67
       +
                   openFirewall = true;

     

       68
       68
       +
                 };

     

       69
       69
       +
                 hdfs.zkfc.enable = true;

     

       70
       70
       +
               };

     

       67
       71
        
             };

     

       68
       68
       -
           };

     

       69
       72
        
       

     

       70
       70
       -
           jn1 = {pkgs, options, ...}: {

     

       71
       71
       -
             services.hadoop = {

     

       72
       72
       -
               inherit package coreSite hdfsSite;

     

       73
       73
       -
               hdfs.journalnode.enable = true;

     

       73
       73
       +
             jn1 = { ... }: {

     

       74
       74
       +
               services.hadoop = {

     

       75
       75
       +
                 inherit package coreSite hdfsSite;

     

       76
       76
       +
                 hdfs.journalnode = {

     

       77
       77
       +
                   enable = true;

     

       78
       78
       +
                   openFirewall = true;

     

       79
       79
       +
                 };

     

       80
       80
       +
               };

     

       74
       81
        
             };

     

       75
       75
       -
           };

     

       76
       76
       -
           jn2 = {pkgs, options, ...}: {

     

       77
       77
       -
             services.hadoop = {

     

       78
       78
       -
               inherit package coreSite hdfsSite;

     

       79
       79
       -
               hdfs.journalnode.enable = true;

     

       82
       82
       +
             jn2 = { ... }: {

     

       83
       83
       +
               services.hadoop = {

     

       84
       84
       +
                 inherit package coreSite hdfsSite;

     

       85
       85
       +
                 hdfs.journalnode = {

     

       86
       86
       +
                   enable = true;

     

       87
       87
       +
                   openFirewall = true;

     

       88
       88
       +
                 };

     

       89
       89
       +
               };

     

       80
       90
        
             };

     

       81
       81
       -
           };

     

       82
       82
       -
           jn3 = {pkgs, options, ...}: {

     

       83
       83
       -
             services.hadoop = {

     

       84
       84
       -
               inherit package coreSite hdfsSite;

     

       85
       85
       -
               hdfs.journalnode.enable = true;

     

       91
       91
       +
             jn3 = { ... }: {

     

       92
       92
       +
               services.hadoop = {

     

       93
       93
       +
                 inherit package coreSite hdfsSite;

     

       94
       94
       +
                 hdfs.journalnode = {

     

       95
       95
       +
                   enable = true;

     

       96
       96
       +
                   openFirewall = true;

     

       97
       97
       +
                 };

     

       98
       98
       +
               };

     

       86
       99
        
             };

     

       87
       87
       -
           };

     

       88
       100
        
       

     

       89
       89
       -
           dn1 = {pkgs, options, ...}: {

     

       90
       90
       -
             services.hadoop = {

     

       91
       91
       -
               inherit package coreSite hdfsSite;

     

       92
       92
       -
               hdfs.datanode.enable = true;

     

       101
       101
       +
             dn1 = { ... }: {

     

       102
       102
       +
               services.hadoop = {

     

       103
       103
       +
                 inherit package coreSite hdfsSite;

     

       104
       104
       +
                 hdfs.datanode = {

     

       105
       105
       +
                   enable = true;

     

       106
       106
       +
                   openFirewall = true;

     

       107
       107
       +
                 };

     

       108
       108
       +
               };

     

       93
       109
        
             };

     

       94
       94
       -
           };

     

       95
       110
        
       

     

       96
       96
       -
           # YARN cluster

     

       97
       97
       -
           rm1 = {pkgs, options, ...}: {

     

       98
       98
       -
             services.hadoop = {

     

       99
       99
       -
               inherit package coreSite hdfsSite;

     

       100
       100
       -
               yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;

     

       101
       101
       -
               yarn.resourcemanager.enable = true;

     

       111
       111
       +
             # YARN cluster

     

       112
       112
       +
             rm1 = { options, ... }: {

     

       113
       113
       +
               services.hadoop = {

     

       114
       114
       +
                 inherit package coreSite hdfsSite yarnSite;

     

       115
       115
       +
                 yarn.resourcemanager = {

     

       116
       116
       +
                   enable = true;

     

       117
       117
       +
                   openFirewall = true;

     

       118
       118
       +
                 };

     

       119
       119
       +
               };

     

       102
       120
        
             };

     

       103
       103
       -
           };

     

       104
       104
       -
           rm2 = {pkgs, options, ...}: {

     

       105
       105
       -
             services.hadoop = {

     

       106
       106
       -
               inherit package coreSite hdfsSite;

     

       107
       107
       -
               yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;

     

       108
       108
       -
               yarn.resourcemanager.enable = true;

     

       121
       121
       +
             rm2 = { options, ... }: {

     

       122
       122
       +
               services.hadoop = {

     

       123
       123
       +
                 inherit package coreSite hdfsSite yarnSite;

     

       124
       124
       +
                 yarn.resourcemanager = {

     

       125
       125
       +
                   enable = true;

     

       126
       126
       +
                   openFirewall = true;

     

       127
       127
       +
                 };

     

       128
       128
       +
               };

     

       109
       129
        
             };

     

       110
       110
       -
           };

     

       111
       111
       -
           nm1 = {pkgs, options, ...}: {

     

       112
       112
       -
             virtualisation.memorySize = 2048;

     

       113
       113
       -
             services.hadoop = {

     

       114
       114
       -
               inherit package coreSite hdfsSite;

     

       115
       115
       -
               yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA;

     

       116
       116
       -
               yarn.nodemanager.enable = true;

     

       130
       130
       +
             nm1 = { options, ... }: {

     

       131
       131
       +
               virtualisation.memorySize = 2048;

     

       132
       132
       +
               services.hadoop = {

     

       133
       133
       +
                 inherit package coreSite hdfsSite yarnSite;

     

       134
       134
       +
                 yarn.nodemanager = {

     

       135
       135
       +
                   enable = true;

     

       136
       136
       +
                   openFirewall = true;

     

       137
       137
       +
                 };

     

       138
       138
       +
               };

     

       117
       139
        
             };

     

       118
       118
       -
           };

     

       140
       140
       +
             client = { options, ... }: {

     

       141
       141
       +
               services.hadoop = {

     

       142
       142
       +
                 gatewayRole.enable = true;

     

       143
       143
       +
                 inherit package coreSite hdfsSite yarnSite;

     

       144
       144
       +
               };

     

       145
       145
       +
             };

     

       119
       146
        
         };

     

       120
       147
        
       

     

       121
       148
        
         testScript = ''

     
···

       173
       200
        
           # DN should have started by now, but confirm anyway

     

       174
       201
        
           dn1.wait_for_unit("hdfs-datanode")

     

       175
       202
        
           # Print states of namenodes

     

       176
       176
       -
           dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       203
       203
       +
           client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       177
       204
        
           # Wait for cluster to exit safemode

     

       178
       178
       -
           dn1.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")

     

       179
       179
       -
           dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       205
       205
       +
           client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")

     

       206
       206
       +
           client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       180
       207
        
           # test R/W

     

       181
       181
       -
           dn1.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")

     

       182
       182
       -
           assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       208
       208
       +
           client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")

     

       209
       209
       +
           assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       183
       210
        
       

     

       184
       211
        
           # Test NN failover

     

       185
       212
        
           nn1.succeed("systemctl stop hdfs-namenode")

     

       186
       186
       -
           assert "active" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")

     

       187
       187
       -
           dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       188
       188
       -
           assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       213
       213
       +
           assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")

     

       214
       214
       +
           client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       215
       215
       +
           assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       189
       216
        
       

     

       190
       217
        
           nn1.succeed("systemctl start hdfs-namenode")

     

       191
       218
        
           nn1.wait_for_open_port(9870)

     

       192
       219
        
           nn1.wait_for_open_port(8022)

     

       193
       220
        
           nn1.wait_for_open_port(8020)

     

       194
       194
       -
           assert "standby" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")

     

       195
       195
       -
           dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       221
       221
       +
           assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState")

     

       222
       222
       +
           client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat")

     

       196
       223
        
       

     

       197
       224
        
           #### YARN tests ####

     

       198
       225
        
       

     
···

       208
       235
        
           nm1.wait_for_unit("yarn-nodemanager")

     

       209
       236
        
           nm1.wait_for_open_port(8042)

     

       210
       237
        
           nm1.wait_for_open_port(8040)

     

       211
       211
       -
           nm1.wait_until_succeeds("yarn node -list | grep Nodes:1")

     

       212
       212
       -
           nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       213
       213
       -
           nm1.succeed("sudo -u yarn yarn node -list | systemd-cat")

     

       238
       238
       +
           client.wait_until_succeeds("yarn node -list | grep Nodes:1")

     

       239
       239
       +
           client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       240
       240
       +
           client.succeed("sudo -u yarn yarn node -list | systemd-cat")

     

       214
       241
        
       

     

       215
       242
        
           # Test RM failover

     

       216
       243
        
           rm1.succeed("systemctl stop yarn-resourcemanager")

     

       217
       217
       -
           assert "standby" not in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")

     

       218
       218
       -
           nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       244
       244
       +
           assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")

     

       245
       245
       +
           client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       219
       246
        
           rm1.succeed("systemctl start yarn-resourcemanager")

     

       220
       247
        
           rm1.wait_for_unit("yarn-resourcemanager")

     

       221
       248
        
           rm1.wait_for_open_port(8088)

     

       222
       222
       -
           assert "standby" in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")

     

       223
       223
       -
           nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       249
       249
       +
           assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState")

     

       250
       250
       +
           client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat")

     

       224
       251
        
       

     

       225
       225
       -
           assert "Estimated value of Pi is" in nm1.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10")

     

       226
       226
       -
           assert "SUCCEEDED" in nm1.succeed("yarn application -list -appStates FINISHED")

     

       252
       252
       +
           assert "Estimated value of Pi is" in client.succeed("HADOOP_USER_NAME=hdfs yarn jar $(readlink $(which yarn) | sed -r 's~bin/yarn~lib/hadoop-*/share/hadoop/mapreduce/hadoop-mapreduce-examples-*.jar~g') pi 2 10")

     

       253
       253
       +
           assert "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED")

     

       227
       254
        
         '';

     

       228
       255
        
       })

+43 -18

nixos/tests/hadoop/hdfs.nix

···

       1
       1
        
       # Test a minimal HDFS cluster with no HA

     

       2
       2
       -
       import ../make-test-python.nix ({...}: {

     

       3
       3
       -
         nodes = {

     

       4
       4
       -
           namenode = {pkgs, ...}: {

     

       2
       2
       +
       import ../make-test-python.nix ({ package, lib, ... }:

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         name = "hadoop-hdfs";

     

       6
       6
       +
       

     

       7
       7
       +
         nodes = let

     

       8
       8
       +
           coreSite = {

     

       9
       9
       +
             "fs.defaultFS" = "hdfs://namenode:8020";

     

       10
       10
       +
             "hadoop.proxyuser.httpfs.groups" = "*";

     

       11
       11
       +
             "hadoop.proxyuser.httpfs.hosts" = "*";

     

       12
       12
       +
           };

     

       13
       13
       +
           in {

     

       14
       14
       +
           namenode = { pkgs, ... }: {

     

       5
       15
        
             services.hadoop = {

     

       6
       6
       -
               package = pkgs.hadoop;

     

       16
       16
       +
               inherit package;

     

       7
       17
        
               hdfs = {

     

       8
       18
        
                 namenode = {

     

       9
       19
        
                   enable = true;

     

       20
       20
       +
                   openFirewall = true;

     

       10
       21
        
                   formatOnInit = true;

     

       11
       22
        
                 };

     

       12
       12
       -
                 httpfs.enable = true;

     

       23
       23
       +
                 httpfs = {

     

       24
       24
       +
                   # The NixOS hadoop module only support webHDFS on 3.3 and newer

     

       25
       25
       +
                   enable = mkIf (versionAtLeast package.version "3.3") true;

     

       26
       26
       +
                   openFirewall = true;

     

       27
       27
       +
                 };

     

       13
       28
        
               };

     

       14
       14
       -
               coreSite = {

     

       15
       15
       -
                 "fs.defaultFS" = "hdfs://namenode:8020";

     

       16
       16
       -
                 "hadoop.proxyuser.httpfs.groups" = "*";

     

       17
       17
       -
                 "hadoop.proxyuser.httpfs.hosts" = "*";

     

       18
       18
       -
               };

     

       29
       29
       +
               inherit coreSite;

     

       19
       30
        
             };

     

       20
       31
        
           };

     

       21
       21
       -
           datanode = {pkgs, ...}: {

     

       32
       32
       +
           datanode = { pkgs, ... }: {

     

       22
       33
        
             services.hadoop = {

     

       23
       23
       -
               package = pkgs.hadoop;

     

       24
       24
       -
               hdfs.datanode.enable = true;

     

       25
       25
       -
               coreSite = {

     

       26
       26
       -
                 "fs.defaultFS" = "hdfs://namenode:8020";

     

       27
       27
       -
                 "hadoop.proxyuser.httpfs.groups" = "*";

     

       28
       28
       -
                 "hadoop.proxyuser.httpfs.hosts" = "*";

     

       34
       34
       +
               inherit package;

     

       35
       35
       +
               hdfs.datanode = {

     

       36
       36
       +
                 enable = true;

     

       37
       37
       +
                 openFirewall = true;

     

       38
       38
       +
                 dataDirs = [{

     

       39
       39
       +
                   type = "DISK";

     

       40
       40
       +
                   path = "/tmp/dn1";

     

       41
       41
       +
                 }];

     

       29
       42
        
               };

     

       43
       43
       +
               inherit coreSite;

     

       30
       44
        
             };

     

       31
       45
        
           };

     

       32
       46
        
         };

     
···

       37
       51
        
           namenode.wait_for_unit("hdfs-namenode")

     

       38
       52
        
           namenode.wait_for_unit("network.target")

     

       39
       53
        
           namenode.wait_for_open_port(8020)

     

       54
       54
       +
           namenode.succeed("ss -tulpne | systemd-cat")

     

       55
       55
       +
           namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat")

     

       40
       56
        
           namenode.wait_for_open_port(9870)

     

       41
       57
        
       

     

       42
       58
        
           datanode.wait_for_unit("hdfs-datanode")

     

       43
       59
        
           datanode.wait_for_unit("network.target")

     

       60
       60
       +
         '' + ( if versionAtLeast package.version "3" then ''

     

       44
       61
        
           datanode.wait_for_open_port(9864)

     

       45
       62
        
           datanode.wait_for_open_port(9866)

     

       46
       63
        
           datanode.wait_for_open_port(9867)

     

       47
       64
        
       

     

       65
       65
       +
           datanode.succeed("curl -f http://datanode:9864")

     

       66
       66
       +
         '' else ''

     

       67
       67
       +
           datanode.wait_for_open_port(50075)

     

       68
       68
       +
           datanode.wait_for_open_port(50010)

     

       69
       69
       +
           datanode.wait_for_open_port(50020)

     

       70
       70
       +
       

     

       71
       71
       +
           datanode.succeed("curl -f http://datanode:50075")

     

       72
       72
       +
         '' ) + ''

     

       48
       73
        
           namenode.succeed("curl -f http://namenode:9870")

     

       49
       49
       -
           datanode.succeed("curl -f http://datanode:9864")

     

       50
       74
        
       

     

       51
       75
        
           datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait")

     

       52
       76
        
           datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile")

     

       53
       77
        
           assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile")

     

       54
       78
        
       

     

       79
       79
       +
         '' + optionalString ( versionAtLeast package.version "3.3" ) ''

     

       55
       80
        
           namenode.wait_for_unit("hdfs-httpfs")

     

       56
       81
        
           namenode.wait_for_open_port(14000)

     

       57
       82
        
           assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1")

+21 -13

nixos/tests/hadoop/yarn.nix

···

       1
       1
        
       # This only tests if YARN is able to start its services

     

       2
       2
       -
       import ../make-test-python.nix ({...}: {

     

       2
       2
       +
       import ../make-test-python.nix ({ package, ... }: {

     

       3
       3
       +
         name = "hadoop-yarn";

     

       4
       4
       +
       

     

       3
       5
        
         nodes = {

     

       4
       4
       -
           resourcemanager = {pkgs, ...}: {

     

       5
       5
       -
             services.hadoop.package = pkgs.hadoop;

     

       6
       6
       -
             services.hadoop.yarn.resourcemanager.enable = true;

     

       7
       7
       -
             services.hadoop.yarnSite = {

     

       8
       8
       -
               "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler";

     

       6
       6
       +
           resourcemanager = { ... }: {

     

       7
       7
       +
             services.hadoop = {

     

       8
       8
       +
               inherit package;

     

       9
       9
       +
               yarn.resourcemanager = {

     

       10
       10
       +
                 enable = true;

     

       11
       11
       +
                 openFirewall = true;

     

       12
       12
       +
               };

     

       9
       13
        
             };

     

       10
       14
        
           };

     

       11
       11
       -
           nodemanager = {pkgs, ...}: {

     

       12
       12
       -
             services.hadoop.package = pkgs.hadoop;

     

       13
       13
       -
             services.hadoop.yarn.nodemanager.enable = true;

     

       14
       14
       -
             services.hadoop.yarnSite = {

     

       15
       15
       -
               "yarn.resourcemanager.hostname" = "resourcemanager";

     

       16
       16
       -
               "yarn.nodemanager.log-dirs" = "/tmp/userlogs";

     

       15
       15
       +
           nodemanager = { options, lib, ... }: {

     

       16
       16
       +
             services.hadoop = {

     

       17
       17
       +
               inherit package;

     

       18
       18
       +
               yarn.nodemanager = {

     

       19
       19
       +
                 enable = true;

     

       20
       20
       +
                 openFirewall = true;

     

       21
       21
       +
               };

     

       22
       22
       +
               yarnSite = options.services.hadoop.yarnSite.default // {

     

       23
       23
       +
                 "yarn.resourcemanager.hostname" = "resourcemanager";

     

       24
       24
       +
                 "yarn.nodemanager.log-dirs" = "/tmp/userlogs";

     

       25
       25
       +
               };

     

       17
       26
        
             };

     

       18
       27
        
           };

     

       19
       19
       -
       

     

       20
       28
        
         };

     

       21
       29
        
       

     

       22
       30
        
         testScript = ''

+1 -1

nixos/tests/nextcloud/default.nix

···

       18
       18
        
           };

     

       19
       19
        
         })

     

       20
       20
        
       { }

     

       21
       21
       -
         [ 21 22 23 ]

     

       21
       21
       +
         [ 22 23 ]

+11 -2

pkgs/applications/audio/mopidy/ytmusic.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "mopidy-ytmusic";

     

       5
       5
       -
         version = "0.3.2";

     

       5
       5
       +
         version = "0.3.5";

     

       6
       6
        
       

     

       7
       7
        
         src = python3Packages.fetchPypi {

     

       8
       8
        
           inherit version;

     

       9
       9
        
           pname = "Mopidy-YTMusic";

     

       10
       10
       -
           sha256 = "sha256-BZtW+qHsTnOMj+jdAFI8ZMwGxJc9lNosgPJZGbt4JgU=";

     

       10
       10
       +
           sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           substituteInPlace setup.py \

     

       15
       15
       +
             --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0'

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       13
       18
        
         propagatedBuildInputs = [

     

       14
       19
        
           mopidy

     

       15
       20
        
           python3Packages.ytmusicapi

     

       16
       21
        
           python3Packages.pytube

     

       17
       22
        
         ];

     

       18
       23
        
       

     

       24
       24
       +
         pythonImportsCheck = [ "mopidy_ytmusic" ];

     

       25
       25
       +
       

     

       26
       26
       +
         # has no tests

     

       19
       27
        
         doCheck = false;

     

       20
       28
        
       

     

       21
       29
        
         meta = with lib; {

     

       22
       30
        
           description = "Mopidy extension for playing music from YouTube Music";

     

       31
       31
       +
           homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic";

     

       23
       32
        
           license = licenses.asl20;

     

       24
       33
        
           maintainers = [ maintainers.nickhu ];

     

       25
       34
        
         };

+83

pkgs/applications/editors/lapce/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , rustPlatform

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , python3

     

       8
       8
       +
       , perl

     

       9
       9
       +
       , freetype

     

       10
       10
       +
       , fontconfig

     

       11
       11
       +
       , libxkbcommon

     

       12
       12
       +
       , xcbutil

     

       13
       13
       +
       , libX11

     

       14
       14
       +
       , libXcursor

     

       15
       15
       +
       , libXrandr

     

       16
       16
       +
       , libXi

     

       17
       17
       +
       , vulkan-loader

     

       18
       18
       +
       , copyDesktopItems

     

       19
       19
       +
       , makeDesktopItem

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       rustPlatform.buildRustPackage rec {

     

       23
       23
       +
         pname = "lapce";

     

       24
       24
       +
         version = "0.0.10";

     

       25
       25
       +
       

     

       26
       26
       +
         src = fetchFromGitHub {

     

       27
       27
       +
           owner = "lapce";

     

       28
       28
       +
           repo = pname;

     

       29
       29
       +
           rev = "v${version}";

     

       30
       30
       +
           sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE=";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         cargoPatches = [ ./fix-version.patch ];

     

       34
       34
       +
       

     

       35
       35
       +
         cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI=";

     

       36
       36
       +
       

     

       37
       37
       +
         nativeBuildInputs = [

     

       38
       38
       +
           cmake

     

       39
       39
       +
           pkg-config

     

       40
       40
       +
           python3

     

       41
       41
       +
           perl

     

       42
       42
       +
           copyDesktopItems

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         buildInputs = [

     

       46
       46
       +
           freetype

     

       47
       47
       +
           fontconfig

     

       48
       48
       +
           libxkbcommon

     

       49
       49
       +
           xcbutil

     

       50
       50
       +
           libX11

     

       51
       51
       +
           libXcursor

     

       52
       52
       +
           libXrandr

     

       53
       53
       +
           libXi

     

       54
       54
       +
           vulkan-loader

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       57
       57
       +
         # Add missing vulkan dependency to rpath

     

       58
       58
       +
         preFixup = ''

     

       59
       59
       +
           patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce

     

       60
       60
       +
         '';

     

       61
       61
       +
       

     

       62
       62
       +
         postInstall = ''

     

       63
       63
       +
           install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg

     

       64
       64
       +
         '';

     

       65
       65
       +
       

     

       66
       66
       +
         desktopItems = [ (makeDesktopItem {

     

       67
       67
       +
           name = "lapce";

     

       68
       68
       +
           exec = "lapce %F";

     

       69
       69
       +
           icon = "lapce";

     

       70
       70
       +
           desktopName = "Lapce";

     

       71
       71
       +
           comment = meta.description;

     

       72
       72
       +
           genericName = "Code Editor";

     

       73
       73
       +
           categories = [ "Development" "Utility" "TextEditor" ];

     

       74
       74
       +
         }) ];

     

       75
       75
       +
       

     

       76
       76
       +
         meta = with lib; {

     

       77
       77
       +
           description = "Lightning-fast and Powerful Code Editor written in Rust";

     

       78
       78
       +
           homepage = "https://github.com/lapce/lapce";

     

       79
       79
       +
           license = with licenses; [ asl20 ];

     

       80
       80
       +
           maintainers = with maintainers; [ elliot ];

     

       81
       81
       +
           broken = stdenv.isDarwin;

     

       82
       82
       +
         };

     

       83
       83
       +
       }

+31

pkgs/applications/editors/lapce/fix-version.patch

···

       1
       1
       +
       diff --git a/Cargo.lock b/Cargo.lock

     

       2
       2
       +
       index bc9a0f8..45a74ad 100644

     

       3
       3
       +
       --- a/Cargo.lock

     

       4
       4
       +
       +++ b/Cargo.lock

     

       5
       5
       +
       @@ -2165,7 +2165,7 @@ dependencies = [

     

       6
       6
       +
        

     

       7
       7
       +
        [[package]]

     

       8
       8
       +
        name = "lapce"

     

       9
       9
       +
       -version = "0.0.9"

     

       10
       10
       +
       +version = "0.0.10"

     

       11
       11
       +
        dependencies = [

     

       12
       12
       +
         "lapce-core",

     

       13
       13
       +
         "lapce-proxy",

     

       14
       14
       +
       @@ -2173,7 +2173,7 @@ dependencies = [

     

       15
       15
       +
        

     

       16
       16
       +
        [[package]]

     

       17
       17
       +
        name = "lapce-core"

     

       18
       18
       +
       -version = "0.0.9"

     

       19
       19
       +
       +version = "0.0.10"

     

       20
       20
       +
        dependencies = [

     

       21
       21
       +
         "Inflector",

     

       22
       22
       +
         "alacritty_terminal 0.15.0",

     

       23
       23
       +
       @@ -2233,7 +2233,7 @@ dependencies = [

     

       24
       24
       +
        

     

       25
       25
       +
        [[package]]

     

       26
       26
       +
        name = "lapce-proxy"

     

       27
       27
       +
       -version = "0.0.9"

     

       28
       28
       +
       +version = "0.0.10"

     

       29
       29
       +
        dependencies = [

     

       30
       30
       +
         "alacritty_terminal 0.16.0-rc2",

     

       31
       31
       +
         "anyhow",

+24

pkgs/applications/editors/vscode/extensions/default.nix

···

       1374
       1374
        
               };

     

       1375
       1375
        
             };

     

       1376
       1376
        
       

     

       1377
       1377
       +
             marp-team.marp-vscode = buildVscodeMarketplaceExtension {

     

       1378
       1378
       +
               mktplcRef = {

     

       1379
       1379
       +
                 name = "marp-vscode";

     

       1380
       1380
       +
                 publisher = "marp-team";

     

       1381
       1381
       +
                 version = "1.5.0";

     

       1382
       1382
       +
                 sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs";

     

       1383
       1383
       +
               };

     

       1384
       1384
       +
               meta = {

     

       1385
       1385
       +
                 license = lib.licenses.mit;

     

       1386
       1386
       +
               };

     

       1387
       1387
       +
             };

     

       1388
       1388
       +
       

     

       1377
       1389
        
             mikestead.dotenv = buildVscodeMarketplaceExtension {

     

       1378
       1390
        
               mktplcRef = {

     

       1379
       1391
        
                 name = "dotenv";

     
···

       1676
       1688
        
               };

     

       1677
       1689
        
               meta = {

     

       1678
       1690
        
                 license = lib.licenses.mit;

     

       1691
       1691
       +
               };

     

       1692
       1692
       +
             };

     

       1693
       1693
       +
       

     

       1694
       1694
       +
             richie5um2.snake-trail = buildVscodeMarketplaceExtension {

     

       1695
       1695
       +
               mktplcRef = {

     

       1696
       1696
       +
                 name = "snake-trail";

     

       1697
       1697
       +
                 publisher = "richie5um2";

     

       1698
       1698
       +
                 version = "0.6.0";

     

       1699
       1699
       +
                 sha256 = "0wkpq9f48hplrgabb0v1ij6fc4sb8h4a93dagw4biprhnnm3qx49";

     

       1700
       1700
       +
               };

     

       1701
       1701
       +
               meta = with lib; {

     

       1702
       1702
       +
                 license = licenses.mit;

     

       1679
       1703
        
               };

     

       1680
       1704
        
             };

     

       1681
       1705

+4 -4

pkgs/applications/misc/kratos/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kratos";

     

       5
       5
       -
         version = "0.8.0-alpha.3";

     

       5
       5
       +
         version = "0.8.3-alpha.1.pre.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ory";

     

       9
       9
        
           repo = "kratos";

     

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

     

       11
       11
       -
           sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg";

     

       11
       11
       +
           sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008";

     

       14
       14
       +
         vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6";

     

       15
       15
        
       

     

       16
       16
        
         subPackages = [ "." ];

     

       17
       17
        
       

     
···

       25
       25
        
              test/e2e/run.sh

     

       26
       26
        
              script/testenv.sh

     

       27
       27
        
              script/test-envs.sh

     

       28
       28
       -
              persistence/sql/migratest/update_fixtures.sh

     

       28
       28
       +
              script/debug-entrypoint.sh

     

       29
       29
        
           )

     

       30
       30
        
           patchShebangs "''${files[@]}"

     

       31
       31

+2 -2

pkgs/applications/misc/mob/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildGoPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       

     

       5
       5
       -
       , withSpeech ? true

     

       4
       4
       +
       , stdenv

     

       5
       5
       +
       , withSpeech ? !stdenv.isDarwin

     

       6
       6
        
       , makeWrapper

     

       7
       7
        
       , espeak-ng

     

       8
       8
        
       }:

+3 -3

pkgs/applications/misc/stork/default.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "stork";

     

       12
       12
       -
         version = "1.4.0";

     

       12
       12
       +
         version = "1.4.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "jameslittle230";

     

       16
       16
        
           repo = "stork";

     

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

     

       18
       18
       -
           sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60=";

     

       18
       18
       +
           sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0=";

     

       21
       21
       +
         cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs=";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkg-config ];

     

       24
       24

+2 -2

pkgs/applications/networking/browsers/brave/default.nix

···

       91
       91
        
       

     

       92
       92
        
       stdenv.mkDerivation rec {

     

       93
       93
        
         pname = "brave";

     

       94
       94
       -
         version = "1.36.111";

     

       94
       94
       +
         version = "1.36.116";

     

       95
       95
        
       

     

       96
       96
        
         src = fetchurl {

     

       97
       97
        
           url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

     

       98
       98
       -
           sha256 = "bXZsUqLaP43wJV3Cehgblw1G179HgGhToSL36v5QseA=";

     

       98
       98
       +
           sha256 = "whGV0VgCm6JSyrcFQTKbM35b/qLQdBmChTrYuyC+OlI=";

     

       99
       99
        
         };

     

       100
       100
        
       

     

       101
       101
        
         dontConfigure = true;

+7 -7

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       1
       1
        
       {

     

       2
       2
        
         "stable": {

     

       3
       3
       -
           "version": "99.0.4844.51",

     

       4
       4
       -
           "sha256": "1qxsn8zvvvsnn0k7nn606rhaial8ikrlfh175msqpp50xibjxicp",

     

       5
       5
       -
           "sha256bin64": "04kqfppa88g2q54vp53avyyhqzrxljz49p4wqk76kq7fz2rm94x1",

     

       3
       3
       +
           "version": "99.0.4844.74",

     

       4
       4
       +
           "sha256": "165vzxv3xi4r9ia3qnqsr4p9ai0344w1pnq03c6jdq7x613lcprd",

     

       5
       5
       +
           "sha256bin64": "1xzr7qv4rcardl3apr8w22dn81lzqkklhp26qqlbdcylacqqji04",

     

       6
       6
        
           "deps": {

     

       7
       7
        
             "gn": {

     

       8
       8
        
               "version": "2022-01-10",

     
···

       12
       12
        
             }

     

       13
       13
        
           },

     

       14
       14
        
           "chromedriver": {

     

       15
       15
       -
             "version": "99.0.4844.35",

     

       16
       16
       -
             "sha256_linux": "1q10mn34s03zy0nqcgrjd7ry53g4paxpwcki1bgicpcrwnjlzc3y",

     

       17
       17
       -
             "sha256_darwin": "0mcfry8vqqc8n1sgyn2azr8pc4lgjnkpnhz0ggjqm12njq0lfjfx",

     

       18
       18
       -
             "sha256_darwin_aarch64": "19wpqd5mq2vrgma899vbbdqhg660x47v4ppbz1r8dcg5r5y93x3s"

     

       15
       15
       +
             "version": "99.0.4844.51",

     

       16
       16
       +
             "sha256_linux": "1r5wbcfbj9s216jyjasmiscsrsix9ap3pplp12rznrwn4898p51y",

     

       17
       17
       +
             "sha256_darwin": "1nak8p5hdrw94lx73m9c110zrwag4qr6487dhplm3qfrnrkdh8wp",

     

       18
       18
       +
             "sha256_darwin_aarch64": "0hkcx6a8bcjlbmp6z3ld23mi1kpyjn2g7m3ns9qw6ns4x3rn5i3r"

     

       19
       19
        
           }

     

       20
       20
        
         },

     

       21
       21
        
         "beta": {

+4 -4

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

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "0.27.3";

     

       5
       5
       -
         sha256 = "08ax1033456hfm5qz0r671xm5ig0047nqp7xffyn9za498bm4i5q";

     

       6
       6
       -
         manifestsSha256 = "165kspq10nvlihcb1460qmbw5r1mlzs5gliw01qa4mymvzmlggk7";

     

       4
       4
       +
         version = "0.27.4";

     

       5
       5
       +
         sha256 = "06951i332gr17nsbns8mh4kcjilqfw5w95shaznpaksx93f554g0";

     

       6
       6
       +
         manifestsSha256 = "0fvzh7j3vi5hw8jbw2gisjnn53bffwnp7zm3dwcbv3svwpw7823d";

     

       7
       7
        
       

     

       8
       8
        
         manifests = fetchzip {

     

       9
       9
        
           url =

     
···

       23
       23
        
           inherit sha256;

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         vendorSha256 = "sha256-ENSfec7iSKOkILgVCVnORpAia4D+vBjQAUXDA7EIvVQ=";

     

       26
       26
       +
         vendorSha256 = "sha256-7sHLXjyYMWSFckDPeVGJYK+nwhbRpD76tV334PCVYwA=";

     

       27
       27
        
       

     

       28
       28
        
         postUnpack = ''

     

       29
       29
        
           cp -r ${manifests} source/cmd/flux/manifests

+39 -26

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

···

       15
       15
        
       , zlib

     

       16
       16
        
       , zstd

     

       17
       17
        
       , openssl

     

       18
       18
       +
       , glibc

     

       19
       19
       +
       , nixosTests

     

       18
       20
        
       }:

     

       19
       21
        
       

     

       20
       22
        
       with lib;

     
···

       22
       24
        
       assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];

     

       23
       25
        
       

     

       24
       26
        
       let

     

       25
       25
       -
         common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "" }:

     

       27
       27
       +
         common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }:

     

       26
       28
        
           stdenv.mkDerivation rec {

     

       27
       29
        
             inherit pname version jdk libPatches untarDir openssl;

     

       28
       30
        
             src = fetchurl {

     
···

       38
       40
        
             installPhase = ''

     

       39
       41
        
               mkdir -p $out/{lib/${untarDir}/conf,bin,lib}

     

       40
       42
        
               mv * $out/lib/${untarDir}

     

       41
       41
       -
       

     

       43
       43
       +
             '' + optionalString stdenv.isLinux ''

     

       44
       44
       +
               # All versions need container-executor, but some versions can't use autoPatchelf because of broken SSL versions

     

       45
       45
       +
               patchelf --set-interpreter ${glibc.out}/lib64/ld-linux-x86-64.so.2 $out/lib/${untarDir}/bin/container-executor

     

       46
       46
       +
             '' + ''

     

       42
       47
        
               for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do

     

       43
       48
        
                 makeWrapper "$n" "$out/bin/$(basename $n)"\

     

       44
       49
        
                   --set-default JAVA_HOME ${jdk.home}\

     
···

       49
       54
        
               done

     

       50
       55
        
             '' + libPatches;

     

       51
       56
        
       

     

       57
       57
       +
             passthru = { inherit tests; };

     

       58
       58
       +
       

     

       52
       59
        
             meta = {

     

       53
       60
        
               homepage = "https://hadoop.apache.org/";

     

       54
       61
        
               description = "Framework for distributed processing of large data sets across clusters of computers";

     
···

       73
       80
        
       {

     

       74
       81
        
         # Different version of hadoop support different java runtime versions

     

       75
       82
        
         # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions

     

       76
       76
       -
         hadoop_3_3 =

     

       77
       77
       -
           common

     

       78
       78
       -
             (rec {

     

       79
       79
       -
               pname = "hadoop";

     

       80
       80
       -
               version = "3.3.1";

     

       81
       81
       -
               untarDir = "${pname}-${version}";

     

       82
       82
       -
               sha256 = rec {

     

       83
       83
       -
                 x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";

     

       84
       84
       -
                 x86_64-darwin = x86_64-linux;

     

       85
       85
       -
                 aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz";

     

       86
       86
       -
                 aarch64-darwin = aarch64-linux;

     

       87
       87
       -
               };

     

       88
       88
       -
       

     

       89
       89
       -
               inherit openssl;

     

       90
       90
       -
               nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];

     

       91
       91
       -
               libPatches = ''

     

       92
       92
       -
                 ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2

     

       93
       93
       -
                 ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/

     

       94
       94
       -
                 ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/

     

       95
       95
       -
                 ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/

     

       96
       96
       -
                 ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/

     

       97
       97
       -
               '' + optionalString stdenv.isLinux "patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0";

     

       98
       98
       -
               jdk = jdk11_headless;

     

       99
       99
       -
             });

     

       83
       83
       +
         hadoop_3_3 = common rec {

     

       84
       84
       +
           pname = "hadoop";

     

       85
       85
       +
           version = "3.3.1";

     

       86
       86
       +
           untarDir = "${pname}-${version}";

     

       87
       87
       +
           sha256 = rec {

     

       88
       88
       +
             x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd";

     

       89
       89
       +
             x86_64-darwin = x86_64-linux;

     

       90
       90
       +
             aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz";

     

       91
       91
       +
             aarch64-darwin = aarch64-linux;

     

       92
       92
       +
           };

     

       93
       93
       +
           jdk = jdk11_headless;

     

       94
       94
       +
           inherit openssl;

     

       95
       95
       +
           # TODO: Package and add Intel Storage Acceleration Library

     

       96
       96
       +
           nativeLibs = [ stdenv.cc.cc.lib protobuf3_7 zlib snappy ];

     

       97
       97
       +
           libPatches = ''

     

       98
       98
       +
             ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/${untarDir}/lib/native/libsasl2.so.2

     

       99
       99
       +
             ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/${untarDir}/lib/native/

     

       100
       100
       +
             ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/${untarDir}/lib/native/

     

       101
       101
       +
             ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/${untarDir}/lib/native/

     

       102
       102
       +
             ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/${untarDir}/lib/native/

     

       103
       103
       +
           '' + optionalString stdenv.isLinux ''

     

       104
       104
       +
             # libjvm.so for Java >=11

     

       105
       105
       +
             patchelf --add-rpath ${jdk.home}/lib/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0

     

       106
       106
       +
             # Java 8 has libjvm.so at a different path

     

       107
       107
       +
             patchelf --add-rpath ${jdk.home}/jre/lib/amd64/server $out/lib/${untarDir}/lib/native/libnativetask.so.1.0.0

     

       108
       108
       +
           '';

     

       109
       109
       +
           tests = nixosTests.hadoop;

     

       110
       110
       +
         };

     

       100
       111
        
         hadoop_3_2 = common rec {

     

       101
       112
        
           pname = "hadoop";

     

       102
       113
        
           version = "3.2.2";

     
···

       104
       115
        
           jdk = jdk8_headless;

     

       105
       116
        
           # not using native libs because of broken openssl_1_0_2 dependency

     

       106
       117
        
           # can be manually overriden

     

       118
       118
       +
           tests = nixosTests.hadoop_3_2;

     

       107
       119
        
         };

     

       108
       120
        
         hadoop2 = common rec {

     

       109
       121
        
           pname = "hadoop";

     

       110
       122
        
           version = "2.10.1";

     

       111
       123
        
           sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97";

     

       112
       124
        
           jdk = jdk8_headless;

     

       125
       125
       +
           tests = nixosTests.hadoop2;

     

       113
       126
        
         };

     

       114
       127
        
       }

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "qbec";

     

       5
       5
       -
         version = "0.15.1";

     

       5
       5
       +
         version = "0.15.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "splunk";

     

       9
       9
        
           repo = "qbec";

     

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

     

       11
       11
       -
           sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo=";

     

       11
       11
       +
           sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc=";

     

       14
       14
       +
         vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+33 -22

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

···

       1
       1
       -
       { lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop

     

       2
       2
       -
       , RSupport? true, R

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
       , makeWrapper

     

       5
       5
       +
       , jdk8

     

       6
       6
       +
       , python3Packages

     

       7
       7
       +
       , extraPythonPackages ? [ ]

     

       8
       8
       +
       , coreutils

     

       9
       9
       +
       , hadoop

     

       10
       10
       +
       , RSupport ? true

     

       11
       11
       +
       , R

     

       3
       12
        
       }:

     

       4
       13
        
       

     

       5
       14
        
       with lib;

     

       6
       15
        
       

     

       7
       16
        
       let

     

       8
       8
       -
         spark = { pname, version, src }:

     

       17
       17
       +
         spark = { pname, version, sha256 }:

     

       9
       18
        
           stdenv.mkDerivation rec {

     

       10
       10
       -
             inherit pname version src;

     

       19
       19
       +
             inherit pname version;

     

       20
       20
       +
             src = fetchzip {

     

       21
       21
       +
               url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";

     

       22
       22
       +
               sha256 = sha256;

     

       23
       23
       +
             };

     

       11
       24
        
             nativeBuildInputs = [ makeWrapper ];

     

       12
       25
        
             buildInputs = [ jdk8 python3Packages.python ]

     

       13
       26
        
               ++ extraPythonPackages

     
···

       45
       58
        
             '';

     

       46
       59
        
       

     

       47
       60
        
             meta = {

     

       48
       48
       -
               description      = "Apache Spark is a fast and general engine for large-scale data processing";

     

       49
       49
       -
               homepage         = "https://spark.apache.org/";

     

       50
       50
       -
               license          = lib.licenses.asl20;

     

       51
       51
       -
               platforms        = lib.platforms.all;

     

       52
       52
       -
               maintainers      = with maintainers; [ thoughtpolice offline kamilchm illustris ];

     

       61
       61
       +
               description = "Apache Spark is a fast and general engine for large-scale data processing";

     

       62
       62
       +
               homepage = "https://spark.apache.org/";

     

       63
       63
       +
               license = lib.licenses.asl20;

     

       64
       64
       +
               platforms = lib.platforms.all;

     

       65
       65
       +
               maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];

     

       53
       66
        
               repositories.git = "git://git.apache.org/spark.git";

     

       54
       67
        
             };

     

       55
       68
        
           };

     

       56
       56
       -
       in {

     

       57
       57
       -
         spark3 = spark rec {

     

       69
       69
       +
       in

     

       70
       70
       +
       {

     

       71
       71
       +
         spark_3_2 = spark rec {

     

       72
       72
       +
           pname = "spark";

     

       73
       73
       +
           version = "3.2.1";

     

       74
       74
       +
           sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";

     

       75
       75
       +
         };

     

       76
       76
       +
         spark_3_1 = spark rec {

     

       58
       77
        
           pname = "spark";

     

       59
       78
        
           version = "3.1.2";

     

       60
       60
       -
       

     

       61
       61
       -
           src = fetchzip {

     

       62
       62
       -
             url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";

     

       63
       63
       -
             sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";

     

       64
       64
       -
           };

     

       79
       79
       +
           sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";

     

       65
       80
        
         };

     

       66
       66
       -
         spark2 = spark rec {

     

       81
       81
       +
         spark_2_4 = spark rec {

     

       67
       82
        
           pname = "spark";

     

       68
       83
        
           version = "2.4.8";

     

       69
       69
       -
       

     

       70
       70
       -
           src = fetchzip {

     

       71
       71
       -
             url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";

     

       72
       72
       -
             sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";

     

       73
       73
       -
           };

     

       84
       84
       +
           sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";

     

       74
       85
        
         };

     

       75
       86
        
       }

+2 -2

pkgs/applications/networking/instant-messengers/cinny/default.nix

···

       4
       4
        
         configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);

     

       5
       5
        
       in stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "cinny";

     

       7
       7
       -
         version = "1.8.0";

     

       7
       7
       +
         version = "1.8.1";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";

     

       11
       11
       -
           sha256 = "0pbapzl3pfx87ns4vp7088kkhl34c0ihbq90r3d0iz6sa16mcs79";

     

       11
       11
       +
           sha256 = "13jd7hihkw3nlcj0m157z6qix61v6zjs52h5zmw2agm47qmv0w6z";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

+7 -5

pkgs/applications/networking/mailreaders/himalaya/default.nix

···

       12
       12
        
       

     

       13
       13
        
       rustPlatform.buildRustPackage rec {

     

       14
       14
        
         pname = "himalaya";

     

       15
       15
       -
         version = "0.5.8";

     

       15
       15
       +
         version = "0.5.9";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "soywod";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           sha256 = "sha256-Ejaspj0YpkGmfO1omOhx8ZDg77J7NqC32mw5Cd3K1FM=";

     

       21
       21
       +
           sha256 = "sha256-g+ySsHnJ4FpmJLEjlutuiJmMkKI3Jb+HkWi1WBIo1aw=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         cargoSha256 = "sha256-xce2iHrqTxIirrut4dN7526pjE4T+ruaDS44jr+KeGs=";

     

       24
       24
       +
         cargoSha256 = "sha256-NkkONl57zSilElVAOXUBxWnims4+EIVkkTdExbeBAaQ=";

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]

     

       27
       27
        
           ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];

     
···

       34
       34
        
             openssl

     

       35
       35
        
           ];

     

       36
       36
        
       

     

       37
       37
       +
         # flag added because without end-to-end testing is ran which requires

     

       38
       38
       +
         # additional tooling and servers to test

     

       37
       39
        
         cargoTestFlags = [ "--lib" ];

     

       38
       40
        
       

     

       39
       41
        
         postInstall = lib.optionalString enableCompletions ''

     
···

       45
       47
        
         '';

     

       46
       48
        
       

     

       47
       49
        
         meta = with lib; {

     

       48
       48
       -
           description = "CLI email client written in Rust";

     

       50
       50
       +
           description = "Command-line interface for email management";

     

       49
       51
        
           homepage = "https://github.com/soywod/himalaya";

     

       50
       52
        
           changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";

     

       51
       53
        
           license = licenses.bsdOriginal;

     

       52
       52
       -
           maintainers = with maintainers; [ yanganto ];

     

       54
       54
       +
           maintainers = with maintainers; [ toastal yanganto ];

     

       53
       55
        
         };

     

       54
       56
        
       }

+2 -2

pkgs/applications/science/computer-architecture/qtrvsim/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "QtRVSim";

     

       5
       5
       -
         version = "0.9.1";

     

       5
       5
       +
         version = "0.9.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cvut";

     

       9
       9
        
           repo = "qtrvsim";

     

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

     

       11
       11
       -
           sha256 = "AOksVS0drIBnK4RCxZw40yVxf4E8GjG9kU0rIZsY9gA=";

     

       11
       11
       +
           sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake wrapQtAppsHook ];

+2 -2

pkgs/applications/video/freetube/default.nix

···

       23
       23
        
         installPhase = ''

     

       24
       24
        
           runHook preInstall

     

       25
       25
        
       

     

       26
       26
       -
           mkdir -p $out/bin $out/share/${pname} $out/share/applications

     

       26
       26
       +
           mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/scalable/apps

     

       27
       27
        
       

     

       28
       28
        
           cp -a ${appimageContents}/{locales,resources} $out/share/${pname}

     

       29
       29
        
           cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop

     

       30
       30
       -
           cp -a ${appimageContents}/usr/share/icons $out/share

     

       30
       30
       +
           cp -a ${appimageContents}/usr/share/icons/hicolor/scalable/freetube.svg $out/share/icons/hicolor/scalable/apps

     

       31
       31
        
       

     

       32
       32
        
           substituteInPlace $out/share/applications/${pname}.desktop \

     

       33
       33
        
             --replace 'Exec=AppRun' 'Exec=${pname}'

+5 -3

pkgs/applications/video/smplayer/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "smplayer";

     

       11
       11
       -
         version = "21.10.0";

     

       11
       11
       +
         version = "22.2.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "smplayer-dev";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8=";

     

       17
       17
       +
           hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     
···

       22
       22
        
           wrapQtAppsHook

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       -
         buildInputs = [ qtscript ];

     

       25
       25
       +
         buildInputs = [

     

       26
       26
       +
           qtscript

     

       27
       27
       +
         ];

     

       26
       28
        
       

     

       27
       29
        
         dontUseQmakeConfigure = true;

     

       28
       30

+26

pkgs/data/fonts/borg-sans-mono/default.nix

···

       1
       1
       +
       { lib, fetchzip }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         pname = "borg-sans-mono";

     

       5
       5
       +
         version = "0.2.0";

     

       6
       6
       +
       in

     

       7
       7
       +
       fetchzip {

     

       8
       8
       +
         name = "${pname}-${version}";

     

       9
       9
       +
       

     

       10
       10
       +
         # https://github.com/marnen/borg-sans-mono/issues/19

     

       11
       11
       +
         url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip";

     

       12
       12
       +
         sha256 = "1gz4ab0smw76ih5cs2l3n92c77nv7ld5zghq42avjsfhxrc2n5ri";

     

       13
       13
       +
       

     

       14
       14
       +
         postFetch = ''

     

       15
       15
       +
           mkdir -p $out/share/fonts

     

       16
       16
       +
           unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype

     

       17
       17
       +
         '';

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "Droid Sans Mono Slashed + Hasklig-style ligatures";

     

       21
       21
       +
           homepage = "https://github.com/marnen/borg-sans-mono";

     

       22
       22
       +
           license = licenses.asl20;

     

       23
       23
       +
           platforms = platforms.all;

     

       24
       24
       +
           maintainers = with maintainers; [ atila ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+2 -2

pkgs/data/fonts/vazir-fonts/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "vazir-fonts";

     

       5
       5
       -
         version = "30.1.0";

     

       5
       5
       +
         version = "32.0.0";

     

       6
       6
        
       in fetchFromGitHub {

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     
···

       14
       14
        
           tar xf $downloadedFile --strip=1

     

       15
       15
        
           find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;

     

       16
       16
        
         '';

     

       17
       17
       -
         sha256 = "sha256-J1l6rBFgaXFtGnK0pH7GbaYTt5TI/OevjZrXmaEgkB4=";

     

       17
       17
       +
         sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           homepage = "https://github.com/rastikerdar/vazir-font";

+2 -2

pkgs/data/icons/kora-icon-theme/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec  {

     

       4
       4
        
         pname = "kora-icon-theme";

     

       5
       5
       -
         version = "1.5.0";

     

       5
       5
       +
         version = "1.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub  {

     

       8
       8
        
           owner = "bikass";

     

       9
       9
        
           repo = "kora";

     

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

     

       11
       11
       -
           sha256 = "sha256-kUgNj7KuxsQ/BvQ0ORl3xzEm9gv69+2PS0Bgv8i/S9U=";

     

       11
       11
       +
           sha256 = "sha256-3TKjd2Lblb+/zFq7rkdgnD1dJU3kis7QZi7Ui74IWzA=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

+9 -1

pkgs/development/compilers/crystal/default.nix

···

       33
       33
        
           i686-linux = "linux-i686";

     

       34
       34
        
           x86_64-darwin = "darwin-x86_64";

     

       35
       35
        
           aarch64-darwin = "darwin-universal";

     

       36
       36
       +
           aarch64-linux = "linux-aarch64";

     

       36
       37
        
         };

     

       37
       38
        
       

     

       38
       39
        
         arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");

     
···

       40
       41
        
       

     

       41
       42
        
         checkInputs = [ git gmp openssl readline libxml2 libyaml ];

     

       42
       43
        
       

     

       44
       44
       +
         binaryUrl = version: rel:

     

       45
       45
       +
           if arch == archs.aarch64-linux then

     

       46
       46
       +
             "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz"

     

       47
       47
       +
           else

     

       48
       48
       +
             "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";

     

       49
       49
       +
       

     

       43
       50
        
         genericBinary = { version, sha256s, rel ? 1 }:

     

       44
       51
        
           stdenv.mkDerivation rec {

     

       45
       52
        
             pname = "crystal-binary";

     

       46
       53
        
             inherit version;

     

       47
       54
        
       

     

       48
       55
        
             src = fetchurl {

     

       49
       49
       -
               url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz";

     

       56
       56
       +
               url = binaryUrl version rel;

     

       50
       57
        
               sha256 = sha256s.${stdenv.system};

     

       51
       58
        
             };

     

       52
       59
        
       

     
···

       225
       232
        
             x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880";

     

       226
       233
        
             i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch";

     

       227
       234
        
             x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099";

     

       235
       235
       +
             aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53";

     

       228
       236
        
           };

     

       229
       237
        
         };

     

       230
       238

+3 -3

pkgs/development/compilers/open-watcom/v2.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "open-watcom-v2";

     

       15
       15
       -
         version = "unstable-2022-02-22";

     

       15
       15
       +
         version = "unstable-2022-03-14";

     

       16
       16
        
         name = "${pname}-unwrapped-${version}";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "open-watcom";

     

       20
       20
        
           repo = "open-watcom-v2";

     

       21
       21
       -
           rev = "9e25b3d6b8066f09b4f7131a31de1cf2af691e9a";

     

       22
       22
       -
           sha256 = "1w336070kmhc6cmn2aqr8vm0fmw3yza2n0w4asvs2kqxjgmbn6i2";

     

       21
       21
       +
           rev = "22627ccc1bd3de70aff9ac056e0dc9ecf7f7b6ec";

     

       22
       22
       +
           sha256 = "khy/fhmQjTGKfx6iOUBt+ySwpEx0df/7meyNvBnJAPY=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         postPatch = ''

+3 -3

pkgs/development/dotnet-modules/python-language-server/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildDotnetModule rec {

     

       12
       12
        
         pname = "python-language-server";

     

       13
       13
       -
         version = "2021-09-08";

     

       13
       13
       +
         version = "2022-02-18";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "microsoft";

     

       17
       17
        
           repo = "python-language-server";

     

       18
       18
       -
           rev = "26ea18997f45f7d7bc5a3c5a9efc723a8dbb02fa";

     

       19
       19
       -
           sha256 = "1m8pf9k20wy4fzv27v3bswvc8s01ag6ka2qm9nn6bgq0s0lq78mh";

     

       18
       18
       +
           rev = "52c1afd34b5acb0b44597bb8681232876fe94084";

     

       19
       19
       +
           sha256 = "05s8mwi3dqzjghgpr1mfs1b7cgrq818bbj1v7aly6axc8c2n4gny";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj";

-2

pkgs/development/haskell-modules/non-hackage-packages.nix

···

       24
       24
        
       

     

       25
       25
        
         nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { };

     

       26
       26
        
       

     

       27
       27
       -
         nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };

     

       28
       28
       -
       

     

       29
       27
        
         # hasura graphql-engine is not released to hackage.

     

       30
       28
        
         # https://github.com/hasura/graphql-engine/issues/7391

     

       31
       29
        
         ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};

+2 -2

pkgs/development/interpreters/python/default.nix

···

       201
       201
        
             major = "3";

     

       202
       202
        
             minor = "11";

     

       203
       203
        
             patch = "0";

     

       204
       204
       -
             suffix = "a4";

     

       204
       204
       +
             suffix = "a6";

     

       205
       205
        
           };

     

       206
       206
       -
           sha256 = "sha256-Q3/nN2w2Pa+vNM6A8ERrQfyaQsDiqMflGdPwoLfPs+0=";

     

       206
       206
       +
           sha256 = "sha256-HFOi/3WHljPjDKwp0qpregEONVuV8L+axpG+zPX50So=";

     

       207
       207
        
           inherit (darwin) configd;

     

       208
       208
        
           inherit passthruFun;

     

       209
       209
        
         };

-44

pkgs/development/libraries/clearsilver/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, fetchpatch, python2 }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "clearsilver";

     

       5
       5
       -
         version = "0.10.5";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}";

     

       13
       13
       -
       

     

       14
       14
       -
         configureFlags = [

     

       15
       15
       -
           "--with-python=${python2.interpreter}"

     

       16
       16
       -
           "--disable-apache"

     

       17
       17
       -
           "--disable-perl"

     

       18
       18
       -
           "--disable-ruby"

     

       19
       19
       -
           "--disable-java"

     

       20
       20
       -
           "--disable-csharp"

     

       21
       21
       -
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         preInstall = ''

     

       24
       24
       -
           mkdir -p $out

     

       25
       25
       -
           mkdir -p $out/${python2.sitePackages}

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         patches = [

     

       29
       29
       -
           (fetchpatch {

     

       30
       30
       -
             url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch";

     

       31
       31
       -
             sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38";

     

       32
       32
       -
           })

     

       33
       33
       -
           (fetchpatch {

     

       34
       34
       -
             url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff";

     

       35
       35
       -
             sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi";

     

       36
       36
       -
           })

     

       37
       37
       -
         ];

     

       38
       38
       -
       

     

       39
       39
       -
         meta = with lib; {

     

       40
       40
       -
           description = "Fast, powerful, and language-neutral HTML template system";

     

       41
       41
       -
           homepage = "http://www.clearsilver.net/";

     

       42
       42
       -
           license = licenses.free;

     

       43
       43
       -
         };

     

       44
       44
       -
       }

+2 -2

pkgs/development/libraries/intel-gmmlib/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
         pname = "intel-gmmlib";

     

       9
       9
       -
         version = "22.0.3";

     

       9
       9
       +
         version = "22.1.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "intel";

     

       13
       13
        
           repo = "gmmlib";

     

       14
       14
        
           rev = "intel-gmmlib-${version}";

     

       15
       15
       -
           sha256 = "sha256-cXolz4hKLSTs8K9tCxaKnC2Pr0lQ0M+pPeF2w6bOAR8=";

     

       15
       15
       +
           sha256 = "sha256-4LFBokMEhhobKIMzZYlt3Nn88lX60l+IZZ0gi+o7Tds=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ cmake ];

+5 -4

pkgs/development/libraries/libarchive-qt/default.nix

···

       1
       1
       -
       { mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, cmake, ninja }:

     

       1
       1
       +
       { mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, meson, pkg-config, ninja }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "libarchive-qt";

     

       5
       5
       -
         version = "2.0.6";

     

       5
       5
       +
         version = "2.0.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitLab {

     

       8
       8
        
           owner = "marcusbritanicus";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA=";

     

       11
       11
       +
           sha256 = "sha256-KRywB+Op44N00q9tgO2WNCliRgUDRvrCms1O8JYt62o=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [

     

       15
       15
       -
           cmake

     

       15
       15
       +
           meson

     

       16
       16
        
           ninja

     

       17
       17
       +
           pkg-config

     

       17
       18
        
         ];

     

       18
       19
        
       

     

       19
       20
        
         buildInputs = [

+31

pkgs/development/libraries/libctl/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , autoreconfHook

     

       5
       5
       +
       , gfortran

     

       6
       6
       +
       , guile

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "libctl";

     

       12
       12
       +
         version = "4.5.1";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "NanoComp";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = "v${version}";

     

       18
       18
       +
           sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [ autoreconfHook gfortran guile pkg-config ];

     

       22
       22
       +
       

     

       23
       23
       +
         configureFlags = [ "--enable-shared" ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           description = "Guile-based library for supporting flexible control files in scientific simulations";

     

       27
       27
       +
           homepage = "https://github.com/NanoComp/libctl";

     

       28
       28
       +
           license = licenses.gpl2Only;

     

       29
       29
       +
           maintainers = with maintainers; [ carpinchomug ];

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+5 -4

pkgs/development/libraries/libnbd/default.nix

···

       6
       6
        
       , perl

     

       7
       7
        
       , libxml2

     

       8
       8
        
       , fuse

     

       9
       9
       +
       , fuse3

     

       9
       10
        
       , gnutls

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation rec {

     

       13
       14
        
         pname = "libnbd";

     

       14
       14
       -
         version = "1.9.5";

     

       15
       15
       +
         version = "1.12.2";

     

       15
       16
        
       

     

       16
       17
        
         src = fetchurl {

     

       17
       17
       -
           url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";

     

       18
       18
       -
           hash = "sha256-BnMoxIiuwhqcwVr3AwAIFgZPcFsIg55N66ZwWMTUnCw=";

     

       18
       18
       +
           url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";

     

       19
       19
       +
           hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM=";

     

       19
       20
        
         };

     

       20
       21
        
       

     

       21
       22
        
         nativeBuildInputs = [

     
···

       26
       27
        
       

     

       27
       28
        
         buildInputs = [

     

       28
       29
        
           fuse

     

       30
       30
       +
           fuse3

     

       29
       31
        
           gnutls

     

       30
       32
        
           libxml2

     

       31
       33
        
         ];

     
···

       55
       57
        
           platforms = with platforms; linux;

     

       56
       58
        
         };

     

       57
       59
        
       }

     

       58
       58
       -
       # TODO: NBD URI support apparently is not enabled

     

       59
       60
        
       # TODO: package the 1.6-stable version too

     

       60
       61
        
       # TODO: git version needs ocaml

     

       61
       62
        
       # TODO: bindings for go, ocaml and python

+2 -2

pkgs/development/libraries/opendht/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "opendht";

     

       24
       24
       -
         version = "2.3.2";

     

       24
       24
       +
         version = "2.3.5";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "savoirfairelinux";

     

       28
       28
        
           repo = "opendht";

     

       29
       29
        
           rev = version;

     

       30
       30
       -
           sha256 = "sha256-LevS9euBAFkI1ll79uqmVaRR/6FH6Z4cypHqvCIWxgU=";

     

       30
       30
       +
           sha256 = "sha256-GGaq8ziOCUDMxILq2QYUkSP4usBjbufbHwQF4Pr6hHw=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

+3 -3

pkgs/development/libraries/protolock/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "protolock";

     

       5
       5
       -
         version = "0.15.2";

     

       5
       5
       +
         version = "0.16.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nilslice";

     

       9
       9
        
           repo = "protolock";

     

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

     

       11
       11
       -
           sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0=";

     

       11
       11
       +
           sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4=";

     

       14
       14
       +
         vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+1 -1

pkgs/development/node-packages/default.nix

···

       359
       359
        
       

     

       360
       360
        
             src = fetchurl {

     

       361
       361
        
               url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";

     

       362
       362
       -
               sha512 = "sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA==";

     

       362
       362
       +
               sha512 = "sha512-8SdsLPhKR3mOfoo2o73h9mNn3v5kA/RqGA26Sv6qDS78Eh2uepPqt5e8/nwj5EOblYm5HEGuitaXQrOCLb6uTw==";

     

       363
       363
        
             };

     

       364
       364
        
             postInstall = with pkgs; ''

     

       365
       365
        
               wrapProgram "$out/bin/prisma" \

+2 -2

pkgs/development/python-modules/adafruit-platformdetect/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "adafruit-platformdetect";

     

       9
       9
       -
         version = "3.21.0";

     

       9
       9
       +
         version = "3.21.1";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           pname = "Adafruit-PlatformDetect";

     

       14
       14
        
           inherit version;

     

       15
       15
       -
           sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4=";

     

       15
       15
       +
           sha256 = "sha256-gVJUjxsl1rxvboL53186r63yp0k4FtTSgKJuqPzE2Q0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "androidtv";

     

       14
       14
       -
         version = "0.0.64";

     

       14
       14
       +
         version = "0.0.65";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "JeffLIrion";

     

       21
       21
        
           repo = "python-androidtv";

     

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

     

       23
       23
       -
           hash = "sha256-CJJ+mWAX9XG1/E2PljUZ8oz/la3hYXF1tMfuKt0Zvjw=";

     

       23
       23
       +
           hash = "sha256-bhXmPplRT9gzeD/GdD2HxN+Z4vvaiaxBwkqSml9SJUs=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "awscrt";

     

       15
       15
       -
         version = "0.13.3";

     

       15
       15
       +
         version = "0.13.5";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-1GaKDpOGX/YbM4rByTw0nYgwHYFvOLHZ0GRvanX3vAU=";

     

       22
       22
       +
           hash = "sha256-dUNljMKsbl6eByhEYivWgRJczTBw3N1RVl8r3e898mg=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin [

+10 -8

pkgs/development/python-modules/azure-mgmt-monitor/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , isPy3k

     

       4
       4
       +
       , pythonOlder

     

       5
       5
        
       , msrest

     

       6
       6
        
       , msrestazure

     

       7
       7
        
       , azure-common

     

       8
       8
        
       , azure-mgmt-core

     

       9
       9
       -
       , azure-mgmt-nspkg

     

       10
       9
        
       }:

     

       11
       10
        
       

     

       12
       11
        
       buildPythonPackage rec {

     

       13
       12
        
         pname = "azure-mgmt-monitor";

     

       14
       14
       -
         version = "3.0.0";

     

       13
       13
       +
         version = "3.1.0";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         disabled = pythonOlder "3.6";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

     

       18
       20
        
           extension = "zip";

     

       19
       19
       -
           sha256 = "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6";

     

       21
       21
       +
           hash = "sha256-ROcUAm0KgIjO2A2XBpS00IeEPgd8x4cjoMfn6X9C+Gw=";

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       24
        
         propagatedBuildInputs = [

     
···

       24
       26
        
           msrestazure

     

       25
       27
        
           azure-common

     

       26
       28
        
           azure-mgmt-core

     

       27
       27
       -
         ] ++ lib.optionals (!isPy3k) [

     

       28
       28
       -
           azure-mgmt-nspkg

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
       -
         pythonNamespaces = [ "azure.mgmt" ];

     

       31
       31
       +
         pythonNamespaces = [

     

       32
       32
       +
           "azure.mgmt"

     

       33
       33
       +
         ];

     

       32
       34
        
       

     

       33
       33
       -
         # has no tests

     

       35
       35
       +
         # Module has no tests

     

       34
       36
        
         doCheck = false;

     

       35
       37
        
       

     

       36
       38
        
         meta = with lib; {

+23 -10

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, six}:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , six

     

       6
       6
       +
       }:

     

       2
       7
        
       

     

       3
       8
        
       buildPythonPackage rec {

     

       4
       9
        
         pname = "bumps";

     

       5
       5
       -
         version = "0.8.1";

     

       10
       10
       +
         version = "0.9.0";

     

       11
       11
       +
         format = "setuptools";

     

       6
       12
        
       

     

       7
       7
       -
         propagatedBuildInputs = [six];

     

       8
       8
       -
       

     

       9
       9
       -
         # Bumps does not provide its own tests.py, so the test

     

       10
       10
       -
         # always fails

     

       11
       11
       -
         doCheck = false;

     

       13
       13
       +
         disabled = pythonOlder "3.7";

     

       12
       14
        
       

     

       13
       15
        
         src = fetchPypi {

     

       14
       16
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169";

     

       17
       17
       +
           hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o=";

     

       16
       18
        
         };

     

       17
       19
        
       

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           six

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         # Module has no tests

     

       25
       25
       +
         doCheck = false;

     

       26
       26
       +
       

     

       27
       27
       +
         pythonImportsCheck = [

     

       28
       28
       +
           "bumps"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       18
       31
        
         meta = with lib; {

     

       19
       19
       -
           homepage = "https://www.reflectometry.org/danse/software.html";

     

       20
       32
        
           description = "Data fitting with bayesian uncertainty analysis";

     

       21
       21
       -
           maintainers = with maintainers; [ rprospero ];

     

       33
       33
       +
           homepage = "https://bumps.readthedocs.io/";

     

       22
       34
        
           license = licenses.publicDomain;

     

       35
       35
       +
           maintainers = with maintainers; [ rprospero ];

     

       23
       36
        
         };

     

       24
       37
        
       }

+10 -6

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , isPy3k

     

       3
       3
       +
       , pythonOlder

     

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , requests

     

       6
       6
        
       , requests-toolbelt

     
···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "cloudscraper";

     

       12
       12
       -
         version = "1.2.58";

     

       13
       13
       -
         disabled = !isPy3k;

     

       12
       12
       +
         version = "1.2.60";

     

       13
       13
       +
         format = "setuptools";

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.7";

     

       14
       16
        
       

     

       15
       17
        
         src = fetchPypi {

     

       16
       18
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx";

     

       19
       19
       +
           hash = "sha256-DTQTsv/59895UTsMmqxYtSfFosUWPRx8wMT4zKHQ9Oc=";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       22
        
         propagatedBuildInputs = [

     
···

       27
       29
        
         # nixpkgs yet, and also aren't included in the PyPI bundle.  TODO.

     

       28
       30
        
         doCheck = false;

     

       29
       31
        
       

     

       30
       30
       -
         pythonImportsCheck = [ "cloudscraper" ];

     

       32
       32
       +
         pythonImportsCheck = [

     

       33
       33
       +
           "cloudscraper"

     

       34
       34
       +
         ];

     

       31
       35
        
       

     

       32
       36
        
         meta = with lib; {

     

       33
       33
       -
           description = "A Python module to bypass Cloudflare's anti-bot page";

     

       37
       37
       +
           description = "Python module to bypass Cloudflare's anti-bot page";

     

       34
       38
        
           homepage = "https://github.com/venomous/cloudscraper";

     

       35
       39
        
           license = licenses.mit;

     

       36
       40
        
           maintainers = with maintainers; [ kini ];

+26

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       buildPythonPackage rec {

     

       7
       7
       +
         pname = "docx2txt";

     

       8
       8
       +
         version = "0.8";

     

       9
       9
       +
         format = "setuptools";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           hash = "sha256-LAbZjXz+LTlH5XYKV9kk4/8HdFs3nIc3cjki5wCSNuU=";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         pythonImportsCheck = [

     

       17
       17
       +
           "docx2txt"

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "A pure python-based utility to extract text and images from docx files";

     

       22
       22
       +
           homepage = "https://github.com/ankushshah89/python-docx2txt";

     

       23
       23
       +
           license = licenses.mit;

     

       24
       24
       +
           maintainers = with maintainers; [ ilkecan ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+2 -2

pkgs/development/python-modules/env-canada/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "env-canada";

     

       17
       17
       -
         version = "0.5.20";

     

       17
       17
       +
         version = "0.5.21";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.8";

     
···

       23
       23
        
           owner = "michaeldavie";

     

       24
       24
        
           repo = "env_canada";

     

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

     

       26
       26
       -
           sha256 = "sha256-gYl5+rtOzci3nhgP74VM37tNk9pPWgcNBfcSSG1fSJs=";

     

       26
       26
       +
           sha256 = "sha256-jildWpYWll5j7siYhNECMBjz9bF41xFA6NyydWNdgQE=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/google-cloud-redis/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "google-cloud-redis";

     

       15
       15
       -
         version = "2.7.1";

     

       15
       15
       +
         version = "2.8.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           inherit pname version;

     

       22
       22
       -
           hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is=";

     

       22
       22
       +
           hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+6 -2

pkgs/development/python-modules/google-cloud-storage/default.nix

···

       9
       9
        
       , google-cloud-testutils

     

       10
       10
        
       , google-resumable-media

     

       11
       11
        
       , mock

     

       12
       12
       +
       , pythonOlder

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       buildPythonPackage rec {

     

       15
       16
        
         pname = "google-cloud-storage";

     

       16
       16
       -
         version = "2.2.0";

     

       17
       17
       +
         version = "2.2.1";

     

       18
       18
       +
         format = "setuptools";

     

       19
       19
       +
       

     

       20
       20
       +
         disabled = pythonOlder "3.7";

     

       17
       21
        
       

     

       18
       22
        
         src = fetchPypi {

     

       19
       23
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "sha256-01mWgBE11R20m7j3p+Kc7cwlqotDXu0MTA7y+e5W0dk=";

     

       24
       24
       +
           hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc=";

     

       21
       25
        
         };

     

       22
       26
        
       

     

       23
       27
        
         propagatedBuildInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "intellifire4py";

     

       14
       14
       -
         version = "1.0.0";

     

       14
       14
       +
         version = "1.0.1";

     

       15
       15
        
         format = "setuptools";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.7";

     
···

       20
       20
        
           owner = "jeeftor";

     

       21
       21
        
           repo = pname;

     

       22
       22
        
           rev = version;

     

       23
       23
       -
           hash = "sha256-lQV5KpASbrz+wCi9x/0rNYrQE+dLCZzsNBFhYAQvPH4=";

     

       23
       23
       +
           hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "mdformat";

     

       15
       15
       -
         version = "0.7.13";

     

       15
       15
       +
         version = "0.7.14";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     
···

       21
       21
        
           owner = "executablebooks";

     

       22
       22
        
           repo = pname;

     

       23
       23
        
           rev = version;

     

       24
       24
       -
           sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8=";

     

       24
       24
       +
           sha256 = "sha256-bImBW6r8g/4MQ9yNrBBhk7AGqKRXFyAew6HHEmqelxw=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

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

···

       18
       18
        
       

     

       19
       19
        
       buildPythonPackage rec {

     

       20
       20
        
         pname = "meshtastic";

     

       21
       21
       -
         version = "1.2.90";

     

       21
       21
       +
         version = "1.2.92";

     

       22
       22
        
         format = "setuptools";

     

       23
       23
        
       

     

       24
       24
        
         disabled = pythonOlder "3.6";

     
···

       27
       27
        
           owner = "meshtastic";

     

       28
       28
        
           repo = "Meshtastic-python";

     

       29
       29
        
           rev = version;

     

       30
       30
       -
           sha256 = "sha256-n/M1Q6YS3EkUcn45ffiTy0wuj9yKf6qBLLfD2XJkhHU=";

     

       30
       30
       +
           sha256 = "sha256-tK711Lewr5Zc6dy/cDe9UEnq9zOEvuJg4mZyO3zBLR0=";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+56 -35

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

···

       9
       9
        
       , tls-parser

     

       10
       10
        
       , cacert

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
       +
       , pythonAtLeast

     

       12
       13
        
       , pythonOlder

     

       13
       14
        
       }:

     

       14
       15
        
       

     
···

       50
       51
        
               "enable-tls1_3"

     

       51
       52
        
               "no-async"

     

       52
       53
        
             ];

     

       53
       53
       -
             patches = builtins.filter (

     

       54
       54
       -
               p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"

     

       55
       55
       -
             ) oldAttrs.patches;

     

       54
       54
       +
             patches = builtins.filter

     

       55
       55
       +
               (

     

       56
       56
       +
                 p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"

     

       57
       57
       +
               )

     

       58
       58
       +
               oldAttrs.patches;

     

       56
       59
        
             buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];

     

       57
       60
        
             meta = oldAttrs.meta // {

     

       58
       61
        
               knownVulnerabilities = [

     
···

       76
       79
        
               sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";

     

       77
       80
        
             };

     

       78
       81
        
             configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;

     

       79
       79
       -
             patches = builtins.filter (

     

       80
       80
       -
               p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"

     

       81
       81
       -
             ) oldAttrs.patches;

     

       82
       82
       +
             patches = builtins.filter

     

       83
       83
       +
               (

     

       84
       84
       +
                 p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"

     

       85
       85
       +
               )

     

       86
       86
       +
               oldAttrs.patches;

     

       82
       87
        
             buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];

     

       83
       88
        
             # openssl_1_0_2 needs `withDocs = false`

     

       84
       89
        
             outputs = lib.remove "doc" oldAttrs.outputs;

     
···

       87
       92
        
       in

     

       88
       93
        
       buildPythonPackage rec {

     

       89
       94
        
         pname = "nassl";

     

       90
       90
       -
         version = "4.0.1";

     

       95
       95
       +
         version = "4.0.2";

     

       96
       96
       +
         format = "setuptools";

     

       97
       97
       +
       

     

       91
       98
        
         disabled = pythonOlder "3.7";

     

       92
       99
        
       

     

       93
       100
        
         src = fetchFromGitHub {

     

       94
       101
        
           owner = "nabla-c0d3";

     

       95
       102
        
           repo = pname;

     

       96
       103
        
           rev = version;

     

       97
       97
       -
           hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc=";

     

       104
       104
       +
           hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";

     

       98
       105
        
         };

     

       99
       106
        
       

     

       100
       100
       -
         postPatch = let

     

       101
       101
       -
           legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version;

     

       102
       102
       -
           modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version;

     

       103
       103
       -
           zlibVersion = zlibStatic.version;

     

       104
       104
       -
         in ''

     

       105
       105
       -
           mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/

     

       106
       106
       -
           cp ${opensslLegacyStatic.out}/lib/libssl.a \

     

       107
       107
       -
             ${opensslLegacyStatic.out}/lib/libcrypto.a \

     

       108
       108
       -
             deps/openssl-OpenSSL_${legacyOpenSSLVersion}/

     

       109
       109
       -
           ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include

     

       110
       110
       -
           ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps

     

       107
       107
       +
         postPatch =

     

       108
       108
       +
           let

     

       109
       109
       +
             legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;

     

       110
       110
       +
             modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;

     

       111
       111
       +
             zlibVersion = zlibStatic.version;

     

       112
       112
       +
           in

     

       113
       113
       +
           ''

     

       114
       114
       +
             mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/

     

       115
       115
       +
             cp ${opensslLegacyStatic.out}/lib/libssl.a \

     

       116
       116
       +
               ${opensslLegacyStatic.out}/lib/libcrypto.a \

     

       117
       117
       +
               deps/openssl-OpenSSL_${legacyOpenSSLVersion}/

     

       118
       118
       +
             ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include

     

       119
       119
       +
             ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps

     

       120
       120
       +
       

     

       121
       121
       +
             mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/

     

       122
       122
       +
             cp ${opensslStatic.out}/lib/libssl.a \

     

       123
       123
       +
               ${opensslStatic.out}/lib/libcrypto.a \

     

       124
       124
       +
               deps/openssl-OpenSSL_${modernOpenSSLVersion}/

     

       125
       125
       +
             ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include

     

       126
       126
       +
             ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps

     

       111
       127
        
       

     

       112
       112
       -
           mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/

     

       113
       113
       -
           cp ${opensslStatic.out}/lib/libssl.a \

     

       114
       114
       -
             ${opensslStatic.out}/lib/libcrypto.a \

     

       115
       115
       -
             deps/openssl-OpenSSL_${modernOpenSSLVersion}/

     

       116
       116
       -
           ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include

     

       117
       117
       -
           ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps

     

       128
       128
       +
             mkdir -p deps/zlib-${zlibVersion}/

     

       129
       129
       +
             cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/

     

       130
       130
       +
           '';

     

       118
       131
        
       

     

       119
       119
       -
           mkdir -p deps/zlib-${zlibVersion}/

     

       120
       120
       -
           cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/

     

       121
       121
       -
         '';

     

       132
       132
       +
         nativeBuildInputs = [

     

       133
       133
       +
           invoke

     

       134
       134
       +
         ];

     

       122
       135
        
       

     

       123
       123
       -
         propagatedBuildInputs = [ tls-parser ];

     

       136
       136
       +
         propagatedBuildInputs = [

     

       137
       137
       +
           tls-parser

     

       138
       138
       +
         ];

     

       124
       139
        
       

     

       125
       125
       -
         nativeBuildInputs = [ invoke ];

     

       140
       140
       +
         checkInputs = [

     

       141
       141
       +
           pytestCheckHook

     

       142
       142
       +
         ];

     

       126
       143
        
       

     

       127
       144
        
         buildPhase = ''

     

       128
       145
        
           invoke build.nassl

     
···

       131
       148
        
       

     

       132
       149
        
         doCheck = true;

     

       133
       150
        
       

     

       134
       134
       -
         pythonImportsCheck = [ "nassl" ];

     

       135
       135
       -
       

     

       136
       136
       -
         checkInputs = [ pytestCheckHook ];

     

       151
       151
       +
         pythonImportsCheck = [

     

       152
       152
       +
           "nassl"

     

       153
       153
       +
         ];

     

       137
       154
        
       

     

       138
       155
        
         disabledTests = [

     

       139
       156
        
           "Online"

     

       157
       157
       +
         ] ++ lib.optionals (pythonAtLeast "3.10") [

     

       158
       158
       +
           "test_write_bad"

     

       159
       159
       +
           "test_client_authentication_no_certificate_supplied"

     

       160
       160
       +
           "test_client_authentication_succeeds"

     

       140
       161
        
         ];

     

       141
       162
        
       

     

       142
       163
        
         meta = with lib; {

     

       164
       164
       +
           description = "Low-level OpenSSL wrapper for Python";

     

       143
       165
        
           homepage = "https://github.com/nabla-c0d3/nassl";

     

       144
       144
       -
           description = "Low-level OpenSSL wrapper for Python 3.7+";

     

       145
       145
       -
           platforms = with platforms; linux ++ darwin;

     

       146
       166
        
           license = licenses.agpl3Only;

     

       147
       167
        
           maintainers = with maintainers; [ veehaitch ];

     

       168
       168
       +
           platforms = with platforms; linux ++ darwin;

     

       148
       169
        
         };

     

       149
       170
        
       }

+2 -2

pkgs/development/python-modules/neo4j-driver/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "neo4j-driver";

     

       10
       10
       -
         version = "4.4.1";

     

       10
       10
       +
         version = "4.4.2";

     

       11
       11
        
         format = "setuptools";

     

       12
       12
        
       

     

       13
       13
        
         disabled = pythonOlder "3.7";

     
···

       16
       16
        
           owner = "neo4j";

     

       17
       17
        
           repo = "neo4j-python-driver";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-aGOqD6mmd3dulQ/SdaDPDZhkCwXdYCucHw+CrkJf1M0=";

     

       19
       19
       +
           sha256 = "sha256-rYedmxQvT+RjVdbDckLv00J4YuEQtMuIc8Q5FGWr3Rw=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "proxmoxer";

     

       14
       14
       -
         version = "1.2.0";

     

       14
       14
       +
         version = "1.3.0";

     

       15
       15
        
         disabled = pythonOlder "3.6";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = pname;

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ=";

     

       21
       21
       +
           sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

+4 -2

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , loguru

     

       6
       6
       +
       , pydantic

     

       6
       7
        
       , poetry-core

     

       7
       8
        
       , pythonOlder

     

       8
       9
        
       , requests

     
···

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     

       12
       13
        
         pname = "pyaussiebb";

     

       13
       13
       -
         version = "0.0.11";

     

       14
       14
       +
         version = "0.0.12";

     

       14
       15
        
         format = "pyproject";

     

       15
       16
        
       

     

       16
       17
        
         disabled = pythonOlder "3.9";

     
···

       19
       20
        
           owner = "yaleman";

     

       20
       21
        
           repo = "aussiebb";

     

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

     

       22
       22
       -
           hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc=";

     

       23
       23
       +
           hash = "sha256-4B+eq863G+iVl8UnxDumPVpkj9W8kX5LK0wo4QIYo4w=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         nativeBuildInputs = [

     
···

       30
       31
        
           aiohttp

     

       31
       32
        
           requests

     

       32
       33
        
           loguru

     

       34
       34
       +
           pydantic

     

       33
       35
        
         ];

     

       34
       36
        
       

     

       35
       37
        
         postPatch = ''

+3 -3

pkgs/development/python-modules/pycep-parser/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "pycep-parser";

     

       15
       15
       -
         version = "0.3.1";

     

       15
       15
       +
         version = "0.3.2";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.7";

     
···

       21
       21
        
           owner = "gruebel";

     

       22
       22
        
           repo = "pycep";

     

       23
       23
        
           rev = version;

     

       24
       24
       -
           hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k=";

     

       24
       24
       +
           hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     
···

       41
       41
        
       

     

       42
       42
        
         postPatch = ''

     

       43
       43
        
           substituteInPlace pyproject.toml \

     

       44
       44
       -
             --replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \

     

       44
       44
       +
             --replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \

     

       45
       45
        
             --replace 'regex = "^2022.3.2"' 'regex = "*"'

     

       46
       46
        
         '';

     

       47
       47

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "pykrakenapi";

     

       10
       10
       -
         version = "0.2.4";

     

       10
       10
       +
         version = "0.3.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "dominiktraxl";

     

       14
       14
        
           repo = "pykrakenapi";

     

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

     

       16
       16
       -
           hash = "sha256-i2r6t+JcL6INI8Y26gvVvNjv6XxMj4G+pF9Xf/hsx1A=";

     

       16
       16
       +
           hash = "sha256-ZhP4TEWFEGIqI/nk2It1IVFKrX4HKP+dWxu+gLJNIeg=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/pysigma-backend-splunk/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pysigma-backend-splunk";

     

       12
       12
       -
         version = "0.1.1";

     

       12
       12
       +
         version = "0.1.2";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       18
       18
        
           owner = "SigmaHQ";

     

       19
       19
        
           repo = "pySigma-backend-splunk";

     

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

     

       21
       21
       -
           hash = "sha256-AGT+7BKtINe2ukmomYyoUa5PHYAH1N0tUTtbyjMD+kw=";

     

       21
       21
       +
           hash = "sha256-jKvGBUO55DtF6bpgEL82XB5Ba+kmqJsCqUdzftcpSJ0=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pysigma-pipeline-crowdstrike";

     

       12
       12
       -
         version = "0.1.3";

     

       12
       12
       +
         version = "0.1.4";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       18
       18
        
           owner = "SigmaHQ";

     

       19
       19
        
           repo = "pySigma-pipeline-crowdstrike";

     

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

     

       21
       21
       -
           hash = "sha256-JNJHKydMzKreN+6liLlGMT1CFBUr/IX8Ah+exddKR3g=";

     

       21
       21
       +
           hash = "sha256-Riu2u1IouS1BMtXauXrNMIl06TU11pHdC0jjlOiR71s=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+2 -2

pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pysigma-pipeline-sysmon";

     

       12
       12
       -
         version = "0.1.1";

     

       12
       12
       +
         version = "0.1.2";

     

       13
       13
        
         format = "pyproject";

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.8";

     
···

       18
       18
        
           owner = "SigmaHQ";

     

       19
       19
        
           repo = "pySigma-pipeline-sysmon";

     

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

     

       21
       21
       -
           hash = "sha256-BBJt2SAbnPEzIwJ+tXW4NmA4Nrb/glIaPlnmYHLoMD0=";

     

       21
       21
       +
           hash = "sha256-Y9X9/ynrfs4gVTLl7pOvK3TH2Eh2vNF1S6Cnt3tByJM=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

+3 -15

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pysigma";

     

       14
       14
       -
         version = "0.3.2";

     

       14
       14
       +
         version = "0.4.1";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.8";

     
···

       20
       20
        
           owner = "SigmaHQ";

     

       21
       21
        
           repo = "pySigma";

     

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

     

       23
       23
       -
           hash = "sha256-V/E2rZqVrk0kIvk+hPhNcAifhMM/rN3mk3pB+CGd43w=";

     

       23
       23
       +
           hash = "sha256-egyzeniid2PZZQ6hsd44W+YURI8uGaXvDMuhNIXUqO0=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

     
···

       36
       36
        
           pytestCheckHook

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       -
         patches = [

     

       40
       40
       -
           # Switch to poetry-core, https://github.com/SigmaHQ/pySigma/pull/31

     

       41
       41
       -
           (fetchpatch {

     

       42
       42
       -
             name = "switch-to-poetry-core.patch";

     

       43
       43
       -
             url = "https://github.com/SigmaHQ/pySigma/commit/b7a852d18852007da90c2ec35bff347c97b36f07.patch";

     

       44
       44
       -
             sha256 = "sha256-zgg8Bsc37W2uuQluFpIZT4jHCQaitY2ZgS93Wk6Hxt0=";

     

       45
       45
       -
           })

     

       46
       46
       -
         ];

     

       47
       47
       -
       

     

       48
       39
        
         postPatch = ''

     

       49
       49
       -
           # https://github.com/SigmaHQ/pySigma/issues/32

     

       50
       50
       -
           # https://github.com/SigmaHQ/pySigma/issues/33

     

       51
       40
        
           substituteInPlace pyproject.toml \

     

       52
       52
       -
             --replace 'pyparsing = "^2.4.7"' 'pyparsing = "*"' \

     

       53
       53
       -
             --replace 'pyyaml = "^5.3.1"' 'pyyaml = "*"'

     

       41
       41
       +
             --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \

     

       54
       42
        
         '';

     

       55
       43
        
       

     

       56
       44
        
         pythonImportsCheck = [

+6 -2

pkgs/development/python-modules/pytest-json-report/default.nix

···

       5
       5
        
       , pytest-metadata

     

       6
       6
        
       , pytest-xdist

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
       +
       , pythonOlder

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "pytest-json-report";

     

       12
       12
       -
         version = "1.4.1";

     

       13
       13
       +
         version = "1.5.0";

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       13
       17
        
       

     

       14
       18
        
         src = fetchFromGitHub {

     

       15
       19
        
           owner = "numirias";

     

       16
       20
        
           repo = pname;

     

       17
       21
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-OS9ASUp9iJ12Ovr931RQU/DHEAXqbgcRMCBP4h+GAhk=";

     

       22
       22
       +
           hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs=";

     

       19
       23
        
         };

     

       20
       24
        
       

     

       21
       25
        
         buildInputs = [

+7 -3

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "python-box";

     

       14
       14
       -
         version = "5.4.1";

     

       14
       14
       +
         version = "6.0.0";

     

       15
       15
       +
         format = "setuptools";

     

       16
       16
       +
       

     

       15
       17
        
         disabled = pythonOlder "3.6";

     

       16
       18
        
       

     

       17
       19
        
         src = fetchFromGitHub {

     

       18
       20
        
           owner = "cdgriffith";

     

       19
       21
        
           repo = "Box";

     

       20
       22
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-SkteajcWG7rBFMm6Xp6QCfkZfwthRituGL/RtICbtYk=";

     

       23
       23
       +
           hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs=";

     

       22
       24
        
         };

     

       23
       25
        
       

     

       24
       26
        
         propagatedBuildInputs = [

     
···

       32
       34
        
           pytestCheckHook

     

       33
       35
        
         ];

     

       34
       36
        
       

     

       35
       35
       -
         pythonImportsCheck = [ "box" ];

     

       37
       37
       +
         pythonImportsCheck = [

     

       38
       38
       +
           "box"

     

       39
       39
       +
         ];

     

       36
       40
        
       

     

       37
       41
        
         meta = with lib; {

     

       38
       42
        
           description = "Python dictionaries with advanced dot notation access";

+2 -2

pkgs/development/python-modules/python-http-client/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "python_http_client";

     

       11
       11
       -
         version = "3.3.6";

     

       11
       11
       +
         version = "3.3.7";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.8";

     
···

       17
       17
        
           owner = "sendgrid";

     

       18
       18
        
           repo = "python-http-client";

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           sha256 = "sha256-Xchf/jVkQ7SYOzI9f81iS/G72k//6wkl2bMvHprOP9Y=";

     

       20
       20
       +
           sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "qcengine";

     

       14
       14
       -
         version = "0.22.0";

     

       14
       14
       +
         version = "0.23.0";

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [ pytestCheckHook ];

     

       17
       17
        
       

     
···

       25
       25
        
       

     

       26
       26
        
         src = fetchPypi {

     

       27
       27
        
           inherit pname version;

     

       28
       28
       -
           sha256 = "685a08247b561ed1c7a7b42e68293f90b412e83556626304a3f826a15be51308";

     

       28
       28
       +
           sha256 = "sha256-gDn0Nu6ALTr3KyZnYDSA6RE3S5JQj562FP2RI9U3Gxs=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         doCheck = true;

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "readme-renderer";

     

       15
       15
       -
         version = "33.0";

     

       15
       15
       +
         version = "34.0";

     

       16
       16
        
         format = "setuptools";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.6";

     
···

       20
       20
        
         src = fetchPypi {

     

       21
       21
        
           pname = "readme_renderer";

     

       22
       22
        
           inherit version;

     

       23
       23
       -
           sha256 = "sha256-47U7yEvWrwVOTMH+NWfcGuGfVUE0IhBDo/jGdOIiCds=";

     

       23
       23
       +
           sha256 = "sha256-37TRfyFwbRRfdHPgthyiRbpY6BDPmyIJpII5Z3+C5bA=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     

       7
       7
        
         pname = "samsungtvws";

     

       8
       8
       -
         version = "2.3.0";

     

       8
       8
       +
         version = "2.4.0";

     

       9
       9
        
         disabled = isPy27;

     

       10
       10
        
       

     

       11
       11
        
         src = fetchPypi {

     

       12
       12
        
           inherit pname version;

     

       13
       13
       -
           sha256 = "sha256-2ly9lbnIHGHB55ml10jKE7dC5LdN1ToGW4GqfxTC5kI=";

     

       13
       13
       +
           sha256 = "sha256-LbNHaSbNCwoffox6B8kEUzxjkSJotB+P1bw3wbU7DZk=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "soco";

     

       18
       18
       -
         version = "0.26.4";

     

       18
       18
       +
         version = "0.27.1";

     

       19
       19
        
         format = "setuptools";

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.6";

     
···

       24
       24
        
           owner = "SoCo";

     

       25
       25
        
           repo = "SoCo";

     

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

     

       27
       27
       -
           hash = "sha256-DoONq6Iqi8t47jtqggKYMHSNJAf/Kha3tszR6mYeB9Y=";

     

       27
       27
       +
           hash = "sha256-8U7wfxqen+hgK8j9ooPHCAKvd9kSZicToTyP7XzQFrg=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "sslyze";

     

       19
       19
       -
         version = "5.0.2";

     

       19
       19
       +
         version = "5.0.3";

     

       20
       20
        
         disabled = pythonOlder "3.7";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "nabla-c0d3";

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           hash = "sha256-8xtnE5oFxH3wo2Smt65/xGDHxivexN6ggUpyUg42Cjk=";

     

       26
       26
       +
           hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         patchPhase = ''

+11 -5

pkgs/development/python-modules/tls-parser/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "tls-parser";

     

       10
       10
       -
         version = "1.2.2";

     

       10
       10
       +
         version = "2.0.0";

     

       11
       11
       +
         format = "setuptools";

     

       12
       12
       +
       

     

       11
       13
        
         disabled = pythonOlder "3.7";

     

       12
       14
        
       

     

       13
       15
        
         src = fetchFromGitHub {

     

       14
       16
        
           owner = "nabla-c0d3";

     

       15
       17
        
           repo = "tls_parser";

     

       16
       18
        
           rev = version;

     

       17
       17
       -
           sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0";

     

       19
       19
       +
           hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc=";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       20
       -
         checkInputs = [ pytestCheckHook ];

     

       22
       22
       +
         checkInputs = [

     

       23
       23
       +
           pytestCheckHook

     

       24
       24
       +
         ];

     

       21
       25
        
       

     

       22
       22
       -
         pythonImportsCheck = [ "tls_parser" ];

     

       26
       26
       +
         pythonImportsCheck = [

     

       27
       27
       +
           "tls_parser"

     

       28
       28
       +
         ];

     

       23
       29
        
       

     

       24
       30
        
         meta = with lib; {

     

       25
       25
       -
           homepage = "https://github.com/nabla-c0d3/tls_parser";

     

       26
       31
        
           description = "Small library to parse TLS records";

     

       32
       32
       +
           homepage = "https://github.com/nabla-c0d3/tls_parser";

     

       27
       33
        
           platforms = with platforms; linux ++ darwin;

     

       28
       34
        
           license = licenses.mit;

     

       29
       35
        
           maintainers = with maintainers; [ veehaitch ];

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "twentemilieu";

     

       15
       15
       -
         version = "0.5.0";

     

       15
       15
       +
         version = "0.6.0";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         disabled = pythonOlder "3.8";

     
···

       21
       21
        
           owner = "frenck";

     

       22
       22
        
           repo = "python-twentemilieu";

     

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

     

       24
       24
       -
           sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0=";

     

       24
       24
       +
           sha256 = "sha256-UE7fhbSThXmMns1XfUUQqw0wn5/w/x+UncansIBiank=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/vt-py/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "vt-py";

     

       13
       13
       -
         version = "0.13.2";

     

       13
       13
       +
         version = "0.14.0";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.6";

     
···

       19
       19
        
           owner = "VirusTotal";

     

       20
       20
        
           repo = pname;

     

       21
       21
        
           rev = version;

     

       22
       22
       -
           sha256 = "sha256-ULzMz81s/C5wjIUtZ+Rz5o1Uump1FV0rTcNW9keERDk=";

     

       22
       22
       +
           sha256 = "sha256-901VW56vr6ysMlzspgVbPMLnDIpJRgSEOEQ8ohHp+mc=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [

+3 -2

pkgs/development/tools/analysis/checkov/default.nix

···

       32
       32
        
       

     

       33
       33
        
       buildPythonApplication rec {

     

       34
       34
        
         pname = "checkov";

     

       35
       35
       -
         version = "2.0.954";

     

       35
       35
       +
         version = "2.0.962";

     

       36
       36
        
       

     

       37
       37
        
         src = fetchFromGitHub {

     

       38
       38
        
           owner = "bridgecrewio";

     

       39
       39
        
           repo = pname;

     

       40
       40
        
           rev = version;

     

       41
       41
       -
           hash = "sha256-gCUciYTEL+4Pt9vAGbun0WFQWneOhDDXh7Dn9+sZbWw=";

     

       41
       41
       +
           hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         nativeBuildInputs = with py.pkgs; [

     
···

       53
       53
        
           bc-python-hcl2

     

       54
       54
        
           boto3

     

       55
       55
        
           cachetools

     

       56
       56
       +
           charset-normalizer

     

       56
       57
        
           cloudsplaining

     

       57
       58
        
           colorama

     

       58
       59
        
           configargparse

+3 -3

pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "bazel-remote";

     

       8
       8
       -
         version = "2.3.4";

     

       8
       8
       +
         version = "2.3.5";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "buchgr";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-ijR3RjGzm0HtVp5lSKGJemCGkRzhgQqaDOgg+MjDB1c=";

     

       14
       14
       +
           sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-NmTdS5xgv0o7AT4lBJk472Lq1e73EcrcfnI8RIxKEoc=";

     

       17
       17
       +
         vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";

     

       18
       18
        
       

     

       19
       19
        
         doCheck = false;

     

       20
       20

+3 -3

pkgs/development/tools/database/prisma-engines/default.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "prisma-engines";

     

       13
       13
       -
         version = "3.10.0";

     

       13
       13
       +
         version = "3.11.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "prisma";

     

       17
       17
        
           repo = "prisma-engines";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           sha256 = "sha256-0m0RjIasEGB9QxZc7wKCMLnxHXkSlvCDA2QWa87mRRs=";

     

       19
       19
       +
           sha256 = "sha256-z7ebwidY+p350XaGeyohoSHWc2DhfzpRxsRDLON1BuA=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         # Use system openssl.

     

       23
       23
        
         OPENSSL_NO_VENDOR = 1;

     

       24
       24
        
       

     

       25
       25
       -
         cargoSha256 = "sha256-KNQa+wLLl4abz48QKYkWu7A+FTGIyB+1EWAnLuWpJwc=";

     

       25
       25
       +
         cargoSha256 = "sha256-PQdLoNJL9szPzPtFRznWS0lngTvtWK+Ko2rp4JWH9dQ=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ pkg-config ];

     

       28
       28

+2 -2

pkgs/development/tools/doctl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "doctl";

     

       5
       5
       -
         version = "1.70.0";

     

       5
       5
       +
         version = "1.71.0";

     

       6
       6
        
       

     

       7
       7
        
         vendorSha256 = null;

     

       8
       8
        
       

     
···

       31
       31
        
           owner = "digitalocean";

     

       32
       32
        
           repo = "doctl";

     

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

     

       34
       34
       -
           sha256 = "sha256-oLcWVUP9A/tcJYKiaBrqAdyNKESaVFOaNiG/fAVQb2c=";

     

       34
       34
       +
           sha256 = "sha256-cj2+DmJyLa6kFkH9JflaR3yFFXBaVZHO6czJGLEH7L0=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         meta = with lib; {

+32 -32

pkgs/development/tools/electron/default.nix

···

       73
       73
        
           headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc";

     

       74
       74
        
         };

     

       75
       75
        
       

     

       76
       76
       -
         electron_14 = mkElectron "14.2.6" {

     

       77
       77
       -
           armv7l-linux = "fd115652f491fff6a28bf39dc41e3c7f1b638e7dcc7856c33b6a97c7763ea9a3";

     

       78
       78
       -
           aarch64-linux = "530df3030aeb2c0f67ba4bc210c0f0fe77670001d2ba30ad6858f74952528df2";

     

       79
       79
       -
           x86_64-linux = "c3f91ced7e429079d43c182f47cea1eceef17ab65c390e15f9c6af56e58ed3d9";

     

       80
       80
       -
           i686-linux = "d66881d0747c99618c500b46e044eb4e97442400624fbcf9a6af114743e6e8db";

     

       81
       81
       -
           x86_64-darwin = "15db43c17a33bf9e31f66f5025e0810dfbd2b237f7645eda51409de7930cc9d1";

     

       82
       82
       -
           aarch64-darwin = "a5f7b8cc5f6dfc7561368d2f09745967bb553a29a22ef74af8f795225483338a";

     

       83
       83
       -
           headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8";

     

       76
       76
       +
         electron_14 = mkElectron "14.2.7" {

     

       77
       77
       +
           armv7l-linux = "bb0c25671daa0dc235e212831d62f18b9a7f2692279bcd8e4a15f2d84ee7124d";

     

       78
       78
       +
           aarch64-linux = "149c5df2cf98ee0a2ce5445b3fb00752f42c3f7ab9677b7a54ba01fba2e2f4ec";

     

       79
       79
       +
           x86_64-linux = "ad80f424e8d8d79f0be078d8a1ddef8fd659fa3dd8aaf6704ab97f2a13489558";

     

       80
       80
       +
           i686-linux = "82b29272cb52dbe969c0bd6cf9b69896c86abe1d9ef473a3844c0ab3dc92b353";

     

       81
       81
       +
           x86_64-darwin = "2a5d8336dcd140158964801d482344756377d924a06e6605959034a41f7e026b";

     

       82
       82
       +
           aarch64-darwin = "b45869ff61bdf392bca498529b6445d47a784079f6a33af6b19d517953f03fd8";

     

       83
       83
       +
           headers = "0339fs3iyp869xi1xmn9z2b1n32wf408cc0z9bz6shns44ymkyhd";

     

       84
       84
        
         };

     

       85
       85
        
       

     

       86
       86
       -
         electron_15 = mkElectron "15.4.0" {

     

       87
       87
       -
           armv7l-linux = "40c073a3b416f83264327bdf5e33b334ffcd56a729ef237360d66f520f670d16";

     

       88
       88
       -
           aarch64-linux = "ef18ba74b4fa34a26f9ee819bb908c60d0dd9ec2048414629979760f262d72f8";

     

       89
       89
       -
           x86_64-linux = "5bdea4cbf5559491e9ad9f365fa6f7ec26603fd6f68bfa8848f2884ebd51662d";

     

       90
       90
       -
           i686-linux = "636d0e28bb20ca127c9b8722fe39e7e7d95fc63bd15b156b7af563296b3d9595";

     

       91
       91
       -
           x86_64-darwin = "8a132b2be0f27c7e8fa9a91a8b4b0fcdf3ec571c721cb5f5610dc8a6b3f0fd26";

     

       92
       92
       -
           aarch64-darwin = "82b29c37a427464a9278d617435ca19f472b00689c9e58163e99f30b90f33046";

     

       93
       93
       -
           headers = "0fc1sck7g160klpqzfcqv9zc45ia914mrncyma58zzcbzpk6k6yb";

     

       86
       86
       +
         electron_15 = mkElectron "15.4.1" {

     

       87
       87
       +
           armv7l-linux = "e0fe5daed46a5d718b3209fa301aea743df694daf6605f9313f4ca6c70fe5167";

     

       88
       88
       +
           aarch64-linux = "fa108edd4c146811bdee842fcd278b046ae0ff157de5e072c3ff3ac0bcb310c2";

     

       89
       89
       +
           x86_64-linux = "867095924d434b3918df8576e7af94fecea4d29461fcfb69c40161f02158ff15";

     

       90
       90
       +
           i686-linux = "8e79fa9f4125f254abb437445fed8f3f8ec10dd2462e1ced3e7df49c622e087d";

     

       91
       91
       +
           x86_64-darwin = "899d16a0e0157809c297ceb3710c53441ec4396333d9ad5b65297446874e14dc";

     

       92
       92
       +
           aarch64-darwin = "8295bf45dab1131dfdfd15654a0b1d85bfae221052ba64353368a2c0faaaa3ff";

     

       93
       93
       +
           headers = "073697wjq60cnz42xmnjsr0xqcmcsl4m48mmzrz1rxrc8mvi86gr";

     

       94
       94
        
         };

     

       95
       95
        
       

     

       96
       96
       -
         electron_16 = mkElectron "16.0.10" {

     

       97
       97
       -
           armv7l-linux = "1a72fe59011cfcc1f376f2948dd5a70d2f75d6c12fb682a0246d2e596227b5e0";

     

       98
       98
       -
           aarch64-linux = "46cd1393816364a666ead410505bce4b51d68ce872446a71d16886b88c4b275a";

     

       99
       99
       -
           x86_64-linux = "3b4779e41e27200ce5fa94d20f9df05ff5c757be6805eb0e8952fe198d66f324";

     

       100
       100
       -
           i686-linux = "9e1426a8135d3fe195ba9fc1a5ea5ad4d5ce96bd513691897b39106698e3c3c8";

     

       101
       101
       -
           x86_64-darwin = "00b0222efa67fbb29f723fabebc4221646ebd6d5fdc09524df9a203f63ce660c";

     

       102
       102
       -
           aarch64-darwin = "1203f6ec4e8b97312254ceb122ca4399f39ae67bfe1636e426a798c89ec2a9ee";

     

       103
       103
       -
           headers = "10f6px88vg6napyhniczi6l660qs4l5mm0b9gdlds4i1y94s1zrl";

     

       96
       96
       +
         electron_16 = mkElectron "16.1.0" {

     

       97
       97
       +
           armv7l-linux = "f3ab34c73b4100ffc5041ed9aa0608d1dc6b98fe3c2caa14be3d5c3ffbebda76";

     

       98
       98
       +
           aarch64-linux = "e80a7e4a59b94c7cd02b16ca37a2b0f26ddb58ddac23135c6180b238589f1c62";

     

       99
       99
       +
           x86_64-linux = "36c79af4d05e89ef9c9616a156f63adc5b453ee6bee5d8f4331e75ee77198e85";

     

       100
       100
       +
           i686-linux = "7129a96fc33de70cfe5d6d0e17ecff1b4dcf52d825a6ad05b10ca67da7b43665";

     

       101
       101
       +
           x86_64-darwin = "723859249e959948cdd339acf708022fb0195b433809af25b4a9f4d69b9da52f";

     

       102
       102
       +
           aarch64-darwin = "e76558028979f70107e5b1897275a9789be20b13991bfbcebeab7fc220f15764";

     

       103
       103
       +
           headers = "0yv9rssrfi0hdzrjf1n735dsz9sgy78jzxdcf9is2387yrr1qiyz";

     

       104
       104
        
         };

     

       105
       105
        
       

     

       106
       106
       -
         electron_17 = mkElectron "17.1.0" {

     

       107
       107
       -
           armv7l-linux = "09d92195821aad4ac03fbc858287a7372b6aa059081bb825d267853ee1b0425d";

     

       108
       108
       -
           aarch64-linux = "6a34d6802d44a391902f53baf0adc8b819d33e7c31b34614757b17b3223c9d1e";

     

       109
       109
       -
           x86_64-linux = "106ec28a5969366c1e1f642cc33ac41950c68bd182db23b04d7ac6886bfe28e8";

     

       110
       110
       -
           i686-linux = "19fe206be07a6df7f9f0ecdb411e3cafd3a53618edb19cc6adc77156f698444e";

     

       111
       111
       -
           x86_64-darwin = "bd80d6b0b62c9bec195d264aa21a255f4324a8b56849e04972c1fcc262757c31";

     

       112
       112
       -
           aarch64-darwin = "83fe2fc24976d09a0e0fcc3a60226f190cf9b67287fe4434d3d76d59fa45315c";

     

       113
       113
       -
           headers = "1zv1pigfbis1bsan28wx3bgkdwjc48pjq19wmxs73kd1khsy6w8r";

     

       106
       106
       +
         electron_17 = mkElectron "17.1.2" {

     

       107
       107
       +
           armv7l-linux = "b561c04c9fa8c512f418ea5c32f5526732e1ccd150ee4830a0091d0fa1b7e31c";

     

       108
       108
       +
           aarch64-linux = "cda7e66c6672def9edd881107c28e2eec09b7802a38227ac89bb233191ce4840";

     

       109
       109
       +
           x86_64-linux = "7e7c35e8c1a0fc451e7af19fa73264881ae2c4672c52a2ae1cdd61604650ca94";

     

       110
       110
       +
           i686-linux = "de87a7952c93c1d8e8c533a700bbfc76d3893e9ad438413507d11450b80a9c97";

     

       111
       111
       +
           x86_64-darwin = "d4382d3f01b750676a1f3c9e2273ad69cac16dc64a4145469c663bcda8d2471b";

     

       112
       112
       +
           aarch64-darwin = "135dec87211fcefdb53ab1fef13344c7b71a321f7c4f6846f260c1e0848e73bf";

     

       113
       113
       +
           headers = "15k234d044lgmc3psyxz9syy9wvzgn54znklak9sv6gcajjzll10";

     

       114
       114
        
         };

     

       115
       115
        
       }

+4 -6

pkgs/development/tools/gomodifytags/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "gomodifytags";

     

       5
       5
       -
         version = "1.6.0";

     

       6
       6
       -
       

     

       7
       7
       -
         vendorSha256 = null;

     

       8
       8
       -
       

     

       9
       9
       -
         doCheck = false;

     

       5
       5
       +
         version = "1.16.0";

     

       10
       6
        
       

     

       11
       7
        
         src = fetchFromGitHub {

     

       12
       8
        
           owner = "fatih";

     

       13
       9
        
           repo = "gomodifytags";

     

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

     

       15
       15
       -
           sha256 = "1wmzl5sk5mc46njzn86007sqyyv6han058ppiw536qyhk88rzazq";

     

       11
       11
       +
           sha256 = "1yhkn9mdvsn9i5v03c5smz32zlhkylnxhkcbjb7llafxzbhzgfm6";

     

       16
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "sha256-8efqJfu+gtoFbhdlDZfb8NsXV9hBDI2pvAQNH18VVhU=";

     

       17
       15
        
       

     

       18
       16
        
         meta = {

     

       19
       17
        
           description = "Go tool to modify struct field tags";

+8 -8

pkgs/development/tools/jp/default.nix

···

       1
       1
       -
       { lib, buildGoPackage, fetchFromGitHub }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       -
       buildGoPackage rec {

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
        
         pname = "jp";

     

       5
       5
       -
         version = "0.1.3";

     

       6
       6
       -
         rev = version;

     

       7
       7
       -
       

     

       8
       8
       -
         goPackagePath = "github.com/jmespath/jp";

     

       5
       5
       +
         version = "0.2.1";

     

       9
       6
        
       

     

       10
       7
        
         src = fetchFromGitHub {

     

       11
       11
       -
           inherit rev;

     

       8
       8
       +
           rev = version;

     

       12
       9
        
           owner = "jmespath";

     

       13
       10
        
           repo = "jp";

     

       14
       14
       -
           sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi";

     

       11
       11
       +
           hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY=";

     

       15
       12
        
         };

     

       13
       13
       +
       

     

       14
       14
       +
         vendorSha256 = "sha256-K6ZNtART7tcVBH5myV6vKrKWfnwK8yTa6/KK4QLyr00=";

     

       15
       15
       +
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "A command line interface to the JMESPath expression language for JSON";

     

       18
       18
        
           homepage = "https://github.com/jmespath/jp";

+2 -2

pkgs/development/tools/k6/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "k6";

     

       5
       5
       -
         version = "0.36.0";

     

       5
       5
       +
         version = "0.37.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "grafana";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-yWEh0sPMGe6mNcLKhbmJEUCHzZKFGMcTRNQrHgiQ+BQ=";

     

       11
       11
       +
           sha256 = "sha256-5pxOg+pwa2VrEWinDadx2ZFYXiQgochbU4bCkJEezQw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         subPackages = [ "./" ];

-2

pkgs/development/tools/kcli/default.nix

···

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a";

     

       15
       15
        
       

     

       16
       16
       -
         doCheck = false;

     

       17
       17
       -
       

     

       18
       16
        
         subPackages = [ "." ];

     

       19
       17
        
       

     

       20
       18
        
         meta = with lib; {

+3 -3

pkgs/development/tools/rust/cargo-crev/default.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         pname = "cargo-crev";

     

       16
       16
       -
         version = "0.23.0";

     

       16
       16
       +
         version = "0.23.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "crev-dev";

     

       20
       20
        
           repo = "cargo-crev";

     

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

     

       22
       22
       -
           sha256 = "sha256-iqFE3sz7cIFcd9zCFjU1PjMWVmxCRcdiiGAbirWUWMA=";

     

       22
       22
       +
           sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoSha256 = "sha256-qlqW5phw7QI5KT2uUamQFEYHZd4uzYaUuvZTG3KhrOU=";

     

       25
       25
       +
         cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0=";

     

       26
       26
        
       

     

       27
       27
        
         preCheck = ''

     

       28
       28
        
           export HOME=$(mktemp -d)

+3 -3

pkgs/development/tools/stylua/default.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "stylua";

     

       10
       10
       -
         version = "0.12.4";

     

       10
       10
       +
         version = "0.12.5";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "johnnymorganz";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-BPLN7/LaVDtCOJBgIJVbnENUyFtacRsK3JxDupytzOA=";

     

       16
       16
       +
           sha256 = "sha256-4tQQTTAdIAhlkBJevwwwGXOKd6bJJOyG4nlbCv7909Y=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoSha256 = "sha256-MZsFbFQp5Rw20pXzvTFNhMiVx/TJZ63/2rU7vj7IcqQ=";

     

       19
       19
       +
         cargoSha256 = "sha256-DGe2lB8xZgY9ikTsIHDOdHzTyHfDaSlmy8FU/S9FDCI=";

     

       20
       20
        
       

     

       21
       21
        
         buildFeatures = lib.optional lua52Support "lua52"

     

       22
       22
        
           ++ lib.optional luauSupport "luau";

+1 -1

pkgs/development/web/nodejs/setup-hook.sh

···

       1
       1
        
       addNodePath () {

     

       2
       2
       -
           addToSearchPath NODE_PATH $1/lib/node_modules

     

       2
       2
       +
           addToSearchPath NODE_PATH "$1/lib/node_modules"

     

       3
       3
        
       }

     

       4
       4
        
       

     

       5
       5
        
       addEnvHooks "$hostOffset" addNodePath

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.271";

     

       6
       6
       +
         version = "4.14.272";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1mzxcjzw6y7b3fffz0hbgsl6328w3m5yv5xb21z57kr9vm828y80";

     

       16
       16
       +
           sha256 = "0scx13pc5y5jmm5xa17my242gsgb1mf0cgqzjx656g7kkh4phqcv";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.19.234";

     

       6
       6
       +
         version = "4.19.235";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "12rd468wvmmdmgzy9vs2ny155yp9wxrf15lrslpc8xm4wimrd0h0";

     

       16
       16
       +
           sha256 = "1615y3ma9icmqqr7lisl8nd8zvvkh77a81yl39yvy6qi9345l32k";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       1
        
       { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.9.306";

     

       4
       4
       +
         version = "4.9.307";

     

       5
       5
        
         extraMeta.branch = "4.9";

     

       6
       6
        
         extraMeta.broken = stdenv.isAarch64;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "1cvsz3sf24g2623m7fxc6ilzsdmzi8s8lnks3sg68sax0qdx0ny7";

     

       10
       10
       +
           sha256 = "1xyhz7hq8yyclxyavzk36sbl41vlb74pccd56240kq34ma1hyis7";

     

       11
       11
        
         };

     

       12
       12
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.10.105";

     

       6
       6
       +
         version = "5.10.106";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "11fb9y6sqrf0hvak83ym7sbbacjl3q51w523vxjdpjmrn850xp1x";

     

       16
       16
       +
           sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.15.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.15.28";

     

       6
       6
       +
         version = "5.15.29";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       18
       18
       -
           sha256 = "1rhhn2a7799nnvx8dj83glb0p0qakxanhxvvl7crznvip7rvp8nq";

     

       18
       18
       +
           sha256 = "0vl7xm4xs59z071wfjna392yada3hg5h6h3dfjaswircc22fc1ar";

     

       19
       19
        
         };

     

       20
       20
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.16.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.16.14";

     

       6
       6
       +
         version = "5.16.15";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1xkl0mfjby7w6r3fqyjds94h2lmc77nzp970w7wz1rfmb63ab2vs";

     

       16
       16
       +
           sha256 = "1mi41npkk1inqchm3yp14xmzc5lrp50d7vbpazwxwq5kw04c8c4g";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.4.184";

     

       6
       6
       +
         version = "5.4.185";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "128laiqkr6z3pya8ws7r2ddrpbc3xyn80zwclz2wlrf6wqwwm546";

     

       16
       16
       +
           sha256 = "11rp3x05bq9cs9gwy4x36ynkgl7nb5ss29zi6m7n5ywvczdfjpyi";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-libre.nix

···

       1
       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
       2
        
       , scripts ? fetchsvn {

     

       3
       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       4
       -
           rev = "18627";

     

       5
       5
       -
           sha256 = "0qlalxpw2a24625ck5mxchpxl6i6cgmzkzfgyp9apmhdy8590fv5";

     

       4
       4
       +
           rev = "18635";

     

       5
       5
       +
           sha256 = "0d74hji2cms9z3h3s1j4i7qnw1350a95vafrqargf9s2zz0bkgfc";

     

       6
       6
        
         }

     

       7
       7
        
       , ...

     

       8
       8
        
       }:

+2 -2

pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix

···

       10
       10
        
       

     

       11
       11
        
       buildGoModule rec {

     

       12
       12
        
         pname = "oci-seccomp-bpf-hook";

     

       13
       13
       -
         version = "1.2.3";

     

       13
       13
       +
         version = "1.2.5";

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "containers";

     

       16
       16
        
           repo = "oci-seccomp-bpf-hook";

     

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

     

       18
       18
       -
           sha256 = "sha256-EKD6tkdQCPlVlb9ScvRwDxYAtbbv9PIqBHH6SvtPDsE=";

     

       18
       18
       +
           sha256 = "sha256-PU7WX5RAV6wWVRsqq6MdEjr00AtlTT4cSacRaxrEF2s=";

     

       19
       19
        
         };

     

       20
       20
        
         vendorSha256 = null;

     

       21
       21

+1 -1

pkgs/os-specific/linux/tuigreet/default.nix

···

       17
       17
        
         cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
       -
           description = "Graphical console greter for greetd";

     

       20
       20
       +
           description = "Graphical console greeter for greetd";

     

       21
       21
        
           homepage = "https://github.com/apognu/tuigreet";

     

       22
       22
        
           license = licenses.gpl3Plus;

     

       23
       23
        
           maintainers = with maintainers; [ luc65r ivar ];

+3 -1

pkgs/os-specific/linux/udisks/2-default.nix

···

       25
       25
        
             blkid = "${util-linux}/bin/blkid";

     

       26
       26
        
             false = "${coreutils}/bin/false";

     

       27
       27
        
             mdadm = "${mdadm}/bin/mdadm";

     

       28
       28
       +
             mkswap = "${util-linux}/bin/mkswap";

     

       28
       29
        
             sed = "${gnused}/bin/sed";

     

       29
       30
        
             sh = "${bash}/bin/sh";

     

       30
       31
        
             sleep = "${coreutils}/bin/sleep";

     

       32
       32
       +
             swapon = "${util-linux}/bin/swapon";

     

       31
       33
        
             true = "${coreutils}/bin/true";

     

       32
       34
        
           })

     

       33
       35
        
           (substituteAll {

     
···

       77
       79
        
           description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";

     

       78
       80
        
           homepage = "https://www.freedesktop.org/wiki/Software/udisks/";

     

       79
       81
        
           license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon

     

       80
       80
       -
           maintainers = with maintainers; [ johnazoidberg ];

     

       82
       82
       +
           maintainers = teams.freedesktop.members ++ (with maintainers; [ johnazoidberg ]);

     

       81
       83
        
           platforms = platforms.linux;

     

       82
       84
        
         };

     

       83
       85
        
       }

+20 -17

pkgs/os-specific/linux/udisks/fix-paths.patch

···

       1
       1
       -
       diff --git a/Makefile.am b/Makefile.am

     

       2
       2
       -
       index 56922b79..697f8c6e 100644

     

       3
       3
       -
       --- a/Makefile.am

     

       4
       4
       -
       +++ b/Makefile.am

     

       5
       5
       -
       @@ -1,6 +1,6 @@

     

       6
       6
       -
        ## Process this file with automake to produce Makefile.in

     

       7
       7
       -
        

     

       8
       8
       -
       -SHELL = @BASH@

     

       9
       9
       -
       +SHELL = @bash@

     

       10
       10
       -
        .SHELLFLAGS = -o pipefail -c

     

       11
       11
       -
        

     

       12
       12
       -
        PYTHON ?= python3

     

       13
       1
        
       diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules

     

       14
       14
       -
       index 39bfa28b..ee1ca90a 100644

     

       2
       2
       +
       index ca802cce..bfd1c29e 100644

     

       15
       3
        
       --- a/data/80-udisks2.rules

     

       16
       4
        
       +++ b/data/80-udisks2.rules

     

       17
       5
        
       @@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"

     
···

       66
       54
        
        # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

     

       67
       55
        
        #

     

       68
       56
        
       diff --git a/src/tests/integration-test b/src/tests/integration-test

     

       69
       69
       -
       index 4499a6a9..8b711f95 100755

     

       57
       57
       +
       index 07e4e029..3bd8ec51 100755

     

       70
       58
        
       --- a/src/tests/integration-test

     

       71
       59
        
       +++ b/src/tests/integration-test

     

       60
       60
       +
       @@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase):

     

       61
       61
       +
                if not device:

     

       62
       62
       +
                    device = cls.devname(partition)

     

       63
       63
       +
                result = {}

     

       64
       64
       +
       -        cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)

     

       65
       65
       +
       +        cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)

     

       66
       66
       +
                for l in cmd.stdout:

     

       67
       67
       +
                    (key, value) = l.decode('UTF-8').split('=', 1)

     

       68
       68
       +
                    result[key] = value.strip()

     

       69
       69
       +
       @@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase):

     

       70
       70
       +
                        f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '

     

       71
       71
       +
                                'ATTRS{model}=="scsi_debug*", '

     

       72
       72
       +
                                'ENV{ID_CDROM_MEDIA}=="?*", '

     

       73
       73
       +
       -                        'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')

     

       74
       74
       +
       +                        'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')

     

       75
       75
       +
                    # reload udev

     

       76
       76
       +
                    subprocess.call('sync; pkill --signal HUP udevd || '

     

       77
       77
       +
                                    'pkill --signal HUP systemd-udevd',

     

       72
       78
        
       @@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):

     

       73
       79
        
                self.assertFalse(os.access(f, os.X_OK))

     

       74
       80
        
        

     
···

       150
       156
        
          udisks_spawned_job_start (job);

     

       151
       157
        
          g_object_unref (job);

     

       152
       158
        
        }

     

       153
       153
       -
       -- 

     

       154
       154
       -
       2.33.1

     

       155
       155
       -

+2 -2

pkgs/os-specific/linux/usbguard/default.nix

···

       24
       24
        
       assert libgcrypt != null -> libsodium == null;

     

       25
       25
        
       

     

       26
       26
        
       stdenv.mkDerivation rec {

     

       27
       27
       -
         version = "1.1.0";

     

       27
       27
       +
         version = "1.1.1";

     

       28
       28
        
         pname = "usbguard";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchFromGitHub {

     

       31
       31
        
           owner = "USBGuard";

     

       32
       32
        
           repo = pname;

     

       33
       33
        
           rev = "usbguard-${version}";

     

       34
       34
       -
           sha256 = "sha256-lnHeU/X/2N81WPLakRYLs8TjpBhxBPhiXDJ+wNW0sU0=";

     

       34
       34
       +
           sha256 = "sha256-lAh+l9GF+FHQqv2kEYU5JienZKGwR5e45BYAwjieYgw=";

     

       35
       35
        
           fetchSubmodules = true;

     

       36
       36
        
         };

     

       37
       37

+9 -2

pkgs/servers/dns/coredns/default.nix

···

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-Vxs+k4WF55xwjgdlW/1NM4NWnYqj2EOLOONflj+BoY4=";

     

       15
       15
        
       

     

       16
       16
       -
         doCheck = false;

     

       16
       16
       +
         postPatch = ''

     

       17
       17
       +
           substituteInPlace test/file_cname_proxy_test.go \

     

       18
       18
       +
             --replace "TestZoneExternalCNAMELookupWithProxy" \

     

       19
       19
       +
                       "SkipZoneExternalCNAMELookupWithProxy"

     

       20
       20
       +
       

     

       21
       21
       +
           substituteInPlace test/readme_test.go \

     

       22
       22
       +
             --replace "TestReadme" "SkipReadme"

     

       23
       23
       +
         '';

     

       17
       24
        
       

     

       18
       25
        
         meta = with lib; {

     

       19
       26
        
           homepage = "https://coredns.io";

     

       20
       27
        
           description = "A DNS server that runs middleware";

     

       21
       28
        
           license = licenses.asl20;

     

       22
       22
       -
           maintainers = with maintainers; [ rushmorem rtreffer deltaevo ];

     

       29
       29
       +
           maintainers = with maintainers; [ rushmorem rtreffer deltaevo superherointj ];

     

       23
       30
        
         };

     

       24
       31
        
       }

+6 -4

pkgs/servers/http/apache-httpd/2.4.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx

     

       1
       1
       +
       { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which

     

       2
       2
        
       , nixosTests

     

       3
       3
        
       , proxySupport ? true

     

       4
       4
        
       , sslSupport ? true, openssl

     
···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "apache-httpd";

     

       14
       14
       -
         version = "2.4.52";

     

       14
       14
       +
         version = "2.4.53";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://apache/httpd/httpd-${version}.tar.bz2";

     

       18
       18
       -
           sha256 = "sha256-ASf33El+mYPpxRR0vtdeRWB/L4cKdnWobckK9tVy9ck=";

     

       18
       18
       +
           sha256 = "sha256-0LvREhpXtfKm/5LXuW+AUMWkXT8U2xGPZJedUlhY22M=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         # FIXME: -dev depends on -doc

     

       22
       22
        
         outputs = [ "out" "dev" "man" "doc" ];

     

       23
       23
        
         setOutputFlags = false; # it would move $out/modules, etc.

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [ which ];

     

       24
       26
        
       

     

       25
       27
        
         buildInputs = [ perl ] ++

     

       26
       28
        
           lib.optional brotliSupport brotli ++

     
···

       42
       44
        
           "--with-apr=${apr.dev}"

     

       43
       45
        
           "--with-apr-util=${aprutil.dev}"

     

       44
       46
        
           "--with-z=${zlib.dev}"

     

       45
       45
       -
           "--with-pcre=${pcre.dev}"

     

       47
       47
       +
           "--with-pcre=${pcre2.dev}/bin/pcre2-config"

     

       46
       48
        
           "--disable-maintainer-mode"

     

       47
       49
        
           "--disable-debugger-mode"

     

       48
       50
        
           "--enable-mods-shared=all"

+6 -11

pkgs/servers/nextcloud/default.nix

···

       33
       33
        
           };

     

       34
       34
        
         };

     

       35
       35
        
       in {

     

       36
       36
       -
         nextcloud20 = throw ''

     

       37
       37
       -
           Nextcloud v20 has been removed from `nixpkgs` as the support for it was dropped

     

       38
       38
       -
           by upstream in 2021-10. Please upgrade to at least Nextcloud v21 by declaring

     

       36
       36
       +
         nextcloud21 = throw ''

     

       37
       37
       +
           Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped

     

       38
       38
       +
           by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring

     

       39
       39
        
       

     

       40
       40
       -
               services.nextcloud.package = pkgs.nextcloud21;

     

       40
       40
       +
               services.nextcloud.package = pkgs.nextcloud22;

     

       41
       41
        
       

     

       42
       42
        
           in your NixOS config.

     

       43
       43
        
       

     

       44
       44
       -
           WARNING: if you were on Nextcloud 19 on NixOS 21.05 you have to upgrade to Nextcloud 20

     

       45
       45
       -
           first on 21.05 because Nextcloud doesn't support upgrades accross multiple major versions!

     

       44
       44
       +
           WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21

     

       45
       45
       +
           first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions!

     

       46
       46
        
         '';

     

       47
       47
       -
       

     

       48
       48
       -
         nextcloud21 = generic {

     

       49
       49
       -
           version = "21.0.9";

     

       50
       50
       -
           sha256 = "sha256-p6bvgTXmmjGN3TRQpG88f3YPksh0QzWG9j9KnEjcrqE=";

     

       51
       51
       -
         };

     

       52
       47
        
       

     

       53
       48
        
         nextcloud22 = generic {

     

       54
       49
        
           version = "22.2.5";

+3 -3

pkgs/servers/piping-server-rust/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "piping-server-rust";

     

       5
       5
       -
         version = "0.12.0";

     

       5
       5
       +
         version = "0.12.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nwtgck";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-eDO2y/4660IAcD9vf1Vt6t3nv3Rc+zCRRFBbW/FeKIw=";

     

       11
       11
       +
           sha256 = "sha256-L15ofIM5a/qoJHGXmkuTsmQLLmERG/PxAJ4+z1nn7w4=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-U68R543l28osPe0DjuERqB/G6ur/BZDpWMZIO9RObaM=";

     

       14
       14
       +
         cargoSha256 = "sha256-CcIM7T7P4LbPxPK1ZqoJRP0IsLMEwMZg9DcuRu0aJHM=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];

     

       17
       17

+6 -4

pkgs/shells/fish/default.nix

···

       134
       134
        
       

     

       135
       135
        
         fish = stdenv.mkDerivation rec {

     

       136
       136
        
           pname = "fish";

     

       137
       137
       -
           version = "3.3.1";

     

       137
       137
       +
           version = "3.4.0";

     

       138
       138
        
       

     

       139
       139
        
           src = fetchurl {

     

       140
       140
        
             # There are differences between the release tarball and the tarball GitHub

     
···

       144
       144
        
             # --version`), as well as the local documentation for all builtins (and

     

       145
       145
        
             # maybe other things).

     

       146
       146
        
             url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";

     

       147
       147
       -
             sha256 = "sha256-tbTuGlJpdiy76ZOkvWUH5nXkEAzpu+hCFKXusrGfrok=";

     

       147
       147
       +
             sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U=";

     

       148
       148
        
           };

     

       149
       149
       -
       

     

       150
       150
       -
           patches = [ ./tests-pcre2-update.patch ]; # should be included in >= 3.4

     

       151
       149
        
       

     

       152
       150
        
           # Fix FHS paths in tests

     

       153
       151
        
           postPatch = ''

     
···

       182
       180
        
             rm tests/pexpects/exit.py

     

       183
       181
        
             rm tests/pexpects/job_summary.py

     

       184
       182
        
             rm tests/pexpects/signals.py

     

       183
       183
       +
           '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) ''

     

       184
       184
       +
             # pexpect tests are flaky on aarch64-linux

     

       185
       185
       +
             # See https://github.com/fish-shell/fish-shell/issues/8789

     

       186
       186
       +
             rm tests/pexpects/exit_handlers.py

     

       185
       187
        
           '';

     

       186
       188
        
       

     

       187
       189
        
           nativeBuildInputs = [

-7

pkgs/shells/fish/tests-pcre2-update.patch

···

       1
       1
       -
       Adapted formating to 3.3.1 from

     

       2
       2
       -
       https://github.com/fish-shell/fish-shell/commit/ec8844d834cc9fe626e9fc326c6f5410341d532a

     

       3
       3
       -
       --- a/src/fish_tests.cpp

     

       4
       4
       -
       +++ b/src/fish_tests.cpp

     

       5
       5
       -
       @@ -5726,2 +5725,0 @@

     

       6
       6
       -
       -        {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},

     

       7
       7
       -
       -        {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},

+29 -4

pkgs/tools/admin/berglas/default.nix

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
       +
       let

     

       4
       4
       +
         skipTests = {

     

       5
       5
       +
           access = "Access";

     

       6
       6
       +
           create = "Create";

     

       7
       7
       +
           delete = "Delete";

     

       8
       8
       +
           list = "List";

     

       9
       9
       +
           read = "Read";

     

       10
       10
       +
           replace = "Replace";

     

       11
       11
       +
           resolver = "Resolve";

     

       12
       12
       +
           revoke = "Revoke";

     

       13
       13
       +
           update = "Update";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         skipTestsCommand =

     

       17
       17
       +
           builtins.foldl' (acc: goFileName:

     

       18
       18
       +
             let testName = builtins.getAttr goFileName skipTests; in

     

       19
       19
       +
             ''

     

       20
       20
       +
               ${acc}

     

       21
       21
       +
               substituteInPlace pkg/berglas/${goFileName}_test.go \

     

       22
       22
       +
                 --replace "TestClient_${testName}_storage" "SkipClient_${testName}_storage" \

     

       23
       23
       +
                 --replace "TestClient_${testName}_secretManager" "SkipClient_${testName}_secretManager"

     

       24
       24
       +
             ''

     

       25
       25
       +
           ) "" (builtins.attrNames skipTests);

     

       26
       26
       +
       in

     

       27
       27
       +
       

     

       3
       28
        
       buildGoModule rec {

     

       4
       29
        
         pname = "berglas";

     

       5
       5
       -
         version = "0.5.1";

     

       30
       30
       +
         version = "0.6.2";

     

       6
       31
        
       

     

       7
       32
        
         src = fetchFromGitHub {

     

       8
       33
        
           owner = "GoogleCloudPlatform";

     

       9
       34
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n";

     

       36
       36
       +
           sha256 = "sha256-aLsrrK+z080qn7L2zggA8yD+QqLaSRJLTjWQnFKFogQ=";

     

       12
       37
        
         };

     

       13
       38
        
       

     

       14
       14
       -
         vendorSha256 = null;

     

       39
       39
       +
         vendorSha256 = "sha256-HjZT0jezJzoEvXuzrjoTv/zSex+xDuGoP1h82CIlX14=";

     

       15
       40
        
       

     

       16
       16
       -
         doCheck = false;

     

       41
       41
       +
         postPatch = skipTestsCommand;

     

       17
       42
        
       

     

       18
       43
        
         meta = with lib; {

     

       19
       44
        
           description = "A tool for managing secrets on Google Cloud";

+2 -2

pkgs/tools/admin/fits-cloudctl/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "fits-cloudctl";

     

       8
       8
       -
         version = "0.10.11";

     

       8
       8
       +
         version = "0.10.12";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "fi-ts";

     

       12
       12
        
           repo = "cloudctl";

     

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

     

       14
       14
       -
           sha256 = "sha256-hGKnQk2OPpHsjbRh/xx3MidbUMio6tYn+oJB0t1a/yM=";

     

       14
       14
       +
           sha256 = "sha256-nFxudeJJ5BkfZxSnRquyATHyHwI+7xwfQxiY8cedtis=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o=";

+3 -3

pkgs/tools/admin/syft/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "syft";

     

       5
       5
       -
         version = "0.41.4";

     

       5
       5
       +
         version = "0.41.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "anchore";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-QRT5wvud9VMtXQ8QPC7joIMq7kYYlfVUSgzqMFW5LIE=";

     

       11
       11
       +
           sha256 = "sha256-Ebs0IVdcll7bTNjoZalD5Ye0GFXJeas1nPseYLzZxOk=";

     

       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;

     
···

       22
       22
        
             find "$out" -name .git -print0 | xargs -0 rm -rf

     

       23
       23
        
           '';

     

       24
       24
        
         };

     

       25
       25
       -
         vendorSha256 = "sha256-9/Mtjqny68HN4FItT2+yoknzdHBAS1aQL0VkTdm6624=";

     

       25
       25
       +
         vendorSha256 = "sha256-/WGkQfCUDmolGdzNxIZKzZnXWnqO2vvizBLJgO+s4Ak=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ installShellFiles ];

     

       28
       28

+3 -3

pkgs/tools/admin/trivy/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "trivy";

     

       8
       8
       -
         version = "0.24.2";

     

       8
       8
       +
         version = "0.24.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "aquasecurity";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-xMLSou+8kIQVEJlkA7ygv623hvETcEAdyFPR3HJr5ZQ=";

     

       14
       14
       +
           sha256 = "sha256-8ozoSorVoYt5C4F2FgEwGYQErBVnoTt2FhxiC3/SGsA=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-qRkxDvrqMVOsz5r3m3I+E0HAVoUwFykkfGzTz9Qc/S4=";

     

       17
       17
       +
         vendorSha256 = "sha256-HM4SxCvvHz7MZsHa8+Orx1KKCRhyZH28JlN9wW+/xIw=";

     

       18
       18
        
       

     

       19
       19
        
         excludedPackages = "misc";

     

       20
       20

+24 -11

pkgs/tools/archivers/p7zip/default.nix

···

       8
       8
        
           owner  = "jinfeihan57";

     

       9
       9
        
           repo   = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18=";

     

       11
       11
       +
           sha256 = {

     

       12
       12
       +
             free = "sha256-DrBuf2VPdcprHI6pMSmL7psm2ofOrUf0Oj0qwMjXzkk=";

     

       13
       13
       +
             unfree = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18=";

     

       14
       14
       +
           }.${if enableUnfree then "unfree" else "free"};

     

       15
       15
       +
           # remove the unRAR related code from the src drv

     

       16
       16
       +
           # > the license requires that you agree to these use restrictions,

     

       17
       17
       +
           # > or you must remove the software (source and binary) from your hard disks

     

       18
       18
       +
           # https://fedoraproject.org/wiki/Licensing:Unrar

     

       19
       19
       +
           extraPostFetch = lib.optionalString (!enableUnfree) ''

     

       20
       20
       +
             rm -r $out/CPP/7zip/Compress/Rar*

     

       21
       21
       +
             find $out -name makefile'*' -exec sed -i '/Rar/d' {} +

     

       22
       22
       +
           '';

     

       12
       23
        
         };

     

       13
       24
        
       

     

       14
       25
        
         # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional

     
···

       25
       36
        
           substituteInPlace makefile.machine \

     

       26
       37
        
             --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \

     

       27
       38
        
             --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'

     

       28
       28
       -
         '' + lib.optionalString (!enableUnfree) ''

     

       29
       29
       -
           # Remove non-free RAR source code

     

       30
       30
       -
           # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar)

     

       31
       31
       -
           rm -r CPP/7zip/Compress/Rar*

     

       32
       32
       -
           find . -name makefile'*' -exec sed -i '/Rar/d' {} +

     

       33
       39
        
         '';

     

       34
       40
        
       

     

       35
       41
        
         makeFlags = [ "DEST_HOME=${placeholder "out"}" ];

     
···

       46
       52
        
       

     

       47
       53
        
         NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";

     

       48
       54
        
       

     

       49
       49
       -
         meta = {

     

       55
       55
       +
         passthru.updateScript = ./update.sh;

     

       56
       56
       +
       

     

       57
       57
       +
         meta = with lib; {

     

       50
       58
        
           homepage = "https://github.com/jinfeihan57/p7zip";

     

       51
       59
        
           description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";

     

       52
       52
       -
           platforms = lib.platforms.unix;

     

       53
       53
       -
           maintainers = [ lib.maintainers.raskin ];

     

       60
       60
       +
           license = with licenses;

     

       61
       61
       +
             # p7zip code is largely lgpl2Plus

     

       62
       62
       +
             # CPP/7zip/Compress/LzfseDecoder.cpp is bsd3

     

       63
       63
       +
             [ lgpl2Plus /* and */ bsd3 ] ++

     

       64
       64
       +
             # and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction

     

       65
       65
       +
             # the unRAR compression code is disabled by default

     

       66
       66
       +
             lib.optionals enableUnfree [ unfree ];

     

       67
       67
       +
           maintainers = with maintainers; [ raskin jk ];

     

       68
       68
       +
           platforms = platforms.unix;

     

       54
       69
        
           mainProgram = "7z";

     

       55
       55
       -
           # RAR code is under non-free UnRAR license, but we remove it

     

       56
       56
       -
           license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;

     

       57
       70
        
         };

     

       58
       71
        
       }

+47

pkgs/tools/archivers/p7zip/update.sh

···

       1
       1
       +
       #! /usr/bin/env nix-shell

     

       2
       2
       +
       #! nix-shell -i bash -p coreutils gnused curl jq

     

       3
       3
       +
       set -euo pipefail

     

       4
       4
       +
       cd "$(dirname "${BASH_SOURCE[0]}")"

     

       5
       5
       +
       

     

       6
       6
       +
       DRV_DIR="$PWD"

     

       7
       7
       +
       

     

       8
       8
       +
       OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"

     

       9
       9
       +
       

     

       10
       10
       +
       NEW_VERSION="$(curl https://api.github.com/repos/jinfeihan57/p7zip/releases/latest | jq .tag_name -r | tr -d 'v')"

     

       11
       11
       +
       

     

       12
       12
       +
       echo "comparing versions $OLD_VERSION => $NEW_VERSION"

     

       13
       13
       +
       if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then

     

       14
       14
       +
           echo "Already up to date! Doing nothing"

     

       15
       15
       +
           exit 0

     

       16
       16
       +
       fi

     

       17
       17
       +
       

     

       18
       18
       +
       NIXPKGS_ROOT="$(realpath "$DRV_DIR/../../../..")"

     

       19
       19
       +
       

     

       20
       20
       +
       echo "getting free source hash"

     

       21
       21
       +
       OLD_FREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; p7zip.src.drvAttrs.outputHash" | tr -d '"')"

     

       22
       22
       +
       echo "getting unfree source hash"

     

       23
       23
       +
       OLD_UNFREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; (p7zip.override { enableUnfree = true; }).src.drvAttrs.outputHash" | tr -d '"')"

     

       24
       24
       +
       

     

       25
       25
       +
       

     

       26
       26
       +
       NEW_FREE_HASH=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "p7zip.src" --rev "v$NEW_VERSION")

     

       27
       27
       +
       

     

       28
       28
       +
       NEW_UNFREE_OUT=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "(p7zip.override { enableUnfree = true; }).src" --rev "v$NEW_VERSION" --output raw --print-path)

     

       29
       29
       +
       # first line of raw output is the hash

     

       30
       30
       +
       NEW_UNFREE_HASH="$(echo "$NEW_UNFREE_OUT" | sed -n 1p)"

     

       31
       31
       +
       # second line of raw output is the src path

     

       32
       32
       +
       NEW_UNFREE_SRC="$(echo "$NEW_UNFREE_OUT" | sed -n 2p)"

     

       33
       33
       +
       # make sure to nuke the unfree src from the updater's machine

     

       34
       34
       +
       # > the license requires that you agree to these use restrictions, or you must remove the software (source and binary) from your hard disks

     

       35
       35
       +
       # https://fedoraproject.org/wiki/Licensing:Unrar

     

       36
       36
       +
       nix-store --delete "$NEW_UNFREE_SRC"

     

       37
       37
       +
       

     

       38
       38
       +
       

     

       39
       39
       +
       echo "updating version"

     

       40
       40
       +
       sed -i "s/version = \"$OLD_VERSION\";/version = \"$NEW_VERSION\";/" "$DRV_DIR/default.nix"

     

       41
       41
       +
       

     

       42
       42
       +
       echo "updating free hash"

     

       43
       43
       +
       sed -i "s@free = \"$OLD_FREE_HASH\";@free = \"$NEW_FREE_HASH\";@" "$DRV_DIR/default.nix"

     

       44
       44
       +
       echo "updating unfree hash"

     

       45
       45
       +
       sed -i "s@unfree = \"$OLD_UNFREE_HASH\";@unfree = \"$NEW_UNFREE_HASH\";@" "$DRV_DIR/default.nix"

     

       46
       46
       +
       

     

       47
       47
       +
       echo "done"

+2 -2

pkgs/tools/backup/btrbk/default.nix

···

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "btrbk";

     

       21
       21
       -
         version = "0.32.0";

     

       21
       21
       +
         version = "0.32.1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";

     

       25
       25
       -
           sha256 = "HmvNtIgFfeaiFuSRobWlcJqusPSYtqAqx+79+CeNVDQ=";

     

       25
       25
       +
           sha256 = "flQf1KTybPImDoD+iNe+P+u1rOiYxXjQoltuGPWuX3g=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [ asciidoctor makeWrapper ];

+7 -56

pkgs/tools/misc/plantuml-server/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, maven, jdk17_headless }:

     

       1
       1
       +
       { lib, stdenv, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         version = "1.2022.2";

     

       5
       5
       -
       

     

       6
       6
       -
         src = fetchFromGitHub {

     

       7
       7
       -
           owner = "plantuml";

     

       8
       8
       -
           repo = "plantuml-server";

     

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

     

       10
       10
       -
           sha256 = "sha256-55IBhulFo42jscBFrHM39qA0GRgKBoYNye4q9QkmjsM=";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         # perform fake build to make a fixed-output derivation out of the files downloaded from maven central

     

       14
       14
       -
         deps = stdenv.mkDerivation {

     

       15
       15
       -
           name = "plantuml-server-${version}-deps";

     

       16
       16
       -
           inherit src;

     

       17
       17
       -
           nativeBuildInputs = [ jdk17_headless maven ];

     

       18
       18
       -
           buildPhase = ''

     

       19
       19
       -
             runHook preBuild

     

       20
       20
       -
       

     

       21
       21
       -
             while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do

     

       22
       22
       -
               echo "timeout, restart maven to continue downloading"

     

       23
       23
       -
             done

     

       24
       24
       -
       

     

       25
       25
       -
             runHook postBuild

     

       26
       26
       -
           '';

     

       27
       27
       -
           # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside

     

       28
       28
       -
           installPhase = ''

     

       29
       29
       -
             find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete

     

       30
       30
       -
           '';

     

       31
       31
       -
           outputHashAlgo = "sha256";

     

       32
       32
       -
           outputHashMode = "recursive";

     

       33
       33
       -
           outputHash = "sha256-AheCBX5jFzDHqTI2pCWBIiDESEKMClXlvWIcFvu0goA=";

     

       34
       34
       -
         };

     

       35
       5
        
       in

     

       36
       36
       -
       

     

       37
       6
        
       stdenv.mkDerivation rec {

     

       38
       7
        
         pname = "plantuml-server";

     

       39
       8
        
         inherit version;

     

       40
       40
       -
         inherit src;

     

       41
       41
       -
       

     

       42
       42
       -
         nativeBuildInputs = [ jdk17_headless maven ];

     

       43
       43
       -
       

     

       44
       44
       -
         buildPhase = ''

     

       45
       45
       -
           runHook preBuild

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";

     

       11
       11
       +
           sha256 = "sha256-h4ulXzZ5L+VPhk2CnZQNxfnEJzWT3B9TNvDEWt4o9Hk=";

     

       12
       12
       +
         };

     

       46
       13
        
       

     

       47
       47
       -
           # maven can output reproducible files after setting project.build.outputTimestamp property

     

       48
       48
       -
           # see https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build

     

       49
       49
       -
           # 'maven.repo.local' must be writable so copy it out of nix store

     

       50
       50
       -
           cp -R $src repo

     

       51
       51
       -
           chmod +w -R repo

     

       52
       52
       -
           cd repo

     

       53
       53
       -
           mvn package --offline \

     

       54
       54
       -
             -Dproject.build.outputTimestamp=0 \

     

       55
       55
       -
             -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2

     

       56
       56
       -
       

     

       57
       57
       -
           runHook postBuild

     

       58
       58
       -
         '';

     

       59
       59
       -
       

     

       14
       14
       +
         dontUnpack = true;

     

       60
       15
        
         installPhase = ''

     

       61
       61
       -
           runHook preInstall

     

       62
       62
       -
       

     

       63
       16
        
           mkdir -p "$out/webapps"

     

       64
       64
       -
           cp "target/plantuml.war" "$out/webapps/plantuml.war"

     

       65
       65
       -
       

     

       66
       66
       -
           runHook postInstall

     

       17
       17
       +
           cp "$src" "$out/webapps/plantuml.war"

     

       67
       18
        
         '';

     

       68
       19
        
       

     

       69
       20
        
         meta = with lib; {

-2

pkgs/tools/misc/up/default.nix

···

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "1q8wfsfl3rz698ck5q5s5z6iw9k134fxxvwipcp2b052n998rcrx";

     

       15
       15
        
       

     

       16
       16
       -
         doCheck = false;

     

       17
       17
       -
       

     

       18
       16
        
         meta = with lib; {

     

       19
       17
        
           description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview";

     

       20
       18
        
           homepage = "https://github.com/akavel/up";

+3 -3

pkgs/tools/networking/frp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "frp";

     

       5
       5
       -
         version = "0.39.1";

     

       5
       5
       +
         version = "0.40.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "fatedier";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-tqdrYrIWbmRn+5iAZKd9GlcmFNQnh3yNxZ95As7+v5Q=";

     

       11
       11
       +
           sha256 = "sha256-W+88Fq9oYDBLCNp+6rc9jACJzky7FCZg/xLDowGGdm0=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-NPnchl+N6DeqMhsOIw2MYD/i2IZzHS9ZqbUOeulgb90=";

     

       14
       14
       +
         vendorSha256 = "sha256-iBjMFOERWQ1aPn+2gEoI9og2ov2LlBVV1sLAZlvqZPM=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

-2

pkgs/tools/networking/hey/default.nix

···

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

     

       15
       15
        
       

     

       16
       16
       -
         doCheck = false;

     

       17
       17
       -
       

     

       18
       16
        
         meta = with lib; {

     

       19
       17
        
           description = "HTTP load generator, ApacheBench (ab) replacement";

     

       20
       18
        
           homepage = "https://github.com/rakyll/hey";

+11 -7

pkgs/tools/networking/httpie/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , installShellFiles

     

       4
       4
       -
       , python3Packages

     

       4
       4
       +
       , python3

     

       5
       5
        
       , pandoc

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       python3Packages.buildPythonApplication rec {

     

       8
       8
       +
       python3.pkgs.buildPythonApplication rec {

     

       9
       9
        
         pname = "httpie";

     

       10
       10
       -
         version = "3.0.2";

     

       10
       10
       +
         version = "3.1.0";

     

       11
       11
       +
         format = "setuptools";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "httpie";

     

       14
       15
        
           repo = "httpie";

     

       15
       16
        
           rev = version;

     

       16
       16
       -
           sha256 = "sha256-s3IFzEUQmPBocgspVGx1nINkUamsi7tzwW37IqdBMxo=";

     

       17
       17
       +
           hash = "sha256-x7Zucb2i8D4Xbn77eBzSxOAcc2fGg5MFKFiyJhytQ0s=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         nativeBuildInputs = [

     
···

       21
       22
        
           pandoc

     

       22
       23
        
         ];

     

       23
       24
        
       

     

       24
       24
       -
         propagatedBuildInputs = with python3Packages; [

     

       25
       25
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       25
       26
        
           charset-normalizer

     

       26
       27
        
           defusedxml

     

       27
       28
        
           multidict

     
···

       31
       32
        
           setuptools

     

       32
       33
        
         ];

     

       33
       34
        
       

     

       34
       34
       -
         checkInputs = with python3Packages; [

     

       35
       35
       +
         checkInputs = with python3.pkgs; [

     

       35
       36
        
           mock

     

       36
       37
        
           pytest

     

       37
       38
        
           pytest-httpbin

     

       39
       39
       +
           pytest-lazy-fixture

     

       38
       40
        
           pytestCheckHook

     

       39
       41
        
           responses

     

       40
       42
        
         ];

     
···

       65
       67
        
           "httpie.encoding.detect_encoding"

     

       66
       68
        
         ];

     

       67
       69
        
       

     

       68
       68
       -
         pythonImportsCheck = [ "httpie" ];

     

       70
       70
       +
         pythonImportsCheck = [

     

       71
       71
       +
           "httpie"

     

       72
       72
       +
         ];

     

       69
       73
        
       

     

       70
       74
        
         meta = with lib; {

     

       71
       75
        
           description = "A command line HTTP client whose goal is to make CLI human-friendly";

+2 -2

pkgs/tools/networking/pirate-get/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonApplication rec {

     

       6
       6
        
         pname = "pirate-get";

     

       7
       7
       -
         version = "0.4.1";

     

       7
       7
       +
         version = "0.4.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "0pr703fwinr2f4rba86zp57mpf5j2jgvp5n50rc5vy5g7yfwsddm";

     

       11
       11
       +
           sha256 = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ colorama veryprettytable pyperclip ];

+19 -160

pkgs/tools/nix/nix-output-monitor/default.nix

···

       1
       1
       -
       # This file has been autogenerate with cabal2nix.

     

       2
       2
       -
       # Update via ./update.sh"

     

       3
       1
        
       {

     

       4
       4
       -
         mkDerivation,

     

       5
       5
       -
         ansi-terminal,

     

       6
       6
       -
         async,

     

       7
       7
       -
         attoparsec,

     

       8
       8
       -
         base,

     

       9
       9
       -
         bytestring,

     

       10
       10
       -
         cassava,

     

       11
       11
       -
         containers,

     

       12
       12
       -
         data-default,

     

       13
       13
       -
         directory,

     

       2
       2
       +
         haskell,

     

       14
       3
        
         expect,

     

       15
       15
       -
         extra,

     

       16
       16
       -
         fetchzip,

     

       17
       17
       -
         filepath,

     

       18
       18
       -
         generic-optics,

     

       19
       19
       -
         HUnit,

     

       4
       4
       +
         haskellPackages,

     

       20
       5
        
         installShellFiles,

     

       21
       21
       -
         lib,

     

       22
       22
       -
         lock-file,

     

       23
       23
       -
         MemoTrie,

     

       24
       24
       -
         mtl,

     

       25
       25
       -
         nix-derivation,

     

       26
       26
       -
         optics,

     

       27
       27
       -
         process,

     

       28
       28
       -
         random,

     

       29
       29
       -
         relude,

     

       30
       30
       -
         runtimeShell,

     

       31
       31
       -
         safe,

     

       32
       32
       -
         stm,

     

       33
       33
       -
         streamly,

     

       34
       34
       -
         terminal-size,

     

       35
       35
       -
         text,

     

       36
       36
       -
         time,

     

       37
       37
       -
         unix,

     

       38
       38
       -
         vector,

     

       39
       39
       -
         wcwidth,

     

       40
       40
       -
         word8,

     

       41
       41
       -
       }:

     

       42
       42
       -
       mkDerivation {

     

       43
       43
       -
         pname = "nix-output-monitor";

     

       44
       44
       -
         version = "1.1.2.0";

     

       45
       45
       -
         src = fetchzip {

     

       46
       46
       -
           url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.0.tar.gz";

     

       47
       47
       -
           sha256 = "03qhy4xzika41pxlmvpz3psgy54va72ipn9v1lv33l6369ikrhl1";

     

       6
       6
       +
       }: let

     

       7
       7
       +
         inherit (haskell.lib.compose) justStaticExecutables overrideCabal;

     

       8
       8
       +
         overrides = {

     

       9
       9
       +
           passthru.updateScript = ./update.sh;

     

       10
       10
       +
           testTarget = "unit-tests";

     

       11
       11
       +
           buildTools = [installShellFiles];

     

       12
       12
       +
           postInstall = ''

     

       13
       13
       +
             substitute "exe-sh/nom-build" "$out/bin/nom-build" \

     

       14
       14
       +
               --replace 'unbuffer' '${expect}/bin/unbuffer' \

     

       15
       15
       +
               --replace 'nom' "$out/bin/nom"

     

       16
       16
       +
             chmod a+x $out/bin/nom-build

     

       17
       17
       +
             installShellCompletion --zsh --name _nom-build completions/completion.zsh

     

       18
       18
       +
           '';

     

       48
       19
        
         };

     

       49
       49
       -
         isLibrary = true;

     

       50
       50
       -
         isExecutable = true;

     

       51
       51
       -
         libraryHaskellDepends = [

     

       52
       52
       -
           ansi-terminal

     

       53
       53
       -
           async

     

       54
       54
       -
           attoparsec

     

       55
       55
       -
           base

     

       56
       56
       -
           bytestring

     

       57
       57
       -
           cassava

     

       58
       58
       -
           containers

     

       59
       59
       -
           data-default

     

       60
       60
       -
           directory

     

       61
       61
       -
           extra

     

       62
       62
       -
           filepath

     

       63
       63
       -
           generic-optics

     

       64
       64
       -
           lock-file

     

       65
       65
       -
           MemoTrie

     

       66
       66
       -
           mtl

     

       67
       67
       -
           nix-derivation

     

       68
       68
       -
           optics

     

       69
       69
       -
           random

     

       70
       70
       -
           relude

     

       71
       71
       -
           safe

     

       72
       72
       -
           stm

     

       73
       73
       -
           streamly

     

       74
       74
       -
           terminal-size

     

       75
       75
       -
           text

     

       76
       76
       -
           time

     

       77
       77
       -
           unix

     

       78
       78
       -
           vector

     

       79
       79
       -
           wcwidth

     

       80
       80
       -
           word8

     

       81
       81
       -
         ];

     

       82
       82
       -
         executableHaskellDepends = [

     

       83
       83
       -
           ansi-terminal

     

       84
       84
       -
           async

     

       85
       85
       -
           attoparsec

     

       86
       86
       -
           base

     

       87
       87
       -
           bytestring

     

       88
       88
       -
           cassava

     

       89
       89
       -
           containers

     

       90
       90
       -
           data-default

     

       91
       91
       -
           directory

     

       92
       92
       -
           extra

     

       93
       93
       -
           filepath

     

       94
       94
       -
           generic-optics

     

       95
       95
       -
           lock-file

     

       96
       96
       -
           MemoTrie

     

       97
       97
       -
           mtl

     

       98
       98
       -
           nix-derivation

     

       99
       99
       -
           optics

     

       100
       100
       -
           random

     

       101
       101
       -
           relude

     

       102
       102
       -
           safe

     

       103
       103
       -
           stm

     

       104
       104
       -
           streamly

     

       105
       105
       -
           terminal-size

     

       106
       106
       -
           text

     

       107
       107
       -
           time

     

       108
       108
       -
           unix

     

       109
       109
       -
           vector

     

       110
       110
       -
           wcwidth

     

       111
       111
       -
           word8

     

       112
       112
       -
         ];

     

       113
       113
       -
         testHaskellDepends = [

     

       114
       114
       -
           ansi-terminal

     

       115
       115
       -
           async

     

       116
       116
       -
           attoparsec

     

       117
       117
       -
           base

     

       118
       118
       -
           bytestring

     

       119
       119
       -
           cassava

     

       120
       120
       -
           containers

     

       121
       121
       -
           data-default

     

       122
       122
       -
           directory

     

       123
       123
       -
           extra

     

       124
       124
       -
           filepath

     

       125
       125
       -
           generic-optics

     

       126
       126
       -
           HUnit

     

       127
       127
       -
           lock-file

     

       128
       128
       -
           MemoTrie

     

       129
       129
       -
           mtl

     

       130
       130
       -
           nix-derivation

     

       131
       131
       -
           optics

     

       132
       132
       -
           process

     

       133
       133
       -
           random

     

       134
       134
       -
           relude

     

       135
       135
       -
           safe

     

       136
       136
       -
           stm

     

       137
       137
       -
           streamly

     

       138
       138
       -
           terminal-size

     

       139
       139
       -
           text

     

       140
       140
       -
           time

     

       141
       141
       -
           unix

     

       142
       142
       -
           vector

     

       143
       143
       -
           wcwidth

     

       144
       144
       -
           word8

     

       145
       145
       -
         ];

     

       146
       146
       -
         homepage = "https://github.com/maralorn/nix-output-monitor";

     

       147
       147
       -
         description = "Parses output of nix-build to show additional information";

     

       148
       148
       -
         license = lib.licenses.agpl3Plus;

     

       149
       149
       -
         maintainers = with lib.maintainers; [maralorn];

     

       150
       150
       -
         passthru.updateScript = ./update.sh;

     

       151
       151
       -
         testTarget = "unit-tests";

     

       152
       152
       -
         buildTools = [installShellFiles];

     

       153
       153
       -
         postInstall = ''

     

       154
       154
       -
           cat > $out/bin/nom-build << EOF

     

       155
       155
       -
           #!${runtimeShell}

     

       156
       156
       -
           ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom

     

       157
       157
       -
           EOF

     

       158
       158
       -
           chmod a+x $out/bin/nom-build

     

       159
       159
       -
           installShellCompletion --zsh --name _nom-build ${builtins.toFile "completion.zsh" ''

     

       160
       160
       -
             #compdef nom-build

     

       161
       161
       -
             compdef nom-build=nix-build

     

       162
       162
       -
           ''}

     

       163
       163
       -
         '';

     

       164
       164
       -
       }

     

       20
       20
       +
       in

     

       21
       21
       +
         justStaticExecutables

     

       22
       22
       +
         (overrideCabal overrides

     

       23
       23
       +
           (haskellPackages.callPackage ./generated-package.nix {}))

+147

pkgs/tools/nix/nix-output-monitor/generated-package.nix

···

       1
       1
       +
       # This file has been autogenerate with cabal2nix.

     

       2
       2
       +
       # Update via ./update.sh"

     

       3
       3
       +
       {

     

       4
       4
       +
         mkDerivation,

     

       5
       5
       +
         ansi-terminal,

     

       6
       6
       +
         async,

     

       7
       7
       +
         attoparsec,

     

       8
       8
       +
         base,

     

       9
       9
       +
         bytestring,

     

       10
       10
       +
         cassava,

     

       11
       11
       +
         containers,

     

       12
       12
       +
         data-default,

     

       13
       13
       +
         directory,

     

       14
       14
       +
         extra,

     

       15
       15
       +
         fetchzip,

     

       16
       16
       +
         filepath,

     

       17
       17
       +
         generic-optics,

     

       18
       18
       +
         HUnit,

     

       19
       19
       +
         lib,

     

       20
       20
       +
         lock-file,

     

       21
       21
       +
         MemoTrie,

     

       22
       22
       +
         mtl,

     

       23
       23
       +
         nix-derivation,

     

       24
       24
       +
         optics,

     

       25
       25
       +
         process,

     

       26
       26
       +
         random,

     

       27
       27
       +
         relude,

     

       28
       28
       +
         safe,

     

       29
       29
       +
         stm,

     

       30
       30
       +
         streamly,

     

       31
       31
       +
         terminal-size,

     

       32
       32
       +
         text,

     

       33
       33
       +
         time,

     

       34
       34
       +
         unix,

     

       35
       35
       +
         vector,

     

       36
       36
       +
         wcwidth,

     

       37
       37
       +
         word8,

     

       38
       38
       +
       }:

     

       39
       39
       +
       mkDerivation {

     

       40
       40
       +
         pname = "nix-output-monitor";

     

       41
       41
       +
         version = "1.1.2.1";

     

       42
       42
       +
         src = fetchzip {

     

       43
       43
       +
           url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.1.tar.gz";

     

       44
       44
       +
           sha256 = "00jn963jskyqnwvbvn5x0z92x2gv105p5h8m13nlmr90lj4axynx";

     

       45
       45
       +
         };

     

       46
       46
       +
         isLibrary = true;

     

       47
       47
       +
         isExecutable = true;

     

       48
       48
       +
         libraryHaskellDepends = [

     

       49
       49
       +
           ansi-terminal

     

       50
       50
       +
           async

     

       51
       51
       +
           attoparsec

     

       52
       52
       +
           base

     

       53
       53
       +
           bytestring

     

       54
       54
       +
           cassava

     

       55
       55
       +
           containers

     

       56
       56
       +
           data-default

     

       57
       57
       +
           directory

     

       58
       58
       +
           extra

     

       59
       59
       +
           filepath

     

       60
       60
       +
           generic-optics

     

       61
       61
       +
           lock-file

     

       62
       62
       +
           MemoTrie

     

       63
       63
       +
           mtl

     

       64
       64
       +
           nix-derivation

     

       65
       65
       +
           optics

     

       66
       66
       +
           random

     

       67
       67
       +
           relude

     

       68
       68
       +
           safe

     

       69
       69
       +
           stm

     

       70
       70
       +
           streamly

     

       71
       71
       +
           terminal-size

     

       72
       72
       +
           text

     

       73
       73
       +
           time

     

       74
       74
       +
           unix

     

       75
       75
       +
           vector

     

       76
       76
       +
           wcwidth

     

       77
       77
       +
           word8

     

       78
       78
       +
         ];

     

       79
       79
       +
         executableHaskellDepends = [

     

       80
       80
       +
           ansi-terminal

     

       81
       81
       +
           async

     

       82
       82
       +
           attoparsec

     

       83
       83
       +
           base

     

       84
       84
       +
           bytestring

     

       85
       85
       +
           cassava

     

       86
       86
       +
           containers

     

       87
       87
       +
           data-default

     

       88
       88
       +
           directory

     

       89
       89
       +
           extra

     

       90
       90
       +
           filepath

     

       91
       91
       +
           generic-optics

     

       92
       92
       +
           lock-file

     

       93
       93
       +
           MemoTrie

     

       94
       94
       +
           mtl

     

       95
       95
       +
           nix-derivation

     

       96
       96
       +
           optics

     

       97
       97
       +
           random

     

       98
       98
       +
           relude

     

       99
       99
       +
           safe

     

       100
       100
       +
           stm

     

       101
       101
       +
           streamly

     

       102
       102
       +
           terminal-size

     

       103
       103
       +
           text

     

       104
       104
       +
           time

     

       105
       105
       +
           unix

     

       106
       106
       +
           vector

     

       107
       107
       +
           wcwidth

     

       108
       108
       +
           word8

     

       109
       109
       +
         ];

     

       110
       110
       +
         testHaskellDepends = [

     

       111
       111
       +
           ansi-terminal

     

       112
       112
       +
           async

     

       113
       113
       +
           attoparsec

     

       114
       114
       +
           base

     

       115
       115
       +
           bytestring

     

       116
       116
       +
           cassava

     

       117
       117
       +
           containers

     

       118
       118
       +
           data-default

     

       119
       119
       +
           directory

     

       120
       120
       +
           extra

     

       121
       121
       +
           filepath

     

       122
       122
       +
           generic-optics

     

       123
       123
       +
           HUnit

     

       124
       124
       +
           lock-file

     

       125
       125
       +
           MemoTrie

     

       126
       126
       +
           mtl

     

       127
       127
       +
           nix-derivation

     

       128
       128
       +
           optics

     

       129
       129
       +
           process

     

       130
       130
       +
           random

     

       131
       131
       +
           relude

     

       132
       132
       +
           safe

     

       133
       133
       +
           stm

     

       134
       134
       +
           streamly

     

       135
       135
       +
           terminal-size

     

       136
       136
       +
           text

     

       137
       137
       +
           time

     

       138
       138
       +
           unix

     

       139
       139
       +
           vector

     

       140
       140
       +
           wcwidth

     

       141
       141
       +
           word8

     

       142
       142
       +
         ];

     

       143
       143
       +
         homepage = "https://github.com/maralorn/nix-output-monitor";

     

       144
       144
       +
         description = "Parses output of nix-build to show additional information";

     

       145
       145
       +
         license = lib.licenses.agpl3Plus;

     

       146
       146
       +
         maintainers = with lib.maintainers; [maralorn];

     

       147
       147
       +
       }

+2 -23

pkgs/tools/nix/nix-output-monitor/update.sh

···

       9
       9
        
       # This is the directory of this update.sh script.

     

       10
       10
        
       script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

     

       11
       11
        
       

     

       12
       12
       -
       derivation_file="${script_dir}/default.nix"

     

       12
       12
       +
       derivation_file="${script_dir}/generated-package.nix"

     

       13
       13
        
       

     

       14
       14
        
       # This is the latest released version of nix-output-monitor on GitHub.

     

       15
       15
        
       new_version=$(curl --silent "https://api.github.com/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output)

     
···

       23
       23
        
       EOF

     

       24
       24
        
       

     

       25
       25
        
       cabal2nix \

     

       26
       26
       -
         --extra-arguments expect \

     

       27
       27
       -
         --extra-arguments runtimeShell\

     

       28
       28
       -
         --extra-arguments installShellFiles\

     

       29
       26
        
         --maintainer maralorn \

     

       30
       27
        
         "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" \

     

       31
       31
       -
         | head -n-1 >> "$derivation_file"

     

       32
       32
       -
       

     

       33
       33
       -
       cat >> "$derivation_file" << EOF

     

       34
       34
       -
           passthru.updateScript = ./update.sh;

     

       35
       35
       -
           testTarget = "unit-tests";

     

       36
       36
       -
           buildTools = [ installShellFiles ];

     

       37
       37
       -
           postInstall = ''

     

       38
       38
       -
               cat > \$out/bin/nom-build << EOF

     

       39
       39
       -
               #!\${runtimeShell}

     

       40
       40
       -
               \${expect}/bin/unbuffer nix-build "\\\$@" 2>&1 | exec \$out/bin/nom

     

       41
       41
       -
               EOF

     

       42
       42
       -
               chmod a+x \$out/bin/nom-build

     

       43
       43
       -
               installShellCompletion --zsh --name _nom-build \${builtins.toFile "completion.zsh" ''

     

       44
       44
       -
                   #compdef nom-build

     

       45
       45
       -
                   compdef nom-build=nix-build

     

       46
       46
       -
               ''}

     

       47
       47
       -
           '';

     

       48
       48
       -
       }

     

       49
       49
       -
       EOF

     

       28
       28
       +
         >> "$derivation_file"

     

       50
       29
        
       

     

       51
       30
        
       alejandra "${derivation_file}" | cat

     

       52
       31

+3 -3

pkgs/tools/security/cariddi/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "cariddi";

     

       8
       8
       -
         version = "1.1.5";

     

       8
       8
       +
         version = "1.1.6";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "edoardottt";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-PXQljC9rwlxXQ96fII3EjD4NXu61EMkYvMWqkcJZ4vU=";

     

       14
       14
       +
           sha256 = "sha256-/ez2biYU8NnVny8v5Mu9pLq0oqzcIenpyEb3qkPd9v8=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-zNUdglsfy6lEV54afCAoigxa3rR0qf/e3+B4PvVRIa4=";

     

       17
       17
       +
         vendorSha256 = "sha256-zJ39tAq+ooROMHG1vC2m2rbq+wttxqYxAd2hLg5GtJM=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Crawler for URLs and endpoints";

+2 -2

pkgs/tools/security/cfripper/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "cfripper";

     

       8
       8
       -
         version = "1.5.1";

     

       8
       8
       +
         version = "1.5.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "Skyscanner";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           hash = "sha256-/qcpLCk1ZZMKxhqK6q6sSbRDjiF5GQmDJzvCaV2kAqQ=";

     

       14
       14
       +
           hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = with python3.pkgs; [

+2 -2

pkgs/tools/security/exploitdb/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "exploitdb";

     

       5
       5
       -
         version = "2022-03-11";

     

       5
       5
       +
         version = "2022-03-15";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "offensive-security";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-dW4cLm//4wROsizRQ59sqEGPRZ26yIU5I7mdPEYC3YU=";

     

       11
       11
       +
           sha256 = "sha256-whV7zg7njGGjUpxsXZiNwVfHgrlop2RLZnCsBWQ+HkY=";

     

       12
       12
        
       

     

       13
       13
        
         };

     

       14
       14

+45

pkgs/tools/security/feroxbuster/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , openssl

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , rustPlatform

     

       7
       7
       +
       , Security

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       rustPlatform.buildRustPackage rec {

     

       11
       11
       +
         pname = "feroxbuster";

     

       12
       12
       +
         version = "2.6.1";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "epi052";

     

       16
       16
       +
           repo = pname;

     

       17
       17
       +
           rev = "v${version}";

     

       18
       18
       +
           hash = "sha256-RY9bFuALRaVXDrC0eIx0inPjRqNpRKNZf3mCrKIdGL8=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         cargoSha256 = "sha256-0Zawlx/lhF7K8nOsHYKO84pnctVMpm3RfnAFCOltOqE=";

     

       22
       22
       +
       

     

       23
       23
       +
         OPENSSL_NO_VENDOR = true;

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           pkg-config

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         buildInputs = [

     

       30
       30
       +
           openssl

     

       31
       31
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       32
       32
       +
           Security

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         # Tests require network access

     

       36
       36
       +
         doCheck = false;

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "Fast, simple, recursive content discovery tool";

     

       40
       40
       +
           homepage = "https://github.com/epi052/feroxbuster";

     

       41
       41
       +
           license = with licenses; [ mit ];

     

       42
       42
       +
           maintainers = with maintainers; [ fab ];

     

       43
       43
       +
         };

     

       44
       44
       +
       }

     

       45
       45
       +

+3 -3

pkgs/tools/security/grype/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "grype";

     

       9
       9
       -
         version = "0.33.1";

     

       9
       9
       +
         version = "0.34.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "anchore";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "sha256-5QjyGIpxnrwTnEmi0D16vPKodg3+SKiINFONwU2OzC0=";

     

       15
       15
       +
           sha256 = "sha256-tMkMGM45/LcFllEgQ3UTl6FsLJmdsU8SLcLH/8+zMA4=";

     

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

     

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

     

       18
       18
        
           leaveDotGit = true;

     
···

       27
       27
        
           '';

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       -
         vendorSha256 = "sha256-CPMfQv9oiLbIMkZe/t482LzssoNTcNVJdr2o2wJecSA=";

     

       30
       30
       +
         vendorSha256 = "sha256-WrUZFlN7dPbyN9InjX/Y9J+iYKu5v2/SHmRgDP5BJi8=";

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

     

       33
       33
        
           installShellFiles

+2 -2

pkgs/tools/security/sigma-cli/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3.pkgs.buildPythonApplication rec {

     

       7
       7
        
         pname = "sigma-cli";

     

       8
       8
       -
         version = "0.3.0";

     

       8
       8
       +
         version = "0.3.2";

     

       9
       9
        
         format = "pyproject";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "SigmaHQ";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           hash = "sha256-Nfd78Y35naDTzwodcdvJr/02CptcHxS717VGsR/QOuI=";

     

       15
       15
       +
           hash = "sha256-We6vJXLIxGe//78pgJFrihFJHl0gRd02I53hoYWcao0=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = with python3.pkgs; [

+3 -3

pkgs/tools/security/step-ca/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "step-ca";

     

       15
       15
       -
         version = "0.18.1";

     

       15
       15
       +
         version = "0.18.2";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "smallstep";

     

       19
       19
        
           repo = "certificates";

     

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

     

       21
       21
       -
           sha256 = "sha256-oebmJ+xrJTV5gXH3U1lWCSQMHiVnUTa0ZTp39sVB7KM=";

     

       21
       21
       +
           sha256 = "sha256-BhPup3q2muYGWzAa/9b4vnIjBces4GhUHZ/mg4CWMRc=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         vendorSha256 = "sha256-IJXJS+Z93Hw1I1CAeRv4mq8as9DKebqNFa0IMgZ+Kic=";

     

       24
       24
       +
         vendorSha256 = "sha256-oVaziWZGslZCVqkEXL32XvOVU54VOf41Qg+VoVWo7x0=";

     

       25
       25
        
       

     

       26
       26
        
         ldflags = [ "-buildid=" ];

     

       27
       27

+2 -2

pkgs/tools/system/syslog-ng/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "syslog-ng";

     

       10
       10
       -
         version = "3.35.1";

     

       10
       10
       +
         version = "3.36.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "sha256-HQI4sGs+WYfIWeW1Kezuc491us/wSxSTmLH+jLsSHlM=";

     

       14
       14
       +
           sha256 = "sha256-kKJcl2f+dJ21DxGN38kuxxOZdj0uzVrU8R/17qBJ5gs=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ pkg-config which ];

+1

pkgs/top-level/aliases.nix

···

       168
       168
        
         claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05

     

       169
       169
        
         claws-mail-gtk3 = claws-mail; # Added 2021-07-10

     

       170
       170
        
         clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22

     

       171
       171
       +
         clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15

     

       171
       172
        
         clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22

     

       172
       173
        
         cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05

     

       173
       174
        
         codimd = hedgedoc; # Added 2020-11-29

+17 -6

pkgs/top-level/all-packages.nix

···

       2388
       2388
        
       

     

       2389
       2389
        
         borgmatic = callPackage ../tools/backup/borgmatic { };

     

       2390
       2390
        
       

     

       2391
       2391
       +
         borg-sans-mono = callPackage ../data/fonts/borg-sans-mono { };

     

       2392
       2392
       +
       

     

       2391
       2393
        
         boringtun = callPackage ../tools/networking/boringtun { };

     

       2392
       2394
        
       

     

       2393
       2395
        
         bookstack = callPackage ../servers/web-apps/bookstack { };

     
···

       3428
       3430
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       3429
       3431
        
         };

     

       3430
       3432
        
       

     

       3433
       3433
       +
         lapce = callPackage ../applications/editors/lapce { };

     

       3434
       3434
       +
       

     

       3431
       3435
        
         lcdproc = callPackage ../servers/monitoring/lcdproc { };

     

       3432
       3436
        
       

     

       3433
       3437
        
         languagetool = callPackage ../tools/text/languagetool {  };

     
···

       3602
       3606
        
       

     

       3603
       3607
        
         nix-direnv = callPackage ../tools/misc/nix-direnv { };

     

       3604
       3608
        
       

     

       3605
       3605
       -
         nix-output-monitor = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-output-monitor);

     

       3609
       3609
       +
         nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { };

     

       3606
       3610
        
       

     

       3607
       3611
        
         nix-template = callPackage ../tools/package-management/nix-template {

     

       3608
       3612
        
           inherit (darwin.apple_sdk.frameworks) Security;

     
···

       5437
       5441
        
       

     

       5438
       5442
        
         ferm = callPackage ../tools/networking/ferm { };

     

       5439
       5443
        
       

     

       5444
       5444
       +
         feroxbuster = callPackage ../tools/security/feroxbuster {

     

       5445
       5445
       +
           inherit (darwin.apple_sdk.frameworks) Security;

     

       5446
       5446
       +
         };

     

       5447
       5447
       +
       

     

       5440
       5448
        
         ffsend = callPackage ../tools/misc/ffsend {

     

       5441
       5449
        
           inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit;

     

       5442
       5450
        
         };

     
···

       8240
       8248
        
         grocy = callPackage ../servers/grocy { };

     

       8241
       8249
        
       

     

       8242
       8250
        
         inherit (callPackage ../servers/nextcloud {})

     

       8243
       8243
       -
           nextcloud20 nextcloud21 nextcloud22 nextcloud23;

     

       8251
       8251
       +
           nextcloud21 nextcloud22 nextcloud23;

     

       8244
       8252
        
       

     

       8245
       8253
        
         nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };

     

       8246
       8254
        
       

     
···

       14167
       14175
        
         self = pkgsi686Linux.callPackage ../development/interpreters/self { };

     

       14168
       14176
        
       

     

       14169
       14177
        
         inherit (callPackages ../applications/networking/cluster/spark { })

     

       14170
       14170
       -
           spark3

     

       14171
       14171
       -
           spark2;

     

       14178
       14178
       +
           spark_3_2

     

       14179
       14179
       +
           spark_3_1

     

       14180
       14180
       +
           spark_2_4;

     

       14181
       14181
       +
         spark3 = spark_3_2;

     

       14182
       14182
       +
         spark2 = spark_2_4;

     

       14172
       14183
        
         spark = spark3;

     

       14173
       14184
        
       

     

       14174
       14185
        
         sparkleshare = callPackage ../applications/version-management/sparkleshare { };

     
···

       16375
       16386
        
       

     

       16376
       16387
        
         classads = callPackage ../development/libraries/classads { };

     

       16377
       16388
        
       

     

       16378
       16378
       -
         clearsilver = callPackage ../development/libraries/clearsilver { };

     

       16379
       16379
       -
       

     

       16380
       16389
        
         clfft = callPackage ../development/libraries/clfft { };

     

       16381
       16390
        
       

     

       16382
       16391
        
         clipp  = callPackage ../development/libraries/clipp { };

     
···

       17908
       17917
        
         libctb = callPackage ../development/libraries/libctb { };

     

       17909
       17918
        
       

     

       17910
       17919
        
         libctemplate = callPackage ../development/libraries/libctemplate { };

     

       17920
       17920
       +
       

     

       17921
       17921
       +
         libctl = callPackage ../development/libraries/libctl { };

     

       17911
       17922
        
       

     

       17912
       17923
        
         libcotp = callPackage ../development/libraries/libcotp { };

     

       17913
       17924

+2

pkgs/top-level/python-packages.nix

···

       2428
       2428
        
       

     

       2429
       2429
        
         docx2python = callPackage ../development/python-modules/docx2python { };

     

       2430
       2430
        
       

     

       2431
       2431
       +
         docx2txt = callPackage ../development/python-modules/docx2txt { };

     

       2432
       2432
       +
       

     

       2431
       2433
        
         dodgy = callPackage ../development/python-modules/dodgy { };

     

       2432
       2434
        
       

     

       2433
       2435
        
         dogpile-cache = callPackage ../development/python-modules/dogpile-cache { };