commit 1ae6d3d02ffab3b33093f966bcd9d2136c2bd500 · pyrox.dev/nixpkgs

+6 -2

nixos/doc/manual/configuration/ipv6-config.xml

···

       7
       7
        
       

     

       8
       8
        
        <para>

     

       9
       9
        
         IPv6 is enabled by default. Stateless address autoconfiguration is used to

     

       10
       10
       -
         automatically assign IPv6 addresses to all interfaces. You can disable IPv6

     

       11
       11
       -
         support globally by setting:

     

       10
       10
       +
         automatically assign IPv6 addresses to all interfaces, and Privacy

     

       11
       11
       +
         Extensions (RFC 4946) are enabled by default. You can adjust the default

     

       12
       12
       +
         for this by setting <xref linkend="opt-networking.tempAddresses"/>.

     

       13
       13
       +
         This option may be overridden on a per-interface basis by

     

       14
       14
       +
         <xref linkend="opt-networking.interfaces._name_.tempAddress"/>.

     

       15
       15
       +
         You can disable IPv6 support globally by setting:

     

       12
       16
        
       <programlisting>

     

       13
       17
        
       <xref linkend="opt-networking.enableIPv6"/> = false;

     

       14
       18
        
       </programlisting>

+23 -5

nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix

···

       37
       37
        
               description = ''

     

       38
       38
        
                 Number of tasks to perform simultaneously.

     

       39
       39
        
       

     

       40
       40
       -
                 A task is a single derivation build or an evaluation.

     

       40
       40
       +
                 A task is a single derivation build, an evaluation or an effect run.

     

       41
       41
        
                 At minimum, you need 2 concurrent tasks for <literal>x86_64-linux</literal>

     

       42
       42
        
                 in your cluster, to allow for import from derivation.

     

       43
       43
        
       

     

       44
       44
        
                 <literal>concurrentTasks</literal> can be around the CPU core count or lower if memory is

     

       45
       45
        
                 the bottleneck.

     

       46
       46
       +
       

     

       47
       47
       +
                 The optimal value depends on the resource consumption characteristics of your workload,

     

       48
       48
       +
                 including memory usage and in-task parallelism. This is typically determined empirically.

     

       49
       49
       +
       

     

       50
       50
       +
                 When scaling, it is generally better to have a double-size machine than two machines,

     

       51
       51
       +
                 because each split of resources causes inefficiencies; particularly with regards

     

       52
       52
       +
                 to build latency because of extra downloads.

     

       46
       53
        
               '';

     

       47
       47
       -
               type = types.int;

     

       48
       48
       -
               default = 4;

     

       54
       54
       +
               type = types.either types.ints.positive (types.enum [ "auto" ]);

     

       55
       55
       +
               default = "auto";

     

       49
       56
        
             };

     

       50
       57
        
             workDirectory = mkOption {

     

       51
       58
        
               description = ''

     
···

       186
       193
        
             # even shortly after the previous lookup. This *also* applies to the daemon.

     

       187
       194
        
             narinfo-cache-negative-ttl = 0

     

       188
       195
        
           '';

     

       189
       189
       -
           services.hercules-ci-agent.tomlFile =

     

       190
       190
       -
             format.generate "hercules-ci-agent.toml" cfg.settings;

     

       196
       196
       +
           services.hercules-ci-agent = {

     

       197
       197
       +
             tomlFile =

     

       198
       198
       +
               format.generate "hercules-ci-agent.toml" cfg.settings;

     

       199
       199
       +
       

     

       200
       200
       +
             settings.labels = {

     

       201
       201
       +
               agent.source =

     

       202
       202
       +
                 if options.services.hercules-ci-agent.package.highestPrio == (lib.modules.mkOptionDefault { }).priority

     

       203
       203
       +
                 then "nixpkgs"

     

       204
       204
       +
                 else lib.mkOptionDefault "override";

     

       205
       205
       +
               pkgs.version = pkgs.lib.version;

     

       206
       206
       +
               lib.version = lib.version;

     

       207
       207
       +
             };

     

       208
       208
       +
           };

     

       191
       209
        
         };

     

       192
       210
        
       }

+17 -1

nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix

···

       68
       68
        
           # Trusted user allows simplified configuration and better performance

     

       69
       69
        
           # when operating in a cluster.

     

       70
       70
        
           nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ];

     

       71
       71
       -
           services.hercules-ci-agent.settings.nixUserIsTrusted = true;

     

       71
       71
       +
           services.hercules-ci-agent = {

     

       72
       72
       +
             settings = {

     

       73
       73
       +
               nixUserIsTrusted = true;

     

       74
       74
       +
               labels =

     

       75
       75
       +
                 let

     

       76
       76
       +
                   mkIfNotNull = x: mkIf (x != null) x;

     

       77
       77
       +
                 in

     

       78
       78
       +
                 {

     

       79
       79
       +
                   nixos.configurationRevision = mkIfNotNull config.system.configurationRevision;

     

       80
       80
       +
                   nixos.release = config.system.nixos.release;

     

       81
       81
       +
                   nixos.label = mkIfNotNull config.system.nixos.label;

     

       82
       82
       +
                   nixos.codeName = config.system.nixos.codeName;

     

       83
       83
       +
                   nixos.tags = config.system.nixos.tags;

     

       84
       84
       +
                   nixos.systemName = mkIfNotNull config.system.name;

     

       85
       85
       +
                 };

     

       86
       86
       +
             };

     

       87
       87
       +
           };

     

       72
       88
        
       

     

       73
       89
        
           users.users.hercules-ci-agent = {

     

       74
       90
        
             home = cfg.settings.baseDirectory;

+5 -14

nixos/modules/services/databases/couchdb.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.couchdb;

     

       7
       7
       -
         useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0";

     

       8
       7
        
         configFile = pkgs.writeText "couchdb.ini" (

     

       9
       8
        
           ''

     

       10
       9
        
             [couchdb]

     

       11
       10
        
             database_dir = ${cfg.databaseDir}

     

       12
       11
        
             uri_file = ${cfg.uriFile}

     

       13
       12
        
             view_index_dir = ${cfg.viewIndexDir}

     

       14
       14
       -
           '' + (if cfg.adminPass != null then

     

       15
       15
       -
           ''

     

       13
       13
       +
           '' + (optionalString (cfg.adminPass != null) ''

     

       16
       14
        
             [admins]

     

       17
       15
        
             ${cfg.adminUser} = ${cfg.adminPass}

     

       18
       18
       -
           '' else

     

       19
       19
       -
           "") + (if useVersion2 then

     

       20
       20
       -
           ''

     

       16
       16
       +
           '' + ''

     

       21
       17
        
             [chttpd]

     

       22
       22
       -
           '' else

     

       23
       23
       -
           ''

     

       24
       24
       -
             [httpd]

     

       25
       18
        
           '') +

     

       26
       19
        
           ''

     

       27
       20
        
             port = ${toString cfg.port}

     
···

       30
       23
        
             [log]

     

       31
       24
        
             file = ${cfg.logFile}

     

       32
       25
        
           '');

     

       33
       33
       -
         executable = if useVersion2 then "${cfg.package}/bin/couchdb"

     

       34
       34
       -
           else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}'';

     

       26
       26
       +
         executable = "${cfg.package}/bin/couchdb";

     

       35
       27
        
       

     

       36
       28
        
       in {

     

       37
       29
        
       

     
···

       177
       169
        
       

     

       178
       170
        
           environment.systemPackages = [ cfg.package ];

     

       179
       171
        
       

     

       180
       180
       -
           services.couchdb.configFile = mkDefault

     

       181
       181
       -
             (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini");

     

       172
       172
       +
           services.couchdb.configFile = mkDefault "/var/lib/couchdb/local.ini";

     

       182
       173
        
       

     

       183
       174
        
           systemd.tmpfiles.rules = [

     

       184
       175
        
             "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -"

     
···

       195
       186
        
               touch ${cfg.configFile}

     

       196
       187
        
             '';

     

       197
       188
        
       

     

       198
       198
       -
             environment = mkIf useVersion2 {

     

       189
       189
       +
             environment = {

     

       199
       190
        
               # we are actually specifying 4 configuration files:

     

       200
       191
        
               # 1. the preinstalled default.ini

     

       201
       192
        
               # 2. the module configuration

+61 -33

nixos/modules/tasks/network-interfaces.nix

···

       144
       144
        
             };

     

       145
       145
        
       

     

       146
       146
        
             tempAddress = mkOption {

     

       147
       147
       -
               type = types.enum [ "default" "enabled" "disabled" ];

     

       148
       148
       -
               default = if cfg.enableIPv6 then "default" else "disabled";

     

       149
       149
       -
               defaultText = literalExample ''if cfg.enableIPv6 then "default" else "disabled"'';

     

       147
       147
       +
               type = types.enum (lib.attrNames tempaddrValues);

     

       148
       148
       +
               default = cfg.tempAddresses;

     

       149
       149
       +
               defaultText = literalExample ''config.networking.tempAddresses'';

     

       150
       150
        
               description = ''

     

       151
       151
        
                 When IPv6 is enabled with SLAAC, this option controls the use of

     

       152
       152
       -
                 temporary address (aka privacy extensions). This is used to reduce tracking.

     

       153
       153
       -
                 The three possible values are:

     

       152
       152
       +
                 temporary address (aka privacy extensions) on this

     

       153
       153
       +
                 interface. This is used to reduce tracking.

     

       154
       154
       +
       

     

       155
       155
       +
                 See also the global option

     

       156
       156
       +
                 <xref linkend="opt-networking.tempAddresses"/>, which

     

       157
       157
       +
                 applies to all interfaces where this is not set.

     

       154
       158
        
       

     

       155
       155
       -
                 <itemizedlist>

     

       156
       156
       -
                  <listitem>

     

       157
       157
       -
                   <para>

     

       158
       158
       -
                    <literal>"default"</literal> to generate temporary addresses and use

     

       159
       159
       -
                    them by default;

     

       160
       160
       -
                   </para>

     

       161
       161
       -
                  </listitem>

     

       162
       162
       -
                  <listitem>

     

       163
       163
       -
                   <para>

     

       164
       164
       -
                    <literal>"enabled"</literal> to generate temporary addresses but keep

     

       165
       165
       -
                    using the standard EUI-64 ones by default;

     

       166
       166
       -
                   </para>

     

       167
       167
       -
                  </listitem>

     

       168
       168
       -
                  <listitem>

     

       169
       169
       -
                   <para>

     

       170
       170
       -
                    <literal>"disabled"</literal> to completely disable temporary addresses.

     

       171
       171
       -
                   </para>

     

       172
       172
       -
                  </listitem>

     

       173
       173
       -
                 </itemizedlist>

     

       159
       159
       +
                 Possible values are:

     

       160
       160
       +
                 ${tempaddrDoc}

     

       174
       161
        
               '';

     

       175
       162
        
             };

     

       176
       163
        
       

     
···

       365
       352
        
         hexChars = stringToCharacters "0123456789abcdef";

     

       366
       353
        
       

     

       367
       354
        
         isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s));

     

       355
       355
       +
       

     

       356
       356
       +
         tempaddrValues = {

     

       357
       357
       +
           disabled = {

     

       358
       358
       +
             sysctl = "0";

     

       359
       359
       +
             description = "completely disable IPv6 temporary addresses";

     

       360
       360
       +
           };

     

       361
       361
       +
           enabled = {

     

       362
       362
       +
             sysctl = "1";

     

       363
       363
       +
             description = "generate IPv6 temporary addresses but still use EUI-64 addresses as source addresses";

     

       364
       364
       +
           };

     

       365
       365
       +
           default = {

     

       366
       366
       +
             sysctl = "2";

     

       367
       367
       +
             description = "generate IPv6 temporary addresses and use these as source addresses in routing";

     

       368
       368
       +
           };

     

       369
       369
       +
         };

     

       370
       370
       +
         tempaddrDoc = ''

     

       371
       371
       +
           <itemizedlist>

     

       372
       372
       +
            ${concatStringsSep "\n" (mapAttrsToList (name: { description, ... }: ''

     

       373
       373
       +
              <listitem>

     

       374
       374
       +
                <para>

     

       375
       375
       +
                  <literal>"${name}"</literal> to ${description};

     

       376
       376
       +
                </para>

     

       377
       377
       +
              </listitem>

     

       378
       378
       +
            '') tempaddrValues)}

     

       379
       379
       +
           </itemizedlist>

     

       380
       380
       +
         '';

     

       368
       381
        
       

     

       369
       382
        
       in

     

       370
       383
        
       

     
···

       1039
       1052
        
             '';

     

       1040
       1053
        
           };

     

       1041
       1054
        
       

     

       1055
       1055
       +
           networking.tempAddresses = mkOption {

     

       1056
       1056
       +
             default = if cfg.enableIPv6 then "default" else "disabled";

     

       1057
       1057
       +
             type = types.enum (lib.attrNames tempaddrValues);

     

       1058
       1058
       +
             description = ''

     

       1059
       1059
       +
               Whether to enable IPv6 Privacy Extensions for interfaces not

     

       1060
       1060
       +
               configured explicitly in

     

       1061
       1061
       +
               <xref linkend="opt-networking.interfaces._name_.tempAddress" />.

     

       1062
       1062
       +
       

     

       1063
       1063
       +
               This sets the ipv6.conf.*.use_tempaddr sysctl for all

     

       1064
       1064
       +
               interfaces. Possible values are:

     

       1065
       1065
       +
       

     

       1066
       1066
       +
               ${tempaddrDoc}

     

       1067
       1067
       +
             '';

     

       1068
       1068
       +
           };

     

       1069
       1069
       +
       

     

       1042
       1070
        
         };

     

       1043
       1071
        
       

     

       1044
       1072
        
       

     
···

       1098
       1126
        
             // listToAttrs (forEach interfaces

     

       1099
       1127
        
               (i: let

     

       1100
       1128
        
                 opt = i.tempAddress;

     

       1101
       1101
       -
                 val = { disabled = 0; enabled = 1; default = 2; }.${opt};

     

       1129
       1129
       +
                 val = tempaddrValues.${opt}.sysctl;

     

       1102
       1130
        
                in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val));

     

       1103
       1131
        
       

     

       1104
       1132
        
           # Capabilities won't work unless we have at-least a 4.3 Linux

     
···

       1203
       1231
        
             (pkgs.writeTextFile rec {

     

       1204
       1232
        
               name = "ipv6-privacy-extensions.rules";

     

       1205
       1233
        
               destination = "/etc/udev/rules.d/98-${name}";

     

       1206
       1206
       -
               text = ''

     

       1234
       1234
       +
               text = let

     

       1235
       1235
       +
                 sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl;

     

       1236
       1236
       +
               in ''

     

       1207
       1237
        
                 # enable and prefer IPv6 privacy addresses by default

     

       1208
       1208
       -
                 ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo 2 > /proc/sys/net/ipv6/conf/%k/use_tempaddr'"

     

       1238
       1238
       +
                 ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'"

     

       1209
       1239
        
               '';

     

       1210
       1240
        
             })

     

       1211
       1241
        
             (pkgs.writeTextFile rec {

     
···

       1214
       1244
        
               text = concatMapStrings (i:

     

       1215
       1245
        
                 let

     

       1216
       1246
        
                   opt = i.tempAddress;

     

       1217
       1217
       -
                   val = if opt == "disabled" then 0 else 1;

     

       1218
       1218
       -
                   msg = if opt == "disabled"

     

       1219
       1219
       -
                         then "completely disable IPv6 privacy addresses"

     

       1220
       1220
       -
                         else "enable IPv6 privacy addresses but prefer EUI-64 addresses";

     

       1247
       1247
       +
                   val = tempaddrValues.${opt}.sysctl;

     

       1248
       1248
       +
                   msg = tempaddrValues.${opt}.description;

     

       1221
       1249
        
                 in

     

       1222
       1250
        
                 ''

     

       1223
       1251
        
                   # override to ${msg} for ${i.name}

     

       1224
       1224
       -
                   ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${toString val}"

     

       1225
       1225
       -
                 '') (filter (i: i.tempAddress != "default") interfaces);

     

       1252
       1252
       +
                   ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${val}"

     

       1253
       1253
       +
                 '') (filter (i: i.tempAddress != cfg.tempAddresses) interfaces);

     

       1226
       1254
        
             })

     

       1227
       1255
        
           ] ++ lib.optional (cfg.wlanInterfaces != {})

     

       1228
       1256
        
             (pkgs.writeTextFile {

-38

nixos/tests/couchdb.nix

···

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nodes = {

     

       27
       27
       -
           couchdb1 = makeNode pkgs.couchdb testuser testpass;

     

       28
       28
       -
           couchdb2 = makeNode pkgs.couchdb2 testuser testpass;

     

       29
       27
        
           couchdb3 = makeNode pkgs.couchdb3 testuser testpass;

     

       30
       28
        
         };

     

       31
       29
        
       

     
···

       40
       38
        
             '';

     

       41
       39
        
         in ''

     

       42
       40
        
           start_all()

     

       43
       43
       -
       

     

       44
       44
       -
           couchdb1.wait_for_unit("couchdb.service")

     

       45
       45
       -
           couchdb1.wait_until_succeeds(

     

       46
       46
       -
               "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}"

     

       47
       47
       -
           )

     

       48
       48
       -
           couchdb1.wait_until_succeeds(

     

       49
       49
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}"

     

       50
       50
       -
           )

     

       51
       51
       -
           couchdb1.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}")

     

       52
       52
       -
           couchdb1.succeed(

     

       53
       53
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "3"}"

     

       54
       54
       -
           )

     

       55
       55
       -
           couchdb1.succeed(

     

       56
       56
       -
               "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}"

     

       57
       57
       -
           )

     

       58
       58
       -
           couchdb1.succeed(

     

       59
       59
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "2"}"

     

       60
       60
       -
           )

     

       61
       61
       -
       

     

       62
       62
       -
           couchdb2.wait_for_unit("couchdb.service")

     

       63
       63
       -
           couchdb2.wait_until_succeeds(

     

       64
       64
       -
               "${curlJqCheck "" "GET" "" ".couchdb" "Welcome"}"

     

       65
       65
       -
           )

     

       66
       66
       -
           couchdb2.wait_until_succeeds(

     

       67
       67
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}"

     

       68
       68
       -
           )

     

       69
       69
       -
           couchdb2.succeed("${curlJqCheck testlogin "PUT" "foo" ".ok" "true"}")

     

       70
       70
       -
           couchdb2.succeed(

     

       71
       71
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "1"}"

     

       72
       72
       -
           )

     

       73
       73
       -
           couchdb2.succeed(

     

       74
       74
       -
               "${curlJqCheck testlogin "DELETE" "foo" ".ok" "true"}"

     

       75
       75
       -
           )

     

       76
       76
       -
           couchdb2.succeed(

     

       77
       77
       -
               "${curlJqCheck "" "GET" "_all_dbs" ". | length" "0"}"

     

       78
       78
       -
           )

     

       79
       41
        
       

     

       80
       42
        
           couchdb3.wait_for_unit("couchdb.service")

     

       81
       43
        
           couchdb3.wait_until_succeeds(

+60 -21

nixos/tests/ipv6.nix

···

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
        
         nodes =

     

       11
       11
       -
           # Remove the interface configuration provided by makeTest so that the

     

       12
       12
       -
           # interfaces are all configured implicitly

     

       13
       13
       -
           { client = { ... }: { networking.interfaces = lib.mkForce {}; };

     

       11
       11
       +
           {

     

       12
       12
       +
             # We use lib.mkForce here to remove the interface configuration

     

       13
       13
       +
             # provided by makeTest, so that the interfaces are all configured

     

       14
       14
       +
             # implicitly.

     

       15
       15
       +
       

     

       16
       16
       +
             # This client should use privacy extensions fully, having a

     

       17
       17
       +
             # completely-default network configuration.

     

       18
       18
       +
             client_defaults.networking.interfaces = lib.mkForce {};

     

       19
       19
       +
       

     

       20
       20
       +
             # Both of these clients should obtain temporary addresses, but

     

       21
       21
       +
             # not use them as the default source IP. We thus run the same

     

       22
       22
       +
             # checks against them — but the configuration resulting in this

     

       23
       23
       +
             # behaviour is different.

     

       24
       24
       +
       

     

       25
       25
       +
             # Here, by using an altered default value for the global setting...

     

       26
       26
       +
             client_global_setting = {

     

       27
       27
       +
               networking.interfaces = lib.mkForce {};

     

       28
       28
       +
               networking.tempAddresses = "enabled";

     

       29
       29
       +
             };

     

       30
       30
       +
             # and here, by setting this on the interface explicitly.

     

       31
       31
       +
             client_interface_setting = {

     

       32
       32
       +
               networking.tempAddresses = "disabled";

     

       33
       33
       +
               networking.interfaces = lib.mkForce {

     

       34
       34
       +
                 eth1.tempAddress = "enabled";

     

       35
       35
       +
               };

     

       36
       36
       +
             };

     

       14
       37
        
       

     

       15
       38
        
             server =

     

       16
       16
       -
               { ... }:

     

       17
       39
        
               { services.httpd.enable = true;

     

       18
       40
        
                 services.httpd.adminAddr = "foo@example.org";

     

       19
       41
        
                 networking.firewall.allowedTCPPorts = [ 80 ];

     
···

       40
       62
        
             # Start the router first so that it respond to router solicitations.

     

       41
       63
        
             router.wait_for_unit("radvd")

     

       42
       64
        
       

     

       65
       65
       +
             clients = [client_defaults, client_global_setting, client_interface_setting]

     

       66
       66
       +
       

     

       43
       67
        
             start_all()

     

       44
       68
        
       

     

       45
       45
       -
             client.wait_for_unit("network.target")

     

       69
       69
       +
             for client in clients:

     

       70
       70
       +
                 client.wait_for_unit("network.target")

     

       46
       71
        
             server.wait_for_unit("network.target")

     

       47
       72
        
             server.wait_for_unit("httpd.service")

     

       48
       73
        
       

     
···

       64
       89
        
       

     

       65
       90
        
       

     

       66
       91
        
             with subtest("Loopback address can be pinged"):

     

       67
       67
       -
                 client.succeed("ping -c 1 ::1 >&2")

     

       68
       68
       -
                 client.fail("ping -c 1 ::2 >&2")

     

       92
       92
       +
                 client_defaults.succeed("ping -c 1 ::1 >&2")

     

       93
       93
       +
                 client_defaults.fail("ping -c 1 2001:db8:: >&2")

     

       69
       94
        
       

     

       70
       95
        
             with subtest("Local link addresses can be obtained and pinged"):

     

       71
       71
       -
                 client_ip = wait_for_address(client, "eth1", "link")

     

       72
       72
       -
                 server_ip = wait_for_address(server, "eth1", "link")

     

       73
       73
       -
                 client.succeed(f"ping -c 1 {client_ip}%eth1 >&2")

     

       74
       74
       -
                 client.succeed(f"ping -c 1 {server_ip}%eth1 >&2")

     

       96
       96
       +
                 for client in clients:

     

       97
       97
       +
                     client_ip = wait_for_address(client, "eth1", "link")

     

       98
       98
       +
                     server_ip = wait_for_address(server, "eth1", "link")

     

       99
       99
       +
                     client.succeed(f"ping -c 1 {client_ip}%eth1 >&2")

     

       100
       100
       +
                     client.succeed(f"ping -c 1 {server_ip}%eth1 >&2")

     

       75
       101
        
       

     

       76
       102
        
             with subtest("Global addresses can be obtained, pinged, and reached via http"):

     

       77
       77
       -
                 client_ip = wait_for_address(client, "eth1", "global")

     

       78
       78
       -
                 server_ip = wait_for_address(server, "eth1", "global")

     

       79
       79
       -
                 client.succeed(f"ping -c 1 {client_ip} >&2")

     

       80
       80
       -
                 client.succeed(f"ping -c 1 {server_ip} >&2")

     

       81
       81
       -
                 client.succeed(f"curl --fail -g http://[{server_ip}]")

     

       82
       82
       -
                 client.fail(f"curl --fail -g http://[{client_ip}]")

     

       103
       103
       +
                 for client in clients:

     

       104
       104
       +
                     client_ip = wait_for_address(client, "eth1", "global")

     

       105
       105
       +
                     server_ip = wait_for_address(server, "eth1", "global")

     

       106
       106
       +
                     client.succeed(f"ping -c 1 {client_ip} >&2")

     

       107
       107
       +
                     client.succeed(f"ping -c 1 {server_ip} >&2")

     

       108
       108
       +
                     client.succeed(f"curl --fail -g http://[{server_ip}]")

     

       109
       109
       +
                     client.fail(f"curl --fail -g http://[{client_ip}]")

     

       83
       110
        
       

     

       84
       84
       -
             with subtest("Privacy extensions: Global temporary address can be obtained and pinged"):

     

       85
       85
       -
                 ip = wait_for_address(client, "eth1", "global", temporary=True)

     

       111
       111
       +
             with subtest(

     

       112
       112
       +
                 "Privacy extensions: Global temporary address is used as default source address"

     

       113
       113
       +
             ):

     

       114
       114
       +
                 ip = wait_for_address(client_defaults, "eth1", "global", temporary=True)

     

       86
       115
        
                 # Default route should have "src <temporary address>" in it

     

       87
       87
       -
                 client.succeed(f"ip r g ::2 | grep {ip}")

     

       116
       116
       +
                 client_defaults.succeed(f"ip route get 2001:db8:: | grep 'src {ip}'")

     

       88
       117
        
       

     

       89
       89
       -
             # TODO: test reachability of a machine on another network.

     

       118
       118
       +
             for client, setting_desc in (

     

       119
       119
       +
                 (client_global_setting, "global"),

     

       120
       120
       +
                 (client_interface_setting, "interface"),

     

       121
       121
       +
             ):

     

       122
       122
       +
                 with subtest(f'Privacy extensions: "enabled" through {setting_desc} setting)'):

     

       123
       123
       +
                     # We should be obtaining both a temporary address and an EUI-64 address...

     

       124
       124
       +
                     ip = wait_for_address(client, "eth1", "global")

     

       125
       125
       +
                     assert "ff:fe" in ip

     

       126
       126
       +
                     ip_temp = wait_for_address(client, "eth1", "global", temporary=True)

     

       127
       127
       +
                     # But using the EUI-64 one.

     

       128
       128
       +
                     client.succeed(f"ip route get 2001:db8:: | grep 'src {ip}'")

     

       90
       129
        
           '';

     

       91
       130
        
       })

+2

pkgs/applications/audio/audacity/default.nix

+3 -3

pkgs/applications/blockchains/turbo-geth.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "turbo-geth";

     

       5
       5
       -
         version = "2021.04.05";

     

       5
       5
       +
         version = "2021.05.01";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "ledgerwatch";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-RTPNJASNFyZ6tDJj0WOqALyxRsOLJzPy0qA1c2sSxys=";

     

       11
       11
       +
           sha256 = "sha256-zvxtBK0/6fShxAZfU4gTV0XiP6TzhKFNsADSZA9gv0Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "01c7lb6n00ws60dfybir0z5dbn6h68p5s4hbq0ga2g7drf3l3y0p";

     

       14
       14
       +
         vendorSha256 = "0c8p6djs0zcci8sh4zgzky89155mr4cfqlax025618x8vngrsxf2";

     

       15
       15
        
         runVend = true;

     

       16
       16
        
       

     

       17
       17
        
         subPackages = [

+2 -2

pkgs/applications/editors/zile/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "zile";

     

       16
       16
       -
         version = "2.6.1";

     

       16
       16
       +
         version = "2.6.2";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "mirror://gnu/zile/${pname}-${version}.tar.gz";

     

       20
       20
       -
           hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc=";

     

       20
       20
       +
           hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

+2 -2

pkgs/applications/graphics/solvespace/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "solvespace";

     

       6
       6
       -
         version = "v3.0.rc2";

     

       6
       6
       +
         version = "v3.0";

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm";

     

       11
       11
       +
           sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14

+1 -1

pkgs/applications/misc/dbeaver/default.nix

···

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
       -
         pname = "dbeaver-ce";

     

       20
       20
       +
         pname = "dbeaver";

     

       21
       21
        
         version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

+6 -2

pkgs/applications/networking/browsers/brave/default.nix

···

       90
       90
        
       

     

       91
       91
        
       stdenv.mkDerivation rec {

     

       92
       92
        
         pname = "brave";

     

       93
       93
       -
         version = "1.23.71";

     

       93
       93
       +
         version = "1.24.82";

     

       94
       94
        
       

     

       95
       95
        
         src = fetchurl {

     

       96
       96
        
           url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";

     

       97
       97
       -
           sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h";

     

       97
       97
       +
           sha256 = "iWUJ5yLWWQvg510Atf+Pd9ya/1NnMNW2Sp/RVFn4PCc=";

     

       98
       98
        
         };

     

       99
       99
        
       

     

       100
       100
        
         dontConfigure = true;

     
···

       109
       109
        
         unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";

     

       110
       110
        
       

     

       111
       111
        
         installPhase = ''

     

       112
       112
       +
             runHook preInstall

     

       113
       113
       +
       

     

       112
       114
        
             mkdir -p $out $out/bin

     

       113
       115
        
       

     

       114
       116
        
             cp -R usr/share $out

     
···

       148
       150
        
             # Replace xdg-settings and xdg-mime

     

       149
       151
        
             ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings

     

       150
       152
        
             ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime

     

       153
       153
       +
       

     

       154
       154
       +
             runHook postInstall

     

       151
       155
        
         '';

     

       152
       156
        
       

     

       153
       157
        
         installCheckPhase = ''

+2

pkgs/applications/networking/browsers/chromium/common.nix

···

       20
       20
        
       , pipewire

     

       21
       21
        
       , libva

     

       22
       22
        
       , libdrm, wayland, mesa, libxkbcommon # Ozone

     

       23
       23
       +
       , curl

     

       23
       24
        
       

     

       24
       25
        
       # optional dependencies

     

       25
       26
        
       , libgcrypt ? null # gnomeSupport || cupsSupport

     
···

       155
       156
        
             pipewire

     

       156
       157
        
             libva

     

       157
       158
        
             libdrm wayland mesa.drivers libxkbcommon

     

       159
       159
       +
             curl

     

       158
       160
        
           ] ++ optional gnomeKeyringSupport libgnome-keyring3

     

       159
       161
        
             ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]

     

       160
       162
        
             ++ optionals cupsSupport [ libgcrypt cups ]

+4 -3

pkgs/applications/networking/browsers/lagrange/default.nix

···

       10
       10
        
       , pcre

     

       11
       11
        
       , SDL2

     

       12
       12
        
       , AppKit

     

       13
       13
       +
       , zlib

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       stdenv.mkDerivation rec {

     

       16
       17
        
         pname = "lagrange";

     

       17
       17
       -
         version = "1.3.4";

     

       18
       18
       +
         version = "1.4.0";

     

       18
       19
        
       

     

       19
       20
        
         src = fetchFromGitHub {

     

       20
       21
        
           owner = "skyjake";

     

       21
       22
        
           repo = "lagrange";

     

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

     

       23
       23
       -
           sha256 = "sha256-hPNqyTH2oMPytvYAF9sjEQ9ibaJYDODA33ZrDuWnloU=";

     

       24
       24
       +
           sha256 = "sha256-l8k81w+ilkOk8iQTc46+HK40JQZ0dCYVAvkGTrEpZSQ=";

     

       24
       25
        
           fetchSubmodules = true;

     

       25
       26
        
         };

     

       26
       27
        
       

     

       27
       28
        
         nativeBuildInputs = [ cmake pkg-config ];

     

       28
       29
        
       

     

       29
       29
       -
         buildInputs = [ libunistring mpg123 openssl pcre SDL2 ]

     

       30
       30
       +
         buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ]

     

       30
       31
        
           ++ lib.optional stdenv.isDarwin AppKit;

     

       31
       32
        
       

     

       32
       33
        
         hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";

+10 -4

pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix

···

       43
       43
        
       in

     

       44
       44
        
         stdenv.mkDerivation rec {

     

       45
       45
        
           pname = "mattermost-desktop";

     

       46
       46
       -
           version = "4.5.2";

     

       46
       46
       +
           version = "4.6.2";

     

       47
       47
        
       

     

       48
       48
        
           src =

     

       49
       49
        
             if stdenv.hostPlatform.system == "x86_64-linux" then

     

       50
       50
        
               fetchurl {

     

       51
       51
        
                 url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";

     

       52
       52
       -
                 sha256 = "0r9xmhzif1ia1m53yr59q6p3niyq3jv3vgv4703x68jmd46f91n6";

     

       52
       52
       +
                 sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x";

     

       53
       53
        
               }

     

       54
       54
        
             else if stdenv.hostPlatform.system == "i686-linux" then

     

       55
       55
        
               fetchurl {

     

       56
       56
        
                 url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";

     

       57
       57
       -
                 sha256 = "1h8lw06p3cqz9dkgbhfmzcrzjsir5cfhx28xm4zrmvkj4yfzbcnv";

     

       57
       57
       +
                 sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m";

     

       58
       58
        
               }

     

       59
       59
        
             else

     

       60
       60
        
               throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";

     
···

       63
       63
        
           dontConfigure = true;

     

       64
       64
        
           dontPatchELF = true;

     

       65
       65
        
       

     

       66
       66
       -
           buildInputs = [ wrapGAppsHook gtk3 hicolor-icon-theme ];

     

       66
       66
       +
           nativeBuildInputs = [ wrapGAppsHook ];

     

       67
       67
       +
       

     

       68
       68
       +
           buildInputs = [ gtk3 hicolor-icon-theme ];

     

       67
       69
        
       

     

       68
       70
        
           installPhase = ''

     

       71
       71
       +
             runHook preInstall

     

       72
       72
       +
       

     

       69
       73
        
             mkdir -p $out/share/mattermost-desktop

     

       70
       74
        
             cp -R . $out/share/mattermost-desktop

     

       71
       75
        
       

     
···

       86
       90
        
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       87
       91
        
               --set-rpath "${rpath}:$out/share/mattermost-desktop" \

     

       88
       92
        
               $out/share/mattermost-desktop/mattermost-desktop

     

       93
       93
       +
       

     

       94
       94
       +
             runHook postInstall

     

       89
       95
        
           '';

     

       90
       96
        
       

     

       91
       97
        
           meta = with lib; {

+4 -4

pkgs/applications/office/libreoffice/src-fresh/download.nix

···

       637
       637
        
           md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";

     

       638
       638
        
         }

     

       639
       639
        
         {

     

       640
       640
       -
           name = "neon-0.31.1.tar.gz";

     

       641
       641
       -
           url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz";

     

       642
       642
       -
           sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d";

     

       640
       640
       +
           name = "neon-0.31.2.tar.gz";

     

       641
       641
       +
           url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz";

     

       642
       642
       +
           sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678";

     

       643
       643
        
           md5 = "";

     

       644
       644
       -
           md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz";

     

       644
       644
       +
           md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz";

     

       645
       645
        
         }

     

       646
       646
        
         {

     

       647
       647
        
           name = "nss-3.55-with-nspr-4.27.tar.gz";

+4 -4

pkgs/applications/office/libreoffice/src-fresh/primary.nix

···

       8
       8
        
       

     

       9
       9
        
         major = "7";

     

       10
       10
        
         minor = "1";

     

       11
       11
       -
         patch = "2";

     

       11
       11
       +
         patch = "3";

     

       12
       12
        
         tweak = "2";

     

       13
       13
        
       

     

       14
       14
        
         subdir = "${major}.${minor}.${patch}";

     
···

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";

     

       20
       20
       -
           sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb";

     

       20
       20
       +
           sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         # FIXME rename

     

       24
       24
        
         translations = fetchSrc {

     

       25
       25
        
           name = "translations";

     

       26
       26
       -
           sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957";

     

       26
       26
       +
           sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from

     
···

       31
       31
        
       

     

       32
       32
        
         help = fetchSrc {

     

       33
       33
        
           name = "help";

     

       34
       34
       -
           sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf";

     

       34
       34
       +
           sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0";

     

       35
       35
        
         };

     

       36
       36
        
       }

+4 -3

pkgs/applications/version-management/git-and-tools/stgit/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "stgit";

     

       5
       5
       -
         version = "1.0";

     

       5
       5
       +
         version = "1.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "stacked-git";

     

       9
       9
        
           repo = "stgit";

     

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

     

       11
       11
       -
           sha256 = "16q8994widg040n1ag4m82kbn3r02n39ah7dvwa7aixhw5y35vlm";

     

       11
       11
       +
           sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ installShellFiles ];

     
···

       24
       24
        
         meta = with lib; {

     

       25
       25
        
           description = "A patch manager implemented on top of Git";

     

       26
       26
        
           homepage = "https://stacked-git.github.io/";

     

       27
       27
       -
           license = licenses.gpl2;

     

       27
       27
       +
           license = licenses.gpl2Only;

     

       28
       28
        
           platforms = platforms.unix;

     

       29
       29
       +
           maintainers = with maintainers; [ jshholland ];

     

       29
       30
        
         };

     

       30
       31
        
       }

+5 -4

pkgs/applications/video/jellyfin-media-player/default.nix

···

       26
       26
        
       

     

       27
       27
        
       mkDerivation rec {

     

       28
       28
        
         pname = "jellyfin-media-player";

     

       29
       29
       -
         version = "1.5.0";

     

       29
       29
       +
         version = "1.6.0";

     

       30
       30
        
       

     

       31
       31
        
         src = fetchFromGitHub {

     

       32
       32
        
           owner = "jellyfin";

     

       33
       33
        
           repo = "jellyfin-media-player";

     

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

     

       35
       35
       -
           sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg=";

     

       35
       35
       +
           sha256 = "sha256-u19WJupSqIzA8W0QG9mue8Ticy+HxBAniuKIUFl7ONs=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         jmpDist = fetchzip {

     

       39
       39
       -
           url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip";

     

       40
       40
       -
           sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4=";

     

       39
       39
       +
           url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip";

     

       40
       40
       +
           sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         patches = [

     
···

       106
       106
        
           license = with licenses; [ gpl2Only mit ];

     

       107
       107
        
           platforms = [ "x86_64-linux" "x86_64-darwin" ];

     

       108
       108
        
           maintainers = with maintainers; [ jojosch ];

     

       109
       109
       +
           mainProgram = "jellyfinmediaplayer";

     

       109
       110
        
         };

     

       110
       111
        
       }

+5 -17

pkgs/applications/window-managers/dwl/default.nix

···

       5
       5
        
       , libinput

     

       6
       6
        
       , libxcb

     

       7
       7
        
       , libxkbcommon

     

       8
       8
       +
       , pixman

     

       8
       9
        
       , wayland

     

       9
       10
        
       , wayland-protocols

     

       10
       11
        
       , wlroots

     
···

       16
       17
        
       }:

     

       17
       18
        
       

     

       18
       19
        
       let

     

       19
       19
       -
         # Add two patches to fix compile errors with wlroots 0.13:

     

       20
       20
       -
         totalPatches = patches ++ [

     

       21
       21
       -
           # Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED

     

       22
       22
       -
           # https://github.com/djpohly/dwl/pull/66

     

       23
       23
       -
           (fetchpatch {

     

       24
       24
       -
             url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch";

     

       25
       25
       -
             sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j";

     

       26
       26
       -
           })

     

       27
       27
       -
           # Use the new signature for wlr_backend_autocreate, which removes an argument:

     

       28
       28
       -
           # https://github.com/djpohly/dwl/pull/76

     

       29
       29
       -
           (fetchpatch {

     

       30
       30
       -
             url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch";

     

       31
       31
       -
             sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm";

     

       32
       32
       -
           })

     

       33
       33
       -
         ];

     

       20
       20
       +
         totalPatches = patches ++ [ ];

     

       34
       21
        
       in

     

       35
       22
        
       

     

       36
       23
        
       stdenv.mkDerivation rec {

     

       37
       24
        
         pname = "dwl";

     

       38
       38
       -
         version = "0.2";

     

       25
       25
       +
         version = "0.2.1";

     

       39
       26
        
       

     

       40
       27
        
         src = fetchFromGitHub {

     

       41
       28
        
           owner = "djpohly";

     

       42
       29
        
           repo = pname;

     

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

     

       44
       44
       -
           sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ=";

     

       31
       31
       +
           sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs=";

     

       45
       32
        
         };

     

       46
       33
        
       

     

       47
       34
        
         nativeBuildInputs = [ pkg-config ];

     
···

       49
       36
        
           libinput

     

       50
       37
        
           libxcb

     

       51
       38
        
           libxkbcommon

     

       39
       39
       +
           pixman

     

       52
       40
        
           wayland

     

       53
       41
        
           wayland-protocols

     

       54
       42
        
           wlroots

+2 -1

pkgs/development/compilers/ghc/8.10.2-binary.nix

···

       214
       214
        
           enableShared = true;

     

       215
       215
        
         };

     

       216
       216
        
       

     

       217
       217
       -
         meta = {

     

       217
       217
       +
         meta = rec {

     

       218
       218
        
           homepage = "http://haskell.org/ghc";

     

       219
       219
        
           description = "The Glasgow Haskell Compiler";

     

       220
       220
        
           license = lib.licenses.bsd3;

     

       221
       221
        
           platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];

     

       222
       222
       +
           hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;

     

       222
       223
        
           maintainers = with lib.maintainers; [ lostnet ];

     

       223
       224
        
         };

     

       224
       225
        
       }

+5 -2

pkgs/development/compilers/ghc/8.6.5-binary.nix

···

       173
       173
        
           enableShared = true;

     

       174
       174
        
         };

     

       175
       175
        
       

     

       176
       176
       -
         meta.license = lib.licenses.bsd3;

     

       177
       177
       -
         meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];

     

       176
       176
       +
         meta = rec {

     

       177
       177
       +
           license = lib.licenses.bsd3;

     

       178
       178
       +
           platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];

     

       179
       179
       +
           hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;

     

       180
       180
       +
         };

     

       178
       181
        
       }

+3 -5

pkgs/development/compilers/kotlin/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, makeWrapper, jre, unzip }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         version = "1.4.21";

     

       5
       5
       -
       in stdenv.mkDerivation {

     

       6
       6
       -
         inherit version;

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       7
       4
        
         pname = "kotlin";

     

       5
       5
       +
         version = "1.4.32";

     

       8
       6
        
       

     

       9
       7
        
         src = fetchurl {

     

       10
       8
        
           url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";

     

       11
       11
       -
           sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6";

     

       9
       9
       +
           hash = "sha256-3+8ju4a9XzYWbU7BJnyN5Ts4J8RG1U6CMixrbarTWUw=";

     

       12
       10
        
         };

     

       13
       11
        
       

     

       14
       12
        
         propagatedBuildInputs = [ jre ] ;

-79

pkgs/development/interpreters/spidermonkey/1.8.5.nix

···

       1
       1
       -
       { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         pname = "spidermonkey";

     

       5
       5
       -
         version = "1.8.5";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "mirror://mozilla/js/js185-1.0.0.tar.gz";

     

       9
       9
       -
           sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";

     

       10
       10
       -
         };

     

       11
       11
       -
       

     

       12
       12
       -
         propagatedBuildInputs = [ nspr ];

     

       13
       13
       -
       

     

       14
       14
       -
         nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;

     

       15
       15
       -
         buildInputs = [ perl python2 zip ];

     

       16
       16
       -
       

     

       17
       17
       -
         postUnpack = "sourceRoot=\${sourceRoot}/js/src";

     

       18
       18
       -
       

     

       19
       19
       -
         preConfigure = ''

     

       20
       20
       -
           export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"

     

       21
       21
       -
           export LIBXUL_DIST=$out

     

       22
       22
       -
           ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"}

     

       23
       23
       -
         '';

     

       24
       24
       -
       

     

       25
       25
       -
         patches = [

     

       26
       26
       -
           (fetchpatch {

     

       27
       27
       -
             name = "gcc6.patch";

     

       28
       28
       -
             url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";

     

       29
       29
       -
             sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";

     

       30
       30
       -
           })

     

       31
       31
       -
         ] ++ lib.optionals stdenv.isAarch32 [

     

       32
       32
       -
           # Explained below in configureFlags for ARM

     

       33
       33
       -
           ./1.8.5-findvanilla.patch

     

       34
       34
       -
           # Fix for hard float flags.

     

       35
       35
       -
           ./1.8.5-arm-flags.patch

     

       36
       36
       -
         ];

     

       37
       37
       -
       

     

       38
       38
       -
         patchFlags = [ "-p3" ];

     

       39
       39
       -
       

     

       40
       40
       -
         # fixes build on gcc8

     

       41
       41
       -
         postPatch = ''

     

       42
       42
       -
           substituteInPlace ./methodjit/MethodJIT.cpp \

     

       43
       43
       -
             --replace 'asm volatile' 'asm'

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in

     

       47
       47
       -
         # "make check". Disabling tracejit makes it work, but then it needs the

     

       48
       48
       -
         # patch findvanilla.patch do disable a checker about allocator safety. In case

     

       49
       49
       -
         # of polkit, which is what matters most, it does not override the allocator

     

       50
       50
       -
         # so the failure of that test does not matter much.

     

       51
       51
       -
         configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++

     

       52
       52
       -
           lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [

     

       53
       53
       -
               "--with-cpu-arch=armv5t"

     

       54
       54
       -
               "--disable-tracejit" ];

     

       55
       55
       -
       

     

       56
       56
       -
         # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393

     

       57
       57
       -
         preBuild = ''

     

       58
       58
       -
           touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}

     

       59
       59
       -
           ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""}

     

       60
       60
       -
         '';

     

       61
       61
       -
       

     

       62
       62
       -
         enableParallelBuilding = true;

     

       63
       63
       -
       

     

       64
       64
       -
         doCheck = true;

     

       65
       65
       -
       

     

       66
       66
       -
         preCheck = ''

     

       67
       67
       -
           rm jit-test/tests/sunspider/check-date-format-tofte.js    # https://bugzil.la/600522

     

       68
       68
       -
         '';

     

       69
       69
       -
       

     

       70
       70
       -
         meta = with lib; {

     

       71
       71
       -
           description = "Mozilla's JavaScript engine written in C/C++";

     

       72
       72
       -
           homepage = "https://developer.mozilla.org/en/SpiderMonkey";

     

       73
       73
       -
           # TODO: MPL/GPL/LGPL tri-license.

     

       74
       74
       -
           maintainers = [ maintainers.goibhniu ];

     

       75
       75
       -
           platforms = platforms.linux;

     

       76
       76
       -
           broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08

     

       77
       77
       -
         };

     

       78
       78
       -
       }

     

       79
       79
       -

+2 -2

pkgs/development/libraries/libplacebo/default.nix

···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "libplacebo";

     

       19
       19
       -
         version = "3.120.2";

     

       19
       19
       +
         version = "3.120.3";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitLab {

     

       22
       22
        
           domain = "code.videolan.org";

     

       23
       23
        
           owner = "videolan";

     

       24
       24
        
           repo = pname;

     

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

     

       26
       26
       -
           sha256 = "0wh5w7bx789ynnzr27xi0csql4jaxq80csawg6znabw3ld54wb86";

     

       26
       26
       +
           sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

+18 -12

pkgs/development/libraries/physics/fastnlo/default.nix pkgs/development/libraries/physics/fastnlo_toolkit/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       +
       , autoreconfHook

     

       4
       5
        
       , boost

     

       5
       5
       -
       , fastjet

     

       6
       6
        
       , gfortran

     

       7
       7
        
       , lhapdf

     

       8
       8
       -
       , python2

     

       9
       9
       -
       , root

     

       8
       8
       +
       , ncurses

     

       9
       9
       +
       , python

     

       10
       10
       +
       , swig

     

       10
       11
        
       , yoda

     

       11
       12
        
       , zlib

     

       13
       13
       +
       , withPython ? false

     

       12
       14
        
       }:

     

       13
       15
        
       

     

       14
       16
        
       stdenv.mkDerivation rec {

     

       15
       17
        
         pname = "fastnlo_toolkit";

     

       16
       16
       -
         version = "2.3.1pre-2402";

     

       18
       18
       +
         version = "2.3.1pre-2411";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchurl {

     

       19
       19
       -
           url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";

     

       20
       20
       -
           sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";

     

       21
       21
       +
           urls = [

     

       22
       22
       +
             "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"

     

       23
       23
       +
             "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz"

     

       24
       24
       +
           ];

     

       25
       25
       +
           sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb";

     

       21
       26
        
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = lib.optional withPython autoreconfHook;

     

       22
       29
        
       

     

       23
       30
        
         buildInputs = [

     

       24
       31
        
           boost

     

       25
       25
       -
           fastjet

     

       26
       32
        
           gfortran

     

       27
       33
        
           gfortran.cc.lib

     

       28
       34
        
           lhapdf

     

       29
       29
       -
           python2

     

       30
       30
       -
           root

     

       31
       35
        
           yoda

     

       32
       32
       -
         ];

     

       36
       36
       +
         ] ++ lib.optional withPython python

     

       37
       37
       +
           ++ lib.optional (withPython && python.isPy3k) ncurses;

     

       38
       38
       +
       

     

       33
       39
        
         propagatedBuildInputs = [

     

       34
       40
        
           zlib

     

       35
       35
       -
         ];

     

       41
       41
       +
         ] ++ lib.optional withPython swig;

     

       36
       42
        
       

     

       37
       43
        
         preConfigure = ''

     

       38
       44
        
           substituteInPlace ./fastnlotoolkit/Makefile.in \

     
···

       41
       47
        
       

     

       42
       48
        
         configureFlags = [

     

       43
       49
        
           "--with-yoda=${yoda}"

     

       44
       44
       -
         ];

     

       50
       50
       +
         ] ++ lib.optional withPython "--enable-pyext";

     

       45
       51
        
       

     

       46
       52
        
         enableParallelBuilding = true;

     

       47
       53

+18 -4

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, aiohttp }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , aiohttp

     

       5
       5
       +
       }:

     

       2
       6
        
       

     

       3
       7
        
       buildPythonPackage rec {

     

       4
       8
        
         pname = "aiohue";

     

       5
       5
       -
         version = "2.2.0";

     

       9
       9
       +
         version = "2.3.0";

     

       6
       10
        
       

     

       7
       11
        
         src = fetchPypi {

     

       8
       12
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529";

     

       13
       13
       +
           sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk";

     

       10
       14
        
         };

     

       11
       15
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ aiohttp ];

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           aiohttp

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         pythonImportsCheck = [

     

       21
       21
       +
           "aiohue"

     

       22
       22
       +
           "aiohue.discovery"

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         # has no tests

     

       26
       26
       +
         doCheck = false;

     

       13
       27
        
       

     

       14
       28
        
         meta = with lib; {

     

       15
       29
        
           description = "asyncio package to talk to Philips Hue";

+66

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , aiohttp

     

       3
       3
       +
       , async-timeout

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , fetchFromGitHub

     

       6
       6
       +
       , fetchpatch

     

       7
       7
       +
       , poetry-core

     

       8
       8
       +
       , pytest-asyncio

     

       9
       9
       +
       , pytest-timeout

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , pythonOlder

     

       12
       12
       +
       , pytz

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "aiopvpc";

     

       17
       17
       +
         version = "2.0.2";

     

       18
       18
       +
         disabled = pythonOlder "3.7";

     

       19
       19
       +
         format = "pyproject";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "azogue";

     

       23
       23
       +
           repo = pname;

     

       24
       24
       +
           rev = "v${version}";

     

       25
       25
       +
           sha256 = "1ajs4kbdlfn4h7f3d6lwkp4yl1rl7zyvj997nhsz93jjwxbajkpv";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           poetry-core

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           aiohttp

     

       34
       34
       +
           pytz

     

       35
       35
       +
           async-timeout

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         checkInputs = [

     

       39
       39
       +
           pytest-asyncio

     

       40
       40
       +
           pytest-timeout

     

       41
       41
       +
           pytestCheckHook

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         patches = [

     

       45
       45
       +
           # Switch to poetry-core, https://github.com/azogue/aiopvpc/pull/10

     

       46
       46
       +
           (fetchpatch {

     

       47
       47
       +
             name = "use-peotry-core.patch";

     

       48
       48
       +
             url = "https://github.com/azogue/aiopvpc/commit/4bc2740ffd485a60acf579b4f3eb5ee6a353245c.patch";

     

       49
       49
       +
             sha256 = "0ynj7pqq3akdvdrvqcwnnslay3mn1q92qhk8fg95ppflzscixli6";

     

       50
       50
       +
           })

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         postPatch = ''

     

       54
       54
       +
           substituteInPlace pytest.ini --replace \

     

       55
       55
       +
             " --cov --cov-report term --cov-report html" ""

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         pythonImportsCheck = [ "aiopvpc" ];

     

       59
       59
       +
       

     

       60
       60
       +
         meta = with lib; {

     

       61
       61
       +
           description = "Python module to download Spanish electricity hourly prices (PVPC)";

     

       62
       62
       +
           homepage = "https://github.com/azogue/aiopvpc";

     

       63
       63
       +
           license = with licenses; [ mit ];

     

       64
       64
       +
           maintainers = with maintainers; [ fab ];

     

       65
       65
       +
         };

     

       66
       66
       +
       }

+38

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , typing-extensions

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "asyncstdlib";

     

       11
       11
       +
         version = "3.9.1";

     

       12
       12
       +
         disabled = pythonOlder "3.7";

     

       13
       13
       +
         format = "flit";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "maxfischer2781";

     

       17
       17
       +
           repo = pname;

     

       18
       18
       +
           rev = "v${version}";

     

       19
       19
       +
           sha256 = "13ranr7zi61w52vfrxwkf32bbhk88j0r5c5z2x2h5vw268001lk2";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           typing-extensions

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           pytestCheckHook

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         pythonImportsCheck = [ "asyncstdlib" ];

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           description = "Python library that extends the Python asyncio standard library";

     

       34
       34
       +
           homepage = "https://asyncstdlib.readthedocs.io/";

     

       35
       35
       +
           license = with licenses; [ mit ];

     

       36
       36
       +
           maintainers = with maintainers; [ fab ];

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+2

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

···

       7
       7
        
       , click

     

       8
       8
        
       , enum-compat

     

       9
       9
        
       , hypothesis

     

       10
       10
       +
       , inquirer

     

       10
       11
        
       , jmespath

     

       11
       12
        
       , mock

     

       12
       13
        
       , mypy-extensions

     
···

       35
       36
        
           botocore

     

       36
       37
        
           click

     

       37
       38
        
           enum-compat

     

       39
       39
       +
           inquirer

     

       38
       40
        
           jmespath

     

       39
       41
        
           mypy-extensions

     

       40
       42
        
           pip

+29 -11

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces

     

       2
       2
       -
       , pytestCheckHook, testtools, requests-mock }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , asyncstdlib

     

       3
       3
       +
       , attrs

     

       4
       4
       +
       , buildPythonPackage

     

       5
       5
       +
       , defusedxml

     

       6
       6
       +
       , fetchFromGitHub

     

       7
       7
       +
       , httpx

     

       8
       8
       +
       , netifaces

     

       9
       9
       +
       , pytest-asyncio

     

       10
       10
       +
       , pytestCheckHook

     

       11
       11
       +
       , pytest-httpx

     

       12
       12
       +
       , pytest-timeout

     

       13
       13
       +
       , pythonOlder

     

       14
       14
       +
       }:

     

       3
       15
        
       

     

       4
       16
        
       buildPythonPackage rec {

     

       5
       17
        
         pname = "denonavr";

     

       6
       6
       -
         version = "0.9.10";

     

       7
       7
       -
         disabled = isPy27;

     

       18
       18
       +
         version = "0.10.6";

     

       19
       19
       +
         disabled = pythonOlder "3.6";

     

       8
       20
        
       

     

       9
       21
        
         src = fetchFromGitHub {

     

       10
       22
        
           owner = "scarface-4711";

     

       11
       11
       -
           repo = "denonavr";

     

       23
       23
       +
           repo = pname;

     

       12
       24
        
           rev = version;

     

       13
       13
       -
           sha256 = "sha256-3ap8F3ayBTpaR98md+gT0+hkIWlFBNxStTGWT5AL//A=";

     

       25
       25
       +
           sha256 = "sha256-jcbjExcyZSE+qVPuYiMmuneugDMBoYz4apY/lz4JnMI=";

     

       14
       26
        
         };

     

       15
       27
        
       

     

       16
       28
        
         propagatedBuildInputs = [

     

       17
       17
       -
           requests

     

       29
       29
       +
           asyncstdlib

     

       30
       30
       +
           attrs

     

       31
       31
       +
           defusedxml

     

       32
       32
       +
           httpx

     

       18
       33
        
           netifaces

     

       19
       34
        
         ];

     

       20
       35
        
       

     

       21
       36
        
         checkInputs = [

     

       37
       37
       +
           pytest-asyncio

     

       22
       38
        
           pytestCheckHook

     

       23
       23
       -
           testtools

     

       24
       24
       -
           requests-mock

     

       39
       39
       +
           pytest-httpx

     

       40
       40
       +
           pytest-timeout

     

       25
       41
        
         ];

     

       26
       42
        
       

     

       43
       43
       +
         pythonImportsCheck = [ "denonavr" ];

     

       44
       44
       +
       

     

       27
       45
        
         meta = with lib; {

     

       46
       46
       +
           description = "Automation Library for Denon AVR receivers";

     

       28
       47
        
           homepage = "https://github.com/scarface-4711/denonavr";

     

       29
       29
       -
           description = "Automation Library for Denon AVR receivers.";

     

       30
       30
       -
           license = licenses.mit;

     

       48
       48
       +
           license = with licenses; [ mit ];

     

       31
       49
        
           maintainers = with maintainers; [ colemickens ];

     

       32
       50
        
         };

     

       33
       51
        
       }

+9 -8

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

···

       1
       1
       -
       { lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, pytestCheckHook }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "netdisco";

     

       5
       5
       -
         version = "2.8.2";

     

       5
       5
       +
         version = "2.8.3";

     

       6
       6
        
       

     

       7
       7
        
         disabled = !isPy3k;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe";

     

       11
       11
       +
           sha256 = "sha256-4WS9PiErB6U7QuejTvbrOmnHetbE5S4zaUyhLCbyihM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         propagatedBuildInputs = [ requests zeroconf netifaces ];

     

       14
       14
       +
         propagatedBuildInputs = [ requests zeroconf ];

     

       15
       15
        
       

     

       16
       16
       -
         checkInputs = [ pytest ];

     

       16
       16
       +
         checkInputs = [ pytestCheckHook ];

     

       17
       17
        
       

     

       18
       18
       -
         checkPhase = ''

     

       19
       19
       -
           py.test

     

       20
       20
       -
         '';

     

       18
       18
       +
         pythonImportsCheck = [

     

       19
       19
       +
           "netdisco"

     

       20
       20
       +
           "netdisco.discovery"

     

       21
       21
       +
         ];

     

       21
       22
        
       

     

       22
       23
        
         meta = with lib; {

     

       23
       24
        
           description = "Python library to scan local network for services and devices";

+18 -7

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , psycopg2

     

       6
       6
       +
       , click

     

       7
       7
       +
       , configobj

     

       8
       8
       +
       , sqlparse

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       buildPythonPackage rec {

     

       4
       12
        
         pname = "pgspecial";

     
···

       9
       17
        
           sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02";

     

       10
       18
        
         };

     

       11
       19
        
       

     

       12
       12
       -
         checkInputs = [ pytest ];

     

       13
       13
       -
         propagatedBuildInputs = [ click sqlparse psycopg2 ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           click

     

       22
       22
       +
           sqlparse

     

       23
       23
       +
           psycopg2

     

       24
       24
       +
         ];

     

       14
       25
        
       

     

       15
       15
       -
         checkPhase = ''

     

       16
       16
       -
           find tests -name \*.pyc -delete

     

       17
       17
       -
           py.test tests

     

       18
       18
       -
         '';

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           configobj

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       19
       30
        
       

     

       20
       31
        
         meta = with lib; {

     

       21
       32
        
           description = "Meta-commands handler for Postgres Database";

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "pyclimacell";

     

       12
       12
       -
         version = "0.18.0";

     

       12
       12
       +
         version = "0.18.2";

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "raman325";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           sha256 = "0pxlh3lwd1az6v7vbaz9kv6ngqxf34iddp7vr0d0p8apbvinwrha";

     

       19
       19
       +
           sha256 = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytest, seaborn }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pycm";

     
···

       20
       20
        
         '';

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ pytest ];

     

       23
       23
       -
         propagatedBuildInputs = [ numpy ];

     

       23
       23
       +
         propagatedBuildInputs = [ matplotlib numpy seaborn ];

     

       24
       24
        
       

     

       25
       25
        
         checkPhase = ''

     

       26
       26
        
           pytest Test/

+1

pkgs/development/python-modules/pytest-annotate/default.nix

···

       31
       31
        
         doCheck = false;

     

       32
       32
        
       

     

       33
       33
        
         meta = with lib; {

     

       34
       34
       +
           broken = true; # unmaintained and incompatible with pytest>=6.0

     

       34
       35
        
           homepage = "https://github.com/kensho-technologies/pytest-annotate";

     

       35
       36
        
           description = "Generate PyAnnotate annotations from your pytest tests";

     

       36
       37
        
           license = licenses.asl20;

+13 -8

pkgs/development/python-modules/python-redis-lock/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , redis

     

       5
       5
       -
       , pytest

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
        
       , process-tests

     

       7
       7
        
       , pkgs

     

       8
       8
        
       , withDjango ? false, django_redis

     
···

       17
       17
        
           sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         checkInputs = [ pytest process-tests pkgs.redis ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           redis

     

       22
       22
       +
         ] ++ lib.optional withDjango django_redis;

     

       21
       23
        
       

     

       22
       22
       -
         checkPhase = ''

     

       23
       23
       -
           pytest tests/

     

       24
       24
       -
         '';

     

       24
       24
       +
         checkInputs = [

     

       25
       25
       +
           pytestCheckHook

     

       26
       26
       +
           process-tests

     

       27
       27
       +
           pkgs.redis

     

       28
       28
       +
         ];

     

       25
       29
        
       

     

       26
       26
       -
         propagatedBuildInputs = [ redis ]

     

       27
       27
       -
         ++ lib.optional withDjango django_redis;

     

       28
       28
       -
       

     

       30
       30
       +
         disabledTests = [

     

       31
       31
       +
           # https://github.com/ionelmc/python-redis-lock/issues/86

     

       32
       32
       +
           "test_no_overlap2"

     

       33
       33
       +
         ];

     

       29
       34
        
       

     

       30
       35
        
         meta = with lib; {

     

       31
       36
        
           homepage = "https://github.com/ionelmc/python-redis-lock";

-1

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

···

       24
       24
        
       

     

       25
       25
        
         pythonImportsCheck = [

     

       26
       26
        
           "snap7"

     

       27
       27
       -
           "snap7.six"

     

       28
       27
        
           "snap7.util"

     

       29
       28
        
         ];

     

       30
       29

+3 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "zeroconf";

     

       12
       12
       -
         version = "0.29.0";

     

       12
       12
       +
         version = "0.30.0";

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8=";

     

       17
       17
       +
           sha256 = "sha256-elpjZq4FpI2wTf1ciILumKE/LQ4fxtCaXxvQo9HRCcc=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ ifaddr ];

     
···

       25
       25
        
       

     

       26
       26
        
         disabledTests = [

     

       27
       27
        
           # disable tests that expect some sort of networking in the build container

     

       28
       28
       +
           "test_close_multiple_times"

     

       28
       29
        
           "test_launch_and_close"

     

       29
       30
        
           "test_launch_and_close_v4_v6"

     

       30
       31
        
           "test_launch_and_close_v6_only"

+2 -2

pkgs/development/tools/analysis/flow/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "flow";

     

       5
       5
       -
         version = "0.150.0";

     

       5
       5
       +
         version = "0.150.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "facebook";

     

       9
       9
        
           repo   = "flow";

     

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

     

       11
       11
       -
           sha256 = "sha256-75QSM2v4xDCkDnxW6Qb2ZGiWClOSDCd0jSrUdupMXxY=";

     

       11
       11
       +
           sha256 = "sha256-waQdS0HJVW2WFQFklmZJC0jr09JrDP5Fl7SxVS0dsgU=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         installPhase = ''

+12 -4

pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix

···

       1
       1
       -
       { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }:

     

       1
       1
       +
       { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }:

     

       2
       2
        
       let

     

       3
       3
        
         inherit (haskell.lib) overrideCabal addBuildDepends;

     

       4
       4
        
         inherit (lib) makeBinPath;

     
···

       16
       16
        
                 makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins}

     

       17
       17
        
               '';

     

       18
       18
        
             });

     

       19
       19
       -
       in pkg // {

     

       20
       20
       -
           meta = pkg.meta // {

     

       19
       19
       +
       in pkg.overrideAttrs (o: {

     

       20
       20
       +
           meta = o.meta // {

     

       21
       21
        
             position = toString ./default.nix + ":1";

     

       22
       22
        
           };

     

       23
       23
       -
         }

     

       23
       23
       +
           passthru = o.passthru // {

     

       24
       24
       +
             # Does not test the package, but evaluation of the related NixOS module.

     

       25
       25
       +
             tests.nixos-minimal-config = nixos {

     

       26
       26
       +
               boot.loader.grub.enable = false;

     

       27
       27
       +
               fileSystems."/".device = "bogus";

     

       28
       28
       +
               services.hercules-ci-agent.enable = true;

     

       29
       29
       +
             };

     

       30
       30
       +
           };

     

       31
       31
       +
         })

+2 -2

pkgs/development/tools/esbuild/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "esbuild";

     

       5
       5
       -
         version = "0.11.15";

     

       5
       5
       +
         version = "0.11.19";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "evanw";

     

       9
       9
        
           repo = "esbuild";

     

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

     

       11
       11
       -
           sha256 = "1j6qli26i2hwkjqcigz7vyx6hg9daq4vlqigv7ddslw3h8hnp0md";

     

       11
       11
       +
           sha256 = "1cg1qjjsbqr9xbgh8m48vkcb52vf64ycd5x86px60apr068y9df9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q";

+2 -2

pkgs/development/tools/go-mockery/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-mockery";

     

       5
       5
       -
         version = "2.7.4";

     

       5
       5
       +
         version = "2.7.5";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vektra";

     

       9
       9
        
           repo = "mockery";

     

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

     

       11
       11
       -
           sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0=";

     

       11
       11
       +
           sha256 = "sha256-RdXViEEJR8yud2coSmAUfIe1mTCHiZHALrcGRslNfEg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA=";

+3 -3

pkgs/development/tools/misc/act/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "act";

     

       5
       5
       -
         version = "0.2.21";

     

       5
       5
       +
         version = "0.2.22";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nektos";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-XDxG7F+oBatlb4ROBryt2Fop402riKmYoqZLJrUzBUQ=";

     

       11
       11
       +
           sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-PwVDMSl36m+6ISJQvyrkCjaL3xp5VkaZtfxyMpNn+KI=";

     

       14
       14
       +
         vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+3 -3

pkgs/development/tools/rust/cargo-watch/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "cargo-watch";

     

       5
       5
       -
         version = "7.7.2";

     

       5
       5
       +
         version = "7.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "passcod";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";

     

       11
       11
       +
           sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";

     

       14
       14
       +
         cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA=";

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];

     

       17
       17

+2 -2

pkgs/development/tools/vultr-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "vultr-cli";

     

       5
       5
       -
         version = "2.4.0";

     

       5
       5
       +
         version = "2.4.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vultr";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-TNytKq2LqLWxNrqesOJbNQUTirvPkxLMqJmtbmFq+0Y=";

     

       11
       11
       +
           sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = null;

+10 -1

pkgs/games/colobot/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng

     

       2
       2
        
       , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal

     

       3
       3
        
       , xmlstarlet, doxygen, python3, callPackage }:

     

       4
       4
        
       

     
···

       17
       17
        
           rev = "colobot-gold-${version}";

     

       18
       18
        
           sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2";

     

       19
       19
        
         };

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           # Fix issue with newer compilers, like used in nixpkgs

     

       23
       23
       +
           # https://github.com/colobot/colobot/pull/1291

     

       24
       24
       +
           (fetchpatch {

     

       25
       25
       +
             url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch";

     

       26
       26
       +
             sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo=";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       20
       29
        
       

     

       21
       30
        
         nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ];

     

       22
       31
        
         buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];

+2 -2

pkgs/games/cutemaze/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "cutemaze";

     

       5
       5
       -
         version = "1.2.6";

     

       5
       5
       +
         version = "1.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2";

     

       9
       9
       -
           sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw";

     

       9
       9
       +
           sha256 = "sha256-h7+H2E37ZVSnlPa6ID+lNEvFtU5PfdMSlBjqBumojoU=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ qmake qttools ];

+2 -2

pkgs/misc/uboot/default.nix

···

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
        
       let

     

       21
       21
       -
         defaultVersion = "2021.01";

     

       21
       21
       +
         defaultVersion = "2021.04";

     

       22
       22
        
         defaultSrc = fetchurl {

     

       23
       23
        
           url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";

     

       24
       24
       -
           sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl";

     

       24
       24
       +
           sha256 = "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd";

     

       25
       25
        
         };

     

       26
       26
        
         buildUBoot = {

     

       27
       27
        
           version ? null

-10

pkgs/misc/vim-plugins/overrides.nix

···

       615
       615
        
           meta.platforms = lib.platforms.all;

     

       616
       616
        
         });

     

       617
       617
        
       

     

       618
       618
       -
         vim-closer = super.vim-closer.overrideAttrs (old: {

     

       619
       619
       -
           patches = [

     

       620
       620
       -
             # Fix duplicate tag in doc

     

       621
       621
       -
             (fetchpatch {

     

       622
       622
       -
               url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch";

     

       623
       623
       -
               sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409";

     

       624
       624
       -
             })

     

       625
       625
       -
           ];

     

       626
       626
       -
         });

     

       627
       627
       -
       

     

       628
       618
        
         vim-codefmt = super.vim-codefmt.overrideAttrs (old: {

     

       629
       619
        
           dependencies = with self; [ vim-maktaba ];

     

       630
       620
        
         });

+2 -2

pkgs/misc/vscode-extensions/default.nix

···

       496
       496
        
               mktplcRef = {

     

       497
       497
        
                 name = "todo-tree";

     

       498
       498
        
                 publisher = "Gruntfuggly";

     

       499
       499
       -
                 version = "0.0.211";

     

       500
       500
       -
                 sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3";

     

       499
       499
       +
                 version = "0.0.213";

     

       500
       500
       +
                 sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95";

     

       501
       501
        
               };

     

       502
       502
        
               meta = with lib; {

     

       503
       503
        
                 license = licenses.mit;

+2 -2

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "2021.5.0";

     

       5
       5
       +
         version = "2021.5.1";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [ abodepy ];

     

       8
       8
        
           "accuweather" = ps: with ps; [ accuweather ];

     
···

       660
       660
        
           "pushover" = ps: with ps; [ pushover-complete ];

     

       661
       661
        
           "pushsafer" = ps: with ps; [ ];

     

       662
       662
        
           "pvoutput" = ps: with ps; [ jsonpath xmltodict ];

     

       663
       663
       -
           "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc

     

       663
       663
       +
           "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ];

     

       664
       664
        
           "pyload" = ps: with ps; [ ];

     

       665
       665
        
           "python_script" = ps: with ps; [ restrictedpython ];

     

       666
       666
        
           "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent

+5 -2

pkgs/servers/home-assistant/default.nix

···

       105
       105
        
         extraBuildInputs = extraPackages py.pkgs;

     

       106
       106
        
       

     

       107
       107
        
         # Don't forget to run parse-requirements.py after updating

     

       108
       108
       -
         hassVersion = "2021.5.0";

     

       108
       108
       +
         hassVersion = "2021.5.1";

     

       109
       109
        
       

     

       110
       110
        
       in with py.pkgs; buildPythonApplication rec {

     

       111
       111
        
         pname = "homeassistant";

     
···

       124
       124
        
           owner = "home-assistant";

     

       125
       125
        
           repo = "core";

     

       126
       126
        
           rev = version;

     

       127
       127
       -
           sha256 = "1kwx0bq2i76p9gbx5kkzkjxd88vzf2daccm0wf123693isk1nwzs";

     

       127
       127
       +
           sha256 = "0bipjfkz4zqhy84jgrn3qxvs4nxya3j08lcsq3xa31xfz8wnpxwj";

     

       128
       128
        
         };

     

       129
       129
        
       

     

       130
       130
        
         # leave this in, so users don't have to constantly update their downstream patch handling

     
···

       204
       204
        
           "calendar"

     

       205
       205
        
           "camera"

     

       206
       206
        
           "cast"

     

       207
       207
       +
           "climacell"

     

       207
       208
        
           "climate"

     

       208
       209
        
           "cloud"

     

       209
       210
        
           "comfoconnect"

     
···

       216
       217
        
           "deconz"

     

       217
       218
        
           "default_config"

     

       218
       219
        
           "demo"

     

       220
       220
       +
           "denonavr"

     

       219
       221
        
           "derivative"

     

       220
       222
        
           "device_automation"

     

       221
       223
        
           "device_sun_light_trigger"

     
···

       320
       322
        
           "prometheus"

     

       321
       323
        
           "proximity"

     

       322
       324
        
           "push"

     

       325
       325
       +
           "pvpc_hourly_pricing"

     

       323
       326
        
           "python_script"

     

       324
       327
        
           "random"

     

       325
       328
        
           "recorder"

-57

pkgs/servers/http/couchdb/2.0.0.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5

     

       2
       2
       -
       , coreutils, bash, makeWrapper, python3 }:

     

       3
       3
       -
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       5
       5
       -
         pname = "couchdb";

     

       6
       6
       -
         version = "2.3.1";

     

       7
       7
       -
       

     

       8
       8
       -
       

     

       9
       9
       -
         # when updating this, please consider bumping the OTP version

     

       10
       10
       -
         # in all-packages.nix

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";

     

       13
       13
       -
           sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       -
         buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))];

     

       18
       18
       -
       

     

       19
       19
       -
         patches = [ ./jsapi.patch ];

     

       20
       20
       -
         postPatch = ''

     

       21
       21
       -
           substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE"

     

       22
       22
       -
       

     

       23
       23
       -
           patch bin/rebar <<EOF

     

       24
       24
       -
           1c1

     

       25
       25
       -
           < #!/usr/bin/env escript

     

       26
       26
       -
           ---

     

       27
       27
       -
           > #!${coreutils}/bin/env escript

     

       28
       28
       -
           EOF

     

       29
       29
       -
       

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         # Configure a username.  The build system would use "couchdb" as

     

       33
       33
       -
         # default if none is provided.  Note that it is unclear where this

     

       34
       34
       -
         # username is actually used in the build, as any choice seems to be

     

       35
       35
       -
         # working.

     

       36
       36
       -
         configurePhase = ''

     

       37
       37
       -
           ./configure -u nobody

     

       38
       38
       -
         '';

     

       39
       39
       -
       

     

       40
       40
       -
         buildPhase = ''

     

       41
       41
       -
           make release

     

       42
       42
       -
         '';

     

       43
       43
       -
       

     

       44
       44
       -
         installPhase = ''

     

       45
       45
       -
           mkdir -p $out

     

       46
       46
       -
           cp -r rel/couchdb/* $out

     

       47
       47
       -
           wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin

     

       48
       48
       -
         '';

     

       49
       49
       -
       

     

       50
       50
       -
         meta = with lib; {

     

       51
       51
       -
           description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";

     

       52
       52
       -
           homepage = "http://couchdb.apache.org";

     

       53
       53
       -
           license = licenses.asl20;

     

       54
       54
       -
           platforms = platforms.all;

     

       55
       55
       -
           maintainers = with maintainers; [ ];

     

       56
       56
       -
         };

     

       57
       57
       -
       }

-39

pkgs/servers/http/couchdb/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man

     

       2
       2
       -
       , sphinx, which, file, pkg-config, getopt }:

     

       3
       3
       -
       

     

       4
       4
       -
       stdenv.mkDerivation rec {

     

       5
       5
       -
         pname = "couchdb";

     

       6
       6
       -
         version = "1.7.1";

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         nativeBuildInputs = [ help2man which file pkg-config sphinx ];

     

       14
       14
       -
         buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];

     

       15
       15
       -
       

     

       16
       16
       -
         postInstall = ''

     

       17
       17
       -
           substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"

     

       18
       18
       -
         '';

     

       19
       19
       -
       

     

       20
       20
       -
         /*

     

       21
       21
       -
         Versions of SpiderMonkey after the js185-1.0.0 release remove the optional

     

       22
       22
       -
         enforcement of preventing anonymous functions in a statement context. This

     

       23
       23
       -
         will most likely break your existing JavaScript code as well as render all

     

       24
       24
       -
         example code invalid.

     

       25
       25
       -
       

     

       26
       26
       -
         If you wish to ignore this error pass --enable-js-trunk to ./configure.

     

       27
       27
       -
         */

     

       28
       28
       -
         configureFlags = [

     

       29
       29
       -
           "--enable-js-trunk"

     

       30
       30
       -
         ];

     

       31
       31
       -
       

     

       32
       32
       -
         meta = with lib; {

     

       33
       33
       -
           description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";

     

       34
       34
       -
           homepage = "http://couchdb.apache.org";

     

       35
       35
       -
           license = licenses.asl20;

     

       36
       36
       -
           platforms = platforms.all;

     

       37
       37
       -
           maintainers = with maintainers; [ ];

     

       38
       38
       -
         };

     

       39
       39
       -
       }

-60

pkgs/servers/http/couchdb/jsapi.patch

···

       1
       1
       -
       diff -ru couch_js/http.c couch_js-patched/http.c

     

       2
       2
       -
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c	2016-09-12 11:28:51.000000000 +0200

     

       3
       3
       -
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c	2017-02-10 10:52:33.025854045 +0100

     

       4
       4
       -
       @@ -15,7 +15,7 @@

     

       5
       5
       -
        #include <string.h>

     

       6
       6
       -
        #include <sys/types.h>

     

       7
       7
       -
        #include <sys/stat.h>

     

       8
       8
       -
       -#include <jsapi.h>

     

       9
       9
       -
       +#include <js/jsapi.h>

     

       10
       10
       -
        #include "config.h"

     

       11
       11
       -
        #include "utf8.h"

     

       12
       12
       -
        #include "util.h"

     

       13
       13
       -
       diff -ru couch_js/main.c couch_js-patched/main.c

     

       14
       14
       -
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c	2016-09-12 11:28:51.000000000 +0200

     

       15
       15
       -
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c	2017-02-10 10:52:33.001854154 +0100

     

       16
       16
       -
       @@ -20,7 +20,7 @@

     

       17
       17
       -
        #include <unistd.h>

     

       18
       18
       -
        #endif

     

       19
       19
       -
        

     

       20
       20
       -
       -#include <jsapi.h>

     

       21
       21
       -
       +#include <js/jsapi.h>

     

       22
       22
       -
        #include "config.h"

     

       23
       23
       -
        #include "http.h"

     

       24
       24
       -
        #include "utf8.h"

     

       25
       25
       -
       diff -ru couch_js/utf8.c couch_js-patched/utf8.c

     

       26
       26
       -
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c	2016-09-12 11:28:51.000000000 +0200

     

       27
       27
       -
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c	2017-02-10 10:52:33.009854117 +0100

     

       28
       28
       -
       @@ -10,7 +10,7 @@

     

       29
       29
       -
        // License for the specific language governing permissions and limitations under

     

       30
       30
       -
        // the License.

     

       31
       31
       -
        

     

       32
       32
       -
       -#include <jsapi.h>

     

       33
       33
       -
       +#include <js/jsapi.h>

     

       34
       34
       -
        #include "config.h"

     

       35
       35
       -
        

     

       36
       36
       -
        static int

     

       37
       37
       -
       diff -ru couch_js/util.c couch_js-patched/util.c

     

       38
       38
       -
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c	2016-09-12 11:28:51.000000000 +0200

     

       39
       39
       -
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c	2017-02-10 10:52:33.017854081 +0100

     

       40
       40
       -
       @@ -13,7 +13,7 @@

     

       41
       41
       -
        #include <stdlib.h>

     

       42
       42
       -
        #include <string.h>

     

       43
       43
       -
        

     

       44
       44
       -
       -#include <jsapi.h>

     

       45
       45
       -
       +#include <js/jsapi.h>

     

       46
       46
       -
        

     

       47
       47
       -
        #include "help.h"

     

       48
       48
       -
        #include "util.h"

     

       49
       49
       -
       diff -ru couch_js/util.h couch_js-patched/util.h

     

       50
       50
       -
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h	2016-09-12 11:28:51.000000000 +0200

     

       51
       51
       -
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h	2017-02-10 10:52:32.988854212 +0100

     

       52
       52
       -
       @@ -13,7 +13,7 @@

     

       53
       53
       -
        #ifndef COUCHJS_UTIL_H

     

       54
       54
       -
        #define COUCHJS_UTIL_H

     

       55
       55
       -
        

     

       56
       56
       -
       -#include <jsapi.h>

     

       57
       57
       -
       +#include <js/jsapi.h>

     

       58
       58
       -
        

     

       59
       59
       -
        typedef struct {

     

       60
       60
       -
            int          no_eval;

+2 -2

pkgs/servers/jackett/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "jackett";

     

       5
       5
       -
         version = "0.17.865";

     

       5
       5
       +
         version = "0.17.1027";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-kjrch++WncedVkRm05RifUGEYlc5NFAss/E6fgPZWyQ=";

     

       9
       9
       +
           sha256 = "sha256:1kmi4f1ghx82rfd8y4laggg8cs9apnhcdkakfi0mah7hqcnqmhm3";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+122 -61

pkgs/servers/rt/default.nix

···

       1
       1
       -
       { lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }:

     

       1
       1
       +
       { lib, stdenv, autoreconfHook, buildEnv, fetchFromGitHub, perl, perlPackages, makeWrapper, gnupg, openssl }:

     

       2
       2
        
       

     

       3
       3
       -
       # This package isn't extremely useful as it is, but is getting close.

     

       4
       4
       -
       # After running:

     

       5
       5
       -
       #

     

       6
       6
       -
       #   nix-build . -A rt

     

       7
       7
       -
       #

     

       8
       8
       -
       # I created a config file named myconfig.pm with:

     

       9
       9
       -
       #

     

       10
       10
       -
       #   use utf8;

     

       11
       11
       -
       #   Set($rtname, '127.0.0.1');

     

       12
       12
       -
       #   # These dirs need to be pre-created:

     

       13
       13
       -
       #   Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/');

     

       14
       14
       -
       #   Set($MasonDataDir, '/home/grahamc/foo/localstate/');

     

       15
       15
       -
       #   Set($WebPort, 8080);

     

       16
       16
       -
       #

     

       17
       17
       -
       #   Set($DatabaseType, "SQLite");

     

       18
       18
       -
       #   Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' );

     

       19
       19
       -
       #

     

       20
       20
       -
       #   1;

     

       21
       21
       -
       #

     

       22
       22
       -
       # and ran

     

       23
       23
       -
       #

     

       24
       24
       -
       #  RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init

     

       25
       25
       -
       #

     

       26
       26
       -
       # Then:

     

       27
       27
       -
       #

     

       28
       28
       -
       #   RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server

     

       29
       29
       -
       #

     

       30
       30
       -
       # Make sure to check out result/etc/RT_Config.pm

     

       31
       31
       -
       #

     

       32
       32
       -
       # Good luck.

     

       33
       3
        
       stdenv.mkDerivation rec {

     

       34
       4
        
         pname = "rt";

     

       5
       5
       +
         version = "5.0.1";

     

       35
       6
        
       

     

       36
       36
       -
         version = "4.4.4";

     

       37
       37
       -
       

     

       38
       38
       -
         src = fetchurl {

     

       39
       39
       -
           url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz";

     

       40
       40
       -
           sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           repo = pname;

     

       9
       9
       +
           rev = "${pname}-${version}";

     

       10
       10
       +
           owner = "bestpractical";

     

       11
       11
       +
           sha256 = "1qqh6w094x7dljz001va802v4s6mixs9lkhs2cs47lf5ph3vwq2q";

     

       41
       12
        
         };

     

       42
       13
        
       

     

       43
       43
       -
         patches = [ ./override-generated.patch ];

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           ./dont-check-users_groups.patch  # needed for "make testdeps" to work in the build

     

       16
       16
       +
           ./override-generated.patch

     

       17
       17
       +
         ];

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [

     

       20
       20
       +
           autoreconfHook

     

       21
       21
       +
         ];

     

       44
       22
        
       

     

       45
       23
        
         buildInputs = [

     

       46
       24
        
           makeWrapper

     
···

       48
       26
        
           (buildEnv {

     

       49
       27
        
             name = "rt-perl-deps";

     

       50
       28
        
             paths = with perlPackages; (requiredPerlModules [

     

       51
       51
       -
               ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI

     

       52
       52
       -
               CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish

     

       53
       53
       -
               CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID

     

       54
       54
       -
               DataICal DataPagePageset DateExtract DateManip

     

       55
       55
       -
               DateTimeFormatNatural DevelGlobalDestruction EmailAddress

     

       56
       56
       -
               EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich

     

       57
       57
       -
               GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks

     

       58
       58
       -
               HTMLFormatTextWithLinksAndTables HTMLMason

     

       59
       59
       -
               HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes

     

       60
       60
       -
               HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP

     

       61
       61
       -
               LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon

     

       62
       62
       -
               LogDispatch MIMETools MIMETypes MailTools ModuleRefresh

     

       63
       63
       -
               ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack

     

       64
       64
       -
               RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic

     

       65
       65
       -
               ScopeUpper Starlet SymbolGlobalName TermReadKey

     

       66
       66
       -
               TextPasswordPronounceable TextQuoted TextTemplate

     

       67
       67
       -
               TextWikiFormat TextWrapper TimeParseDate TreeSimple

     

       68
       68
       -
               UNIVERSALrequire XMLRSS

     

       29
       29
       +
               ApacheSession

     

       30
       30
       +
               BusinessHours

     

       31
       31
       +
               CGIEmulatePSGI

     

       32
       32
       +
               CGIPSGI

     

       33
       33
       +
               CSSMinifierXS

     

       34
       34
       +
               CSSSquish

     

       35
       35
       +
               ConvertColor

     

       36
       36
       +
               CryptEksblowfish

     

       37
       37
       +
               CryptSSLeay

     

       38
       38
       +
               CryptX509

     

       39
       39
       +
               DBDPg

     

       40
       40
       +
               DBIxSearchBuilder

     

       41
       41
       +
               DataGUID

     

       42
       42
       +
               DataICal

     

       43
       43
       +
               DataPage

     

       44
       44
       +
               DataPagePageset

     

       45
       45
       +
               DateExtract

     

       46
       46
       +
               DateManip

     

       47
       47
       +
               DateTimeFormatNatural

     

       48
       48
       +
               DevelGlobalDestruction

     

       49
       49
       +
               EmailAddress

     

       50
       50
       +
               EmailAddressList

     

       51
       51
       +
               EncodeDetect

     

       52
       52
       +
               EncodeHanExtra

     

       53
       53
       +
               FCGI

     

       54
       54
       +
               FCGIProcManager

     

       55
       55
       +
               FileShareDir

     

       56
       56
       +
               FileWhich

     

       57
       57
       +
               GD

     

       58
       58
       +
               GDGraph

     

       59
       59
       +
               GnuPGInterface

     

       60
       60
       +
               GraphViz

     

       61
       61
       +
               HTMLFormatExternal

     

       62
       62
       +
               HTMLFormatTextWithLinks

     

       63
       63
       +
               HTMLFormatTextWithLinksAndTables

     

       64
       64
       +
               HTMLGumbo

     

       65
       65
       +
               HTMLMason

     

       66
       66
       +
               HTMLMasonPSGIHandler

     

       67
       67
       +
               HTMLQuoted

     

       68
       68
       +
               HTMLRewriteAttributes

     

       69
       69
       +
               HTMLScrubber

     

       70
       70
       +
               IPCRun

     

       71
       71
       +
               IPCRun3

     

       72
       72
       +
               JSON

     

       73
       73
       +
               JavaScriptMinifierXS

     

       74
       74
       +
               LWP

     

       75
       75
       +
               LWPProtocolHttps

     

       76
       76
       +
               LocaleMaketextFuzzy

     

       77
       77
       +
               LocaleMaketextLexicon

     

       78
       78
       +
               LogDispatch

     

       79
       79
       +
               MIMETools

     

       80
       80
       +
               MIMETypes

     

       81
       81
       +
               MailTools

     

       82
       82
       +
               ModulePath

     

       83
       83
       +
               ModuleRefresh

     

       84
       84
       +
               ModuleVersionsReport

     

       85
       85
       +
               Moose

     

       86
       86
       +
               MooseXNonMoose

     

       87
       87
       +
               MooseXRoleParameterized

     

       88
       88
       +
               MozillaCA

     

       89
       89
       +
               NetCIDR

     

       90
       90
       +
               NetIP

     

       91
       91
       +
               PathDispatcher

     

       92
       92
       +
               PerlIOeol

     

       93
       93
       +
               Plack

     

       94
       94
       +
               PodParser

     

       95
       95
       +
               RegexpCommon

     

       96
       96
       +
               RegexpCommonnetCIDR

     

       97
       97
       +
               RegexpIPv6

     

       98
       98
       +
               RoleBasic

     

       99
       99
       +
               ScopeUpper

     

       100
       100
       +
               Starlet

     

       101
       101
       +
               Starman

     

       102
       102
       +
               StringShellQuote

     

       103
       103
       +
               SymbolGlobalName

     

       104
       104
       +
               TermReadKey

     

       105
       105
       +
               TextPasswordPronounceable

     

       106
       106
       +
               TextQuoted

     

       107
       107
       +
               TextTemplate

     

       108
       108
       +
               TextWikiFormat

     

       109
       109
       +
               TextWordDiff

     

       110
       110
       +
               TextWrapper

     

       111
       111
       +
               TimeParseDate

     

       112
       112
       +
               TreeSimple

     

       113
       113
       +
               UNIVERSALrequire

     

       114
       114
       +
               WebMachine

     

       115
       115
       +
               XMLRSS

     

       116
       116
       +
               perlldap

     

       69
       117
        
             ]);

     

       70
       118
        
           })

     

       71
       119
        
         ];

     

       72
       120
        
       

     

       121
       121
       +
         preAutoreconf = ''

     

       122
       122
       +
           substituteInPlace configure.ac \

     

       123
       123
       +
             --replace "rt-3.9.EXPORTED" "rt-${version}"

     

       124
       124
       +
         '';

     

       73
       125
        
         preConfigure = ''

     

       74
       126
        
           configureFlags="$configureFlags --with-web-user=$UID"

     

       75
       127
        
           configureFlags="$configureFlags --with-web-group=$(id -g)"

     
···

       82
       134
        
           "--enable-graphviz"

     

       83
       135
        
           "--enable-gd"

     

       84
       136
        
           "--enable-gpg"

     

       85
       85
       -
           "--with-db-type=SQLite"

     

       137
       137
       +
           "--enable-smime"

     

       138
       138
       +
           "--with-db-type=Pg"

     

       86
       139
        
         ];

     

       87
       140
        
       

     

       88
       141
        
         buildPhase = ''

     

       89
       89
       -
           make testdeps | grep -i missing | sort

     

       142
       142
       +
           make testdeps

     

       90
       143
        
         '';

     

       91
       144
        
       

     

       92
       92
       -
         preFixup = ''

     

       93
       93
       -
           for i in $(find $out/bin -type f; find $out/sbin -type f); do

     

       94
       94
       -
             wrapProgram $i \

     

       95
       95
       -
                 --prefix PERL5LIB ':' $PERL5LIB

     

       145
       145
       +
         postFixup = ''

     

       146
       146
       +
           for i in $(find $out/bin -type f); do

     

       147
       147
       +
             wrapProgram $i --prefix PERL5LIB ':' $PERL5LIB \

     

       148
       148
       +
               --prefix PATH ":" "${lib.makeBinPath [ openssl gnupg ]}"

     

       96
       149
        
           done

     

       150
       150
       +
       

     

       151
       151
       +
           rm -r $out/var

     

       152
       152
       +
           mkdir -p $out/var/data

     

       153
       153
       +
           ln -s /var/log/rt $out/var/log

     

       154
       154
       +
           ln -s /run/rt/mason_data $out/var/mason_data

     

       155
       155
       +
           ln -s /var/lib/rt/shredder $out/var/data/RT-Shredder

     

       156
       156
       +
           ln -s /var/lib/rt/smime $out/var/data/smime

     

       157
       157
       +
           ln -s /var/lib/rt/gpg $out/var/data/gpg

     

       97
       158
        
         '';

     

       98
       159
        
       

     

       99
       160
        
         meta = {

+12

pkgs/servers/rt/dont-check-users_groups.patch

···

       1
       1
       +
       diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in

     

       2
       2
       +
       index e51feb197..d75b1bc4e 100644

     

       3
       3
       +
       --- a/sbin/rt-test-dependencies.in

     

       4
       4
       +
       +++ b/sbin/rt-test-dependencies.in

     

       5
       5
       +
       @@ -423,6 +423,7 @@ sub check_perl_version {

     

       6
       6
       +
        }

     

       7
       7
       +
        

     

       8
       8
       +
        sub check_users_groups {

     

       9
       9
       +
       +    return 0;

     

       10
       10
       +
            section("users / groups");

     

       11
       11
       +
        

     

       12
       12
       +
            my $fails = 0;

+2 -2

pkgs/tools/admin/fioctl/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "fioctl";

     

       5
       5
       -
         version = "0.15";

     

       5
       5
       +
         version = "0.16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "foundriesio";

     

       9
       9
        
           repo = "fioctl";

     

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

     

       11
       11
       -
           sha256 = "0gmh32h9j6wpkdxxg7vj158lsaxq30x7hjsc9gwpip3bff278hw4";

     

       11
       11
       +
           sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9";

+11 -3

pkgs/tools/admin/trivy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "trivy";

     

       5
       5
       -
         version = "0.17.1";

     

       5
       5
       +
         version = "0.17.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "aquasecurity";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-5TOKYxH1Tnsd1t2yoUflFUSW0QGS9l5+0JtS2Fo6vL0=";

     

       11
       11
       +
           sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-zVe1bTTLOHxfdbb6VcztOCWMbCbzT6igNpvPytktMWs=";

     

       14
       14
       +
         vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA=";

     

       15
       15
        
       

     

       16
       16
        
         excludedPackages = "misc";

     

       17
       17
        
       

     

       18
       18
        
         preBuild = ''

     

       19
       19
        
           buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         doInstallCheck = true;

     

       23
       23
       +
         installCheckPhase = ''

     

       24
       24
       +
           runHook preInstallCheck

     

       25
       25
       +
           $out/bin/trivy --help

     

       26
       26
       +
           $out/bin/trivy --version | grep "v${version}"

     

       27
       27
       +
           runHook postInstallCheck

     

       20
       28
        
         '';

     

       21
       29
        
       

     

       22
       30
        
         meta = with lib; {

+7 -1

pkgs/tools/misc/hdf5/1.10.nix

···

       3
       3
        
       , removeReferencesTo

     

       4
       4
        
       , zlib ? null

     

       5
       5
        
       , enableShared ? !stdenv.hostPlatform.isStatic

     

       6
       6
       +
       , javaSupport ? false

     

       7
       7
       +
       , jdk

     

       6
       8
        
       }:

     

       7
       9
        
       

     

       8
       10
        
       let inherit (lib) optional optionals; in

     
···

       17
       19
        
       

     

       18
       20
        
         outputs = [ "out" "dev" ];

     

       19
       21
        
       

     

       22
       22
       +
         buildInputs = optional javaSupport jdk;

     

       23
       23
       +
       

     

       20
       24
        
         nativeBuildInputs = [ removeReferencesTo ];

     

       21
       25
        
       

     

       22
       26
        
         propagatedBuildInputs = optional (zlib != null) zlib;

     

       23
       27
        
       

     

       24
       24
       -
         configureFlags = optional enableShared "--enable-shared";

     

       28
       28
       +
         configureFlags = []

     

       29
       29
       +
           ++ optional enableShared "--enable-shared"

     

       30
       30
       +
           ++ optional javaSupport "--enable-java";

     

       25
       31
        
       

     

       26
       32
        
         patches = [

     

       27
       33
        
           ./bin-mv.patch

+4 -4

pkgs/tools/networking/boundary/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "boundary";

     

       5
       5
       -
         version = "0.2.0";

     

       5
       5
       +
         version = "0.2.1";

     

       6
       6
        
       

     

       7
       7
        
         src =

     

       8
       8
        
           let

     
···

       18
       18
        
             };

     

       19
       19
        
           in

     

       20
       20
        
           fetchsrc version {

     

       21
       21
       -
             x86_64-linux = "sha256-4h1Lx+Et1AfX75Cn0YUhV4MkEtzP6ICqAHVKex3PBpg=";

     

       22
       22
       -
             aarch64-linux = "sha256-i7gzv8GdDgikPT1tMia4xltEYiIZ/VNRbAiGF2o8oKA=";

     

       23
       23
       -
             x86_64-darwin = "sha256-tleIY1loPE61n59Qc9CJeropRUvTBbcIA8xmB1SaMt8=";

     

       21
       21
       +
             x86_64-linux = "sha256-DDrsgZlnDF+WlBKyDi1McqcXEe5mAxoq5WW60p5qFQ8=";

     

       22
       22
       +
             aarch64-linux = "sha256-z9puhWmWf6G2C9PItKD4KL742UjVyVE/TDIu0gpOKd4=";

     

       23
       23
       +
             x86_64-darwin = "sha256-hDZPKi5R0seLbkHe7V4Vm+FarI6HrSZJF9JBJBa9O2Y=";

     

       24
       24
        
           };

     

       25
       25
        
       

     

       26
       26
        
         dontConfigure = true;

+2 -2

pkgs/tools/security/expliot/default.nix

···

       22
       22
        
       

     

       23
       23
        
       buildPythonApplication rec {

     

       24
       24
        
         pname = "expliot";

     

       25
       25
       -
         version = "0.9.7";

     

       25
       25
       +
         version = "0.9.8";

     

       26
       26
        
         disabled = pythonOlder "3.7";

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitLab {

     

       29
       29
        
           owner = "expliot_framework";

     

       30
       30
        
           repo = pname;

     

       31
       31
        
           rev = version;

     

       32
       32
       -
           sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0=";

     

       32
       32
       +
           sha256 = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         propagatedBuildInputs = [

+4

pkgs/top-level/aliases.nix

···

       121
       121
        
         conntrack_tools = conntrack-tools; # added 2018-05

     

       122
       122
        
         cool-old-term = cool-retro-term; # added 2015-01-31

     

       123
       123
        
         coprthr = throw "coprthr has been removed."; # added 2019-12-08

     

       124
       124
       +
         couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03

     

       125
       125
       +
         couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03

     

       124
       126
        
         corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";

     

       125
       127
        
         coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16

     

       126
       128
        
         cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30

     
···

       195
       197
        
         exfat-utils = exfat;                  # 2015-09-11

     

       196
       198
        
         facette = throw "facette has been removed."; # added 2020-01-06

     

       197
       199
        
         fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28

     

       200
       200
       +
         fastnlo = fastnlo_toolkit; # added 2021-04-24

     

       198
       201
        
         fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13

     

       199
       202
        
         fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";

     

       200
       203
        
         ffadoFull = ffado; # added 2018-05-01

     
···

       749
       752
        
         speedtest_cli = speedtest-cli;  # added 2015-02-17

     

       750
       753
        
         spice_gtk = spice-gtk; # added 2018-02-25

     

       751
       754
        
         spice_protocol = spice-protocol; # added 2018-02-25

     

       755
       755
       +
         spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03

     

       752
       756
        
         spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21

     

       753
       757
        
         spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16

     

       754
       758
        
         spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21

+4 -12

pkgs/top-level/all-packages.nix

···

       5463
       5463
        
       

     

       5464
       5464
        
         hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };

     

       5465
       5465
        
       

     

       5466
       5466
       -
         hdfview = callPackage ../tools/misc/hdfview { };

     

       5466
       5466
       +
         hdfview = callPackage ../tools/misc/hdfview {

     

       5467
       5467
       +
           hdf5 = hdf5_1_10;

     

       5468
       5468
       +
         };

     

       5467
       5469
        
       

     

       5468
       5470
        
         hecate = callPackage ../applications/editors/hecate { };

     

       5469
       5471
        
       

     
···

       12210
       12212
        
       

     

       12211
       12213
        
         sparkleshare = callPackage ../applications/version-management/sparkleshare { };

     

       12212
       12214
        
       

     

       12213
       12213
       -
         spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };

     

       12214
       12215
        
         spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };

     

       12215
       12216
        
         spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };

     

       12216
       12217
        
       

     
···

       18614
       18615
        
       

     

       18615
       18616
        
         clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;

     

       18616
       18617
        
       

     

       18617
       18617
       -
         couchdb = callPackage ../servers/http/couchdb {

     

       18618
       18618
       -
           sphinx = python27Packages.sphinx;

     

       18619
       18619
       -
           erlang = erlangR19;

     

       18620
       18620
       -
         };

     

       18621
       18621
       -
       

     

       18622
       18622
       -
         couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {

     

       18623
       18623
       -
           erlang = erlangR21;

     

       18624
       18624
       -
         };

     

       18625
       18625
       -
       

     

       18626
       18618
        
         couchdb3 = callPackage ../servers/http/couchdb/3.nix {

     

       18627
       18619
        
           erlang = erlangR22;

     

       18628
       18620
        
         };

     
···

       29728
       29720
        
       

     

       29729
       29721
        
         fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };

     

       29730
       29722
        
       

     

       29731
       29731
       -
         fastnlo = callPackage ../development/libraries/physics/fastnlo { };

     

       29723
       29723
       +
         fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { };

     

       29732
       29724
        
       

     

       29733
       29725
        
         geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };

     

       29734
       29726

+5 -1

pkgs/top-level/haskell-packages.nix

···

       76
       76
        
             llvmPackages = pkgs.llvmPackages_9;

     

       77
       77
        
           };

     

       78
       78
        
           ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {

     

       79
       79
       -
             bootPkgs = packages.ghc8102Binary;

     

       79
       79
       +
             # aarch64 ghc8102Binary exceeds max output size on hydra

     

       80
       80
       +
             bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then

     

       81
       81
       +
                 packages.ghc8102BinaryMinimal

     

       82
       82
       +
               else

     

       83
       83
       +
                 packages.ghc8102Binary;

     

       80
       84
        
             inherit (buildPackages.python3Packages) sphinx;

     

       81
       85
        
             buildLlvmPackages = buildPackages.llvmPackages_10;

     

       82
       86
        
             llvmPackages = pkgs.llvmPackages_10;

+180

pkgs/top-level/perl-packages.nix

···

       174
       174
        
           propagatedBuildInputs = [ AlgorithmDiff ];

     

       175
       175
        
         };

     

       176
       176
        
       

     

       177
       177
       +
         AlienBaseModuleBuild = buildPerlModule {

     

       178
       178
       +
           pname = "Alien-Base-ModuleBuild";

     

       179
       179
       +
           version = "1.15";

     

       180
       180
       +
           src = fetchurl {

     

       181
       181
       +
             url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz";

     

       182
       182
       +
             sha256 = "13c9432cf41b34cb14df2454a03e540e2bd5dc9eb9c82824b6ad0f4c67793afd";

     

       183
       183
       +
           };

     

       184
       184
       +
           buildInputs = [ Test2Suite ];

     

       185
       185
       +
           propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ];

     

       186
       186
       +
           meta = {

     

       187
       187
       +
             homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild;

     

       188
       188
       +
             description = "A Module::Build subclass for building Alien:: modules and their libraries";

     

       189
       189
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       190
       190
       +
           };

     

       191
       191
       +
         };

     

       192
       192
       +
       

     

       177
       193
        
         AlienBuild = buildPerlPackage {

     

       178
       194
        
           pname = "Alien-Build";

     

       179
       195
        
           version = "2.37";

     
···

       201
       217
        
           meta = {

     

       202
       218
        
             description = "Alien package for the GNU Multiple Precision library.";

     

       203
       219
        
             license = with lib.licenses; [ lgpl3Plus ];

     

       220
       220
       +
           };

     

       221
       221
       +
         };

     

       222
       222
       +
       

     

       223
       223
       +
         AlienLibGumbo = buildPerlModule {

     

       224
       224
       +
           pname = "Alien-LibGumbo";

     

       225
       225
       +
           version = "0.05";

     

       226
       226
       +
           src = fetchurl {

     

       227
       227
       +
             url = "mirror://cpan/authors/id/R/RU/RUZ/Alien-LibGumbo-0.05.tar.gz";

     

       228
       228
       +
             sha256 = "0fbe916ab11f680e5c28cd1ac800372323e2a0e06affc6c8b36279fc64d76517";

     

       229
       229
       +
           };

     

       230
       230
       +
           buildInputs = [ AlienBaseModuleBuild ];

     

       231
       231
       +
           propagatedBuildInputs = [ AlienBuild FileShareDir PathClass ];

     

       232
       232
       +
           meta = {

     

       233
       233
       +
             description = "Gumbo parser library";

     

       234
       234
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       204
       235
        
           };

     

       205
       236
        
         };

     

       206
       237
        
       

     
···

       4603
       4634
        
           meta = {

     

       4604
       4635
        
             description = "Crypto toolkit";

     

       4605
       4636
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       4637
       4637
       +
           };

     

       4638
       4638
       +
         };

     

       4639
       4639
       +
       

     

       4640
       4640
       +
         CryptX509 = buildPerlPackage {

     

       4641
       4641
       +
           pname = "Crypt-X509";

     

       4642
       4642
       +
           version = "0.53";

     

       4643
       4643
       +
           src = fetchurl {

     

       4644
       4644
       +
             url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz";

     

       4645
       4645
       +
             sha256 = "d2ff614f9457dc87ab277b81bced3532c3ed309b73b9a61aaefbe9488c9e660f";

     

       4646
       4646
       +
           };

     

       4647
       4647
       +
           propagatedBuildInputs = [ ConvertASN1 ];

     

       4648
       4648
       +
           meta = {

     

       4649
       4649
       +
             description = "Parse a X.509 certificate";

     

       4606
       4650
        
           };

     

       4607
       4651
        
         };

     

       4608
       4652
        
       

     
···

       9471
       9515
        
           };

     

       9472
       9516
        
         };

     

       9473
       9517
        
       

     

       9518
       9518
       +
         HTMLFormatExternal = buildPerlPackage {

     

       9519
       9519
       +
           pname = "HTML-FormatExternal";

     

       9520
       9520
       +
           version = "26";

     

       9521
       9521
       +
           src = fetchurl {

     

       9522
       9522
       +
             url = "mirror://cpan/authors/id/K/KR/KRYDE/HTML-FormatExternal-26.tar.gz";

     

       9523
       9523
       +
             sha256 = "3c59f233d0b10686a85aed0c994011cec68626da0128dea90b5c4fdc1746cfc3";

     

       9524
       9524
       +
           };

     

       9525
       9525
       +
           propagatedBuildInputs = [ IPCRun URI constant-defer ];

     

       9526
       9526
       +
           meta = {

     

       9527
       9527
       +
             homepage = http://user42.tuxfamily.org/html-formatexternal/index.html;

     

       9528
       9528
       +
             description = "HTML to text formatting using external programs";

     

       9529
       9529
       +
             license = lib.licenses.gpl3Plus;

     

       9530
       9530
       +
           };

     

       9531
       9531
       +
         };

     

       9532
       9532
       +
       

     

       9474
       9533
        
         HTMLFormatTextWithLinks = buildPerlModule {

     

       9475
       9534
        
           pname = "HTML-FormatText-WithLinks";

     

       9476
       9535
        
           version = "0.15";

     
···

       9542
       9601
        
           propagatedBuildInputs = [ CryptBlowfish CryptCBC DataClone DateTimeFormatStrptime EmailValid HTMLTree JSONMaybeXS MooseXGetopt MooseXTypesCommon MooseXTypesLoadableClass aliased ];

     

       9543
       9602
        
           meta = {

     

       9544
       9603
        
             description = "HTML forms using Moose";

     

       9604
       9604
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       9605
       9605
       +
           };

     

       9606
       9606
       +
         };

     

       9607
       9607
       +
       

     

       9608
       9608
       +
         HTMLGumbo = buildPerlModule {

     

       9609
       9609
       +
           pname = "HTML-Gumbo";

     

       9610
       9610
       +
           version = "0.18";

     

       9611
       9611
       +
           src = fetchurl {

     

       9612
       9612
       +
             url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Gumbo-0.18.tar.gz";

     

       9613
       9613
       +
             sha256 = "bf50b61c24656cc3fc958602d80a9c7d017247af38d8dbfa0e9dec5b75425d5f";

     

       9614
       9614
       +
           };

     

       9615
       9615
       +
           propagatedBuildInputs = [ AlienLibGumbo ];

     

       9616
       9616
       +
           meta = {

     

       9617
       9617
       +
             description = "HTML5 parser based on gumbo C library";

     

       9545
       9618
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       9546
       9619
        
           };

     

       9547
       9620
        
         };

     
···

       9907
       9980
        
             description = "WebDAV client library.";

     

       9908
       9981
        
           };

     

       9909
       9982
        
           propagatedBuildInputs = [ XMLDOM ];

     

       9983
       9983
       +
         };

     

       9984
       9984
       +
       

     

       9985
       9985
       +
         HTTPHeadersActionPack = buildPerlPackage {

     

       9986
       9986
       +
           pname = "HTTP-Headers-ActionPack";

     

       9987
       9987
       +
           version = "0.09";

     

       9988
       9988
       +
           src = fetchurl {

     

       9989
       9989
       +
             url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTTP-Headers-ActionPack-0.09.tar.gz";

     

       9990
       9990
       +
             sha256 = "c78111ab857e48c69824903d4b6ce8293feffc6b5d670db550a767f853acc7da";

     

       9991
       9991
       +
           };

     

       9992
       9992
       +
           buildInputs = [ TestFatal TestWarnings ];

     

       9993
       9993
       +
           propagatedBuildInputs = [ HTTPDate HTTPMessage ModuleRuntime SubExporter URI ];

     

       9994
       9994
       +
           meta = {

     

       9995
       9995
       +
             description = "HTTP Action, Adventure and Excitement";

     

       9996
       9996
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       9997
       9997
       +
           };

     

       9910
       9998
        
         };

     

       9911
       9999
        
       

     

       9912
       10000
        
         HTTPHeaderParserXS = buildPerlPackage {

     
···

       14049
       14137
        
           };

     

       14050
       14138
        
         };

     

       14051
       14139
        
       

     

       14140
       14140
       +
         MooXTypeTiny = buildPerlPackage {

     

       14141
       14141
       +
           pname = "MooX-TypeTiny";

     

       14142
       14142
       +
           version = "0.002003";

     

       14143
       14143
       +
           src = fetchurl {

     

       14144
       14144
       +
             url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-TypeTiny-0.002003.tar.gz";

     

       14145
       14145
       +
             sha256 = "d81e26ff6f8db10261f0087f96dc54367dcb49a9f3de8d53238f834ece19624b";

     

       14146
       14146
       +
           };

     

       14147
       14147
       +
           buildInputs = [ TestFatal ];

     

       14148
       14148
       +
           propagatedBuildInputs = [ Moo TypeTiny ];

     

       14149
       14149
       +
           meta = {

     

       14150
       14150
       +
             description = "Optimized type checks for Moo + Type::Tiny";

     

       14151
       14151
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       14152
       14152
       +
           };

     

       14153
       14153
       +
         };

     

       14154
       14154
       +
       

     

       14052
       14155
        
         MooseAutobox = buildPerlModule {

     

       14053
       14156
        
           pname = "Moose-Autobox";

     

       14054
       14157
        
           version = "0.16";

     
···

       16481
       16584
        
           };

     

       16482
       16585
        
           meta = {

     

       16483
       16586
        
             description = "Cross-platform path specification manipulation";

     

       16587
       16587
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       16588
       16588
       +
           };

     

       16589
       16589
       +
         };

     

       16590
       16590
       +
       

     

       16591
       16591
       +
         PathDispatcher = buildPerlPackage {

     

       16592
       16592
       +
           pname = "Path-Dispatcher";

     

       16593
       16593
       +
           version = "1.08";

     

       16594
       16594
       +
           src = fetchurl {

     

       16595
       16595
       +
             url = "mirror://cpan/authors/id/E/ET/ETHER/Path-Dispatcher-1.08.tar.gz";

     

       16596
       16596
       +
             sha256 = "79a9f61c27408b4fd1ed234dac246974ddeafa7fe635a18fe41ec7783130ae2a";

     

       16597
       16597
       +
           };

     

       16598
       16598
       +
           buildInputs = [ ModuleBuildTiny TestFatal ];

     

       16599
       16599
       +
           propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ];

     

       16600
       16600
       +
           meta = {

     

       16601
       16601
       +
             homepage = https://github.com/karenetheridge/Path-Dispatcher;

     

       16602
       16602
       +
             description = "Flexible and extensible dispatch";

     

       16484
       16603
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       16485
       16604
        
           };

     

       16486
       16605
        
         };

     
···

       19064
       19183
        
           };

     

       19065
       19184
        
         };

     

       19066
       19185
        
       

     

       19186
       19186
       +
         ShellConfigGenerate = buildPerlPackage {

     

       19187
       19187
       +
           pname = "Shell-Config-Generate";

     

       19188
       19188
       +
           version = "0.34";

     

       19189
       19189
       +
           src = fetchurl {

     

       19190
       19190
       +
             url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.34.tar.gz";

     

       19191
       19191
       +
             sha256 = "84f451f22215dd68e9c18aa3f7ddb03a82007d166cfada003d0f166f571e0562";

     

       19192
       19192
       +
           };

     

       19193
       19193
       +
           buildInputs = [ Test2Suite ];

     

       19194
       19194
       +
           propagatedBuildInputs = [ ShellGuess ];

     

       19195
       19195
       +
           meta = {

     

       19196
       19196
       +
             homepage = https://metacpan.org/pod/Shell::Config::Generate;

     

       19197
       19197
       +
             description = "Portably generate config for any shell";

     

       19198
       19198
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       19199
       19199
       +
           };

     

       19200
       19200
       +
         };

     

       19201
       19201
       +
       

     

       19202
       19202
       +
         ShellGuess = buildPerlPackage {

     

       19203
       19203
       +
           pname = "Shell-Guess";

     

       19204
       19204
       +
           version = "0.09";

     

       19205
       19205
       +
           src = fetchurl {

     

       19206
       19206
       +
             url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz";

     

       19207
       19207
       +
             sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b";

     

       19208
       19208
       +
           };

     

       19209
       19209
       +
           meta = {

     

       19210
       19210
       +
             homepage = https://metacpan.org/pod/Shell::Guess;

     

       19211
       19211
       +
             description = "Make an educated guess about the shell in use";

     

       19212
       19212
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       19213
       19213
       +
           };

     

       19214
       19214
       +
         };

     

       19215
       19215
       +
       

     

       19067
       19216
        
         StringToIdentifierEN = buildPerlPackage {

     

       19068
       19217
        
           pname = "String-ToIdentifier-EN";

     

       19069
       19218
        
           version = "0.12";

     
···

       22215
       22364
        
           propagatedBuildInputs = [ URI ];

     

       22216
       22365
        
         };

     

       22217
       22366
        
       

     

       22367
       22367
       +
         TextWordDiff = buildPerlPackage {

     

       22368
       22368
       +
           pname = "Text-WordDiff";

     

       22369
       22369
       +
           version = "0.09";

     

       22370
       22370
       +
           src = fetchurl {

     

       22371
       22371
       +
             url = "mirror://cpan/authors/id/T/TI/TIMK/Text-WordDiff-0.09.tar.gz";

     

       22372
       22372
       +
             sha256 = "fee699ca763adca2f4e18f4a8a836fd2102bc2820af708f8eb43356d5ae0d50e";

     

       22373
       22373
       +
           };

     

       22374
       22374
       +
           propagatedBuildInputs = [ AlgorithmDiff HTMLParser ];

     

       22375
       22375
       +
           meta = {

     

       22376
       22376
       +
             homepage = https://metacpan.org/release/Text-WordDiff;

     

       22377
       22377
       +
             description = "Track changes between documents";

     

       22378
       22378
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       22379
       22379
       +
           };

     

       22380
       22380
       +
         };

     

       22381
       22381
       +
       

     

       22218
       22382
        
         TextWrapI18N = buildPerlPackage {

     

       22219
       22383
        
           pname = "Text-WrapI18N";

     

       22220
       22384
        
           version = "0.06";

     
···

       23847
       24011
        
           buildInputs = [ TestDeep TestWarn ];

     

       23848
       24012
        
           meta = {

     

       23849
       24013
        
             description = "YAML Framework";

     

       24014
       24014
       +
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       24015
       24015
       +
           };

     

       24016
       24016
       +
         };

     

       24017
       24017
       +
       

     

       24018
       24018
       +
         WebMachine = buildPerlPackage {

     

       24019
       24019
       +
           pname = "Web-Machine";

     

       24020
       24020
       +
           version = "0.17";

     

       24021
       24021
       +
           src = fetchurl {

     

       24022
       24022
       +
             url = "mirror://cpan/authors/id/D/DR/DROLSKY/Web-Machine-0.17.tar.gz";

     

       24023
       24023
       +
             sha256 = "f139d2b3114c549e91847daaab8b75cb699e57daf5bbf0dbd13293f33fe5e22a";

     

       24024
       24024
       +
           };

     

       24025
       24025
       +
           buildInputs = [ NetHTTP TestFailWarnings TestFatal ];

     

       24026
       24026
       +
           propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ];

     

       24027
       24027
       +
           meta = {

     

       24028
       24028
       +
             homepage = http://metacpan.org/release/Web-Machine;

     

       24029
       24029
       +
             description = "A Perl port of Webmachine";

     

       23850
       24030
        
             license = with lib.licenses; [ artistic1 gpl1Plus ];

     

       23851
       24031
        
           };

     

       23852
       24032
        
         };

+9

pkgs/top-level/python-packages.nix

···

       315
       315
        
       

     

       316
       316
        
         aiopulse = callPackage ../development/python-modules/aiopulse { };

     

       317
       317
        
       

     

       318
       318
       +
         aiopvpc = callPackage ../development/python-modules/aiopvpc { };

     

       319
       319
       +
       

     

       318
       320
        
         aiopylgtv = callPackage ../development/python-modules/aiopylgtv { };

     

       319
       321
        
       

     

       320
       322
        
         aiorecollect = callPackage ../development/python-modules/aiorecollect { };

     
···

       554
       556
        
         asyncpg = callPackage ../development/python-modules/asyncpg { };

     

       555
       557
        
       

     

       556
       558
        
         asyncssh = callPackage ../development/python-modules/asyncssh { };

     

       559
       559
       +
       

     

       560
       560
       +
         asyncstdlib = callPackage ../development/python-modules/asyncstdlib { };

     

       557
       561
        
       

     

       558
       562
        
         async_stagger = callPackage ../development/python-modules/async_stagger { };

     

       559
       563
        
       

     
···

       2304
       2308
        
         fastimport = callPackage ../development/python-modules/fastimport { };

     

       2305
       2309
        
       

     

       2306
       2310
        
         fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };

     

       2311
       2311
       +
       

     

       2312
       2312
       +
         fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {

     

       2313
       2313
       +
           withPython = true;

     

       2314
       2314
       +
           inherit python;

     

       2315
       2315
       +
         });

     

       2307
       2316
        
       

     

       2308
       2317
        
         fastpair = callPackage ../development/python-modules/fastpair { };

     

       2309
       2318