commit b511c637c8f083581722e53326a6cb81f1619f53 · pyrox.dev/nixpkgs

+2 -2

doc/languages-frameworks/python.section.md

···

       847
       847
        
       The following is an example:

     

       848
       848
        
       

     

       849
       849
        
       ```nix

     

       850
       850
       -
       { lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:

     

       850
       850
       +
       { lib, buildPythonPackage, fetchPypi, hypothesis, setuptools-scm, attrs, py, setuptools, six, pluggy }:

     

       851
       851
        
       

     

       852
       852
        
       buildPythonPackage rec {

     

       853
       853
        
         pname = "pytest";

     
···

       864
       864
        
         '';

     

       865
       865
        
       

     

       866
       866
        
         checkInputs = [ hypothesis ];

     

       867
       867
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       867
       867
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       868
       868
        
         propagatedBuildInputs = [ attrs py setuptools six pluggy ];

     

       869
       869
        
       

     

       870
       870
        
         meta = with lib; {

+12 -2

maintainers/maintainer-list.nix

···

       4361
       4361
        
           githubId = 54999;

     

       4362
       4362
        
           name = "Ariel Nunez";

     

       4363
       4363
        
         };

     

       4364
       4364
       +
         irenes = {

     

       4365
       4365
       +
           name = "Irene Knapp";

     

       4366
       4366
       +
           email = "ireneista@gmail.com";

     

       4367
       4367
       +
           github = "IreneKnapp";

     

       4368
       4368
       +
           githubId = 157678;

     

       4369
       4369
       +
           keys = [{

     

       4370
       4370
       +
             longkeyid = "rsa4096/0xDBF252AFFB2619FD";

     

       4371
       4371
       +
             fingerprint = "E864 BDFA AB55 36FD C905  5195 DBF2 52AF FB26 19FD";

     

       4372
       4372
       +
           }];

     

       4373
       4373
       +
         };

     

       4364
       4374
        
         ironpinguin = {

     

       4365
       4375
        
           email = "michele@catalano.de";

     

       4366
       4376
        
           github = "ironpinguin";

     
···

       7313
       7323
        
           githubId = 3159451;

     

       7314
       7324
        
           name = "Nicolas Schneider";

     

       7315
       7325
        
         };

     

       7316
       7316
       -
         nipav = {

     

       7326
       7326
       +
         nkpvk = {

     

       7317
       7327
        
           email = "niko.pavlinek@gmail.com";

     

       7318
       7318
       -
           github = "nipav";

     

       7328
       7328
       +
           github = "nkpvk";

     

       7319
       7329
        
           githubId = 16385648;

     

       7320
       7330
        
           name = "Niko Pavlinek";

     

       7321
       7331
        
         };

+17 -3

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

···

       19
       19
        
         </section>

     

       20
       20
        
         <section xml:id="new-services">

     

       21
       21
        
           <title>New Services</title>

     

       22
       22
       -
           <para>

     

       23
       23
       -
           </para>

     

       22
       22
       +
           <itemizedlist spacing="compact">

     

       23
       23
       +
             <listitem>

     

       24
       24
       +
               <para>

     

       25
       25
       +
                 <link xlink:href="https://github.com/maxmind/geoipupdate">geoipupdate</link>,

     

       26
       26
       +
                 a GeoIP database updater from MaxMind. Available as

     

       27
       27
       +
                 <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.

     

       28
       28
       +
               </para>

     

       29
       29
       +
             </listitem>

     

       30
       30
       +
           </itemizedlist>

     

       24
       31
        
         </section>

     

       25
       32
        
         <section xml:id="backward-incompatibilities">

     

       26
       33
        
           <title>Backward Incompatibilities</title>

     

       27
       27
       -
           <itemizedlist spacing="compact">

     

       34
       34
       +
           <itemizedlist>

     

       28
       35
        
             <listitem>

     

       29
       36
        
               <para>

     

       30
       37
        
                 The <literal>staticjinja</literal> package has been upgraded

     

       31
       38
        
                 from 1.0.4 to 2.0.0

     

       39
       39
       +
               </para>

     

       40
       40
       +
             </listitem>

     

       41
       41
       +
             <listitem>

     

       42
       42
       +
               <para>

     

       43
       43
       +
                 <literal>services.geoip-updater</literal> was broken and has

     

       44
       44
       +
                 been replaced by

     

       45
       45
       +
                 <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.

     

       32
       46
        
               </para>

     

       33
       47
        
             </listitem>

     

       34
       48
        
           </itemizedlist>

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

···

       8
       8
        
       

     

       9
       9
        
       ## New Services

     

       10
       10
        
       

     

       11
       11
       +
       * [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP

     

       12
       12
       +
         database updater from MaxMind. Available as

     

       13
       13
       +
         [services.geoipupdate](options.html#opt-services.geoipupdate.enable).

     

       14
       14
       +
       

     

       11
       15
        
       ## Backward Incompatibilities

     

       12
       16
        
       

     

       13
       17
        
       * The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0

     

       18
       18
       +
       

     

       19
       19
       +
       * `services.geoip-updater` was broken and has been replaced by

     

       20
       20
       +
         [services.geoipupdate](options.html#opt-services.geoipupdate.enable).

     

       14
       21
        
       

     

       15
       22
        
       ## Other Notable Changes

+7 -1

nixos/lib/testing-python.nix

···

       130
       130
        
                     {

     

       131
       131
        
                       virtualisation.qemu.package = qemu_pkg;

     

       132
       132
        
                     }

     

       133
       133
       -
                   );

     

       133
       133
       +
                   ) ++ [(

     

       134
       134
       +
                     {

     

       135
       135
       +
                       # Ensure we do not use aliases. Ideally this is only set

     

       136
       136
       +
                       # when the test framework is used by Nixpkgs NixOS tests.

     

       137
       137
       +
                       nixpkgs.config.allowAliases = false;

     

       138
       138
       +
                     }

     

       139
       139
       +
                   )];

     

       134
       140
        
                 };

     

       135
       141
        
       

     

       136
       142
        
                 # FIXME: get this pkg from the module system

+1 -1

nixos/modules/misc/ids.nix

···

       300
       300
        
             #pdns-recursor = 269; # dynamically allocated as of 2020-20-18

     

       301
       301
        
             #kresd = 270; # switched to "knot-resolver" with dynamic ID

     

       302
       302
        
             rpc = 271;

     

       303
       303
       -
             geoip = 272;

     

       303
       303
       +
             #geoip = 272; # new module uses DynamicUser

     

       304
       304
        
             fcron = 273;

     

       305
       305
        
             sonarr = 274;

     

       306
       306
        
             radarr = 275;

+1 -1

nixos/modules/module-list.nix

···

       492
       492
        
         ./services/misc/freeswitch.nix

     

       493
       493
        
         ./services/misc/fstrim.nix

     

       494
       494
        
         ./services/misc/gammu-smsd.nix

     

       495
       495
       -
         ./services/misc/geoip-updater.nix

     

       495
       495
       +
         ./services/misc/geoipupdate.nix

     

       496
       496
        
         ./services/misc/gitea.nix

     

       497
       497
        
         #./services/misc/gitit.nix

     

       498
       498
        
         ./services/misc/gitlab.nix

+50 -14

nixos/modules/services/continuous-integration/jenkins/job-builder.nix

···

       165
       165
        
                 '';

     

       166
       166
        
               in

     

       167
       167
        
                 ''

     

       168
       168
       +
                   joinByString()

     

       169
       169
       +
                   {

     

       170
       170
       +
                       local separator="$1"

     

       171
       171
       +
                       shift

     

       172
       172
       +
                       local first="$1"

     

       173
       173
       +
                       shift

     

       174
       174
       +
                       printf "%s" "$first" "''${@/#/$separator}"

     

       175
       175
       +
                   }

     

       176
       176
       +
       

     

       177
       177
       +
                   # Map a relative directory path in the output from

     

       178
       178
       +
                   # jenkins-job-builder (jobname) to the layout expected by jenkins:

     

       179
       179
       +
                   # each directory level gets prepended "jobs/".

     

       180
       180
       +
                   getJenkinsJobDir()

     

       181
       181
       +
                   {

     

       182
       182
       +
                       IFS='/' read -ra input_dirs <<< "$1"

     

       183
       183
       +
                       printf "jobs/"

     

       184
       184
       +
                       joinByString "/jobs/" "''${input_dirs[@]}"

     

       185
       185
       +
                   }

     

       186
       186
       +
       

     

       187
       187
       +
                   # The inverse of getJenkinsJobDir (remove the "jobs/" prefixes)

     

       188
       188
       +
                   getJobname()

     

       189
       189
       +
                   {

     

       190
       190
       +
                       IFS='/' read -ra input_dirs <<< "$1"

     

       191
       191
       +
                       local i=0

     

       192
       192
       +
                       local nelem=''${#input_dirs[@]}

     

       193
       193
       +
                       for e in "''${input_dirs[@]}"; do

     

       194
       194
       +
                           if [ $((i % 2)) -eq 1 ]; then

     

       195
       195
       +
                               printf "$e"

     

       196
       196
       +
                               if [ $i -lt $(( nelem - 1 )) ]; then

     

       197
       197
       +
                                   printf "/"

     

       198
       198
       +
                               fi

     

       199
       199
       +
                           fi

     

       200
       200
       +
                           i=$((i + 1))

     

       201
       201
       +
                       done

     

       202
       202
       +
                   }

     

       203
       203
       +
       

     

       168
       204
        
                   rm -rf ${jobBuilderOutputDir}

     

       169
       205
        
                   cur_decl_jobs=/run/jenkins-job-builder/declarative-jobs

     

       170
       206
        
                   rm -f "$cur_decl_jobs"

     
···

       172
       208
        
                   # Create / update jobs

     

       173
       209
        
                   mkdir -p ${jobBuilderOutputDir}

     

       174
       210
        
                   for inputFile in ${yamlJobsFile} ${concatStringsSep " " jsonJobsFiles}; do

     

       175
       175
       -
                       HOME="${jenkinsCfg.home}" "${pkgs.jenkins-job-builder}/bin/jenkins-jobs" --ignore-cache test -o "${jobBuilderOutputDir}" "$inputFile"

     

       211
       211
       +
                       HOME="${jenkinsCfg.home}" "${pkgs.jenkins-job-builder}/bin/jenkins-jobs" --ignore-cache test --config-xml -o "${jobBuilderOutputDir}" "$inputFile"

     

       176
       212
        
                   done

     

       177
       213
        
       

     

       178
       178
       -
                   for file in "${jobBuilderOutputDir}/"*; do

     

       179
       179
       -
                       test -f "$file" || continue

     

       180
       180
       -
                       jobname="$(basename $file)"

     

       181
       181
       -
                       jobdir="${jenkinsCfg.home}/jobs/$jobname"

     

       214
       214
       +
                   find "${jobBuilderOutputDir}" -type f -name config.xml | while read -r f; do echo "$(dirname "$f")"; done | sort | while read -r dir; do

     

       215
       215
       +
                       jobname="$(realpath --relative-to="${jobBuilderOutputDir}" "$dir")"

     

       216
       216
       +
                       jenkinsjobname=$(getJenkinsJobDir "$jobname")

     

       217
       217
       +
                       jenkinsjobdir="${jenkinsCfg.home}/$jenkinsjobname"

     

       182
       218
        
                       echo "Creating / updating job \"$jobname\""

     

       183
       183
       -
                       mkdir -p "$jobdir"

     

       184
       184
       -
                       touch "$jobdir/${ownerStamp}"

     

       185
       185
       -
                       cp "$file" "$jobdir/config.xml"

     

       186
       186
       -
                       echo "$jobname" >> "$cur_decl_jobs"

     

       219
       219
       +
                       mkdir -p "$jenkinsjobdir"

     

       220
       220
       +
                       touch "$jenkinsjobdir/${ownerStamp}"

     

       221
       221
       +
                       cp "$dir"/config.xml "$jenkinsjobdir/config.xml"

     

       222
       222
       +
                       echo "$jenkinsjobname" >> "$cur_decl_jobs"

     

       187
       223
        
                   done

     

       188
       224
        
       

     

       189
       225
        
                   # Remove stale jobs

     

       190
       190
       -
                   for file in "${jenkinsCfg.home}"/jobs/*/${ownerStamp}; do

     

       191
       191
       -
                       test -f "$file" || continue

     

       192
       192
       -
                       jobdir="$(dirname $file)"

     

       193
       193
       -
                       jobname="$(basename "$jobdir")"

     

       194
       194
       -
                       grep --quiet --line-regexp "$jobname" "$cur_decl_jobs" 2>/dev/null && continue

     

       226
       226
       +
                   find "${jenkinsCfg.home}" -type f -name "${ownerStamp}" | while read -r f; do echo "$(dirname "$f")"; done | sort --reverse | while read -r dir; do

     

       227
       227
       +
                       jenkinsjobname="$(realpath --relative-to="${jenkinsCfg.home}" "$dir")"

     

       228
       228
       +
                       grep --quiet --line-regexp "$jenkinsjobname" "$cur_decl_jobs" 2>/dev/null && continue

     

       229
       229
       +
                       jobname=$(getJobname "$jenkinsjobname")

     

       195
       230
        
                       echo "Deleting stale job \"$jobname\""

     

       231
       231
       +
                       jobdir="${jenkinsCfg.home}/$jenkinsjobname"

     

       196
       232
        
                       rm -rf "$jobdir"

     

       197
       233
        
                   done

     

       198
       234
        
                 '' + (if cfg.accessUser != "" then reloadScript else "");

-306

nixos/modules/services/misc/geoip-updater.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         cfg = config.services.geoip-updater;

     

       7
       7
       -
       

     

       8
       8
       -
         dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database";

     

       9
       9
       -
       

     

       10
       10
       -
         randomizedTimerDelaySec = "3600";

     

       11
       11
       -
       

     

       12
       12
       -
         # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the

     

       13
       13
       -
         # journal) doesn't include the long nix store path hash. (Prefixing the

     

       14
       14
       -
         # ExecStart= command with '@' doesn't work because we start a shell (new

     

       15
       15
       -
         # process) that creates a new argv[0].)

     

       16
       16
       -
         geoip-updater = pkgs.writeScriptBin "geoip-updater" ''

     

       17
       17
       -
           #!${pkgs.runtimeShell}

     

       18
       18
       -
           skipExisting=0

     

       19
       19
       -
           debug()

     

       20
       20
       -
           {

     

       21
       21
       -
               echo "<7>$@"

     

       22
       22
       -
           }

     

       23
       23
       -
           info()

     

       24
       24
       -
           {

     

       25
       25
       -
               echo "<6>$@"

     

       26
       26
       -
           }

     

       27
       27
       -
           error()

     

       28
       28
       -
           {

     

       29
       29
       -
               echo "<3>$@"

     

       30
       30
       -
           }

     

       31
       31
       -
           die()

     

       32
       32
       -
           {

     

       33
       33
       -
               error "$@"

     

       34
       34
       -
               exit 1

     

       35
       35
       -
           }

     

       36
       36
       -
           waitNetworkOnline()

     

       37
       37
       -
           {

     

       38
       38
       -
               ret=1

     

       39
       39
       -
               for i in $(seq 6); do

     

       40
       40
       -
                   curl_out=$("${pkgs.curl.bin}/bin/curl" \

     

       41
       41
       -
                       --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1)

     

       42
       42
       -
                   if [ $? -eq 0 ]; then

     

       43
       43
       -
                       debug "Server is reachable (try $i)"

     

       44
       44
       -
                       ret=0

     

       45
       45
       -
                       break

     

       46
       46
       -
                   else

     

       47
       47
       -
                       debug "Server is unreachable (try $i): $curl_out"

     

       48
       48
       -
                       sleep 10

     

       49
       49
       -
                   fi

     

       50
       50
       -
               done

     

       51
       51
       -
               return $ret

     

       52
       52
       -
           }

     

       53
       53
       -
           dbFnameTmp()

     

       54
       54
       -
           {

     

       55
       55
       -
               dburl=$1

     

       56
       56
       -
               echo "${cfg.databaseDir}/.$(basename "$dburl")"

     

       57
       57
       -
           }

     

       58
       58
       -
           dbFnameTmpDecompressed()

     

       59
       59
       -
           {

     

       60
       60
       -
               dburl=$1

     

       61
       61
       -
               echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'

     

       62
       62
       -
           }

     

       63
       63
       -
           dbFname()

     

       64
       64
       -
           {

     

       65
       65
       -
               dburl=$1

     

       66
       66
       -
               echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'

     

       67
       67
       -
           }

     

       68
       68
       -
           downloadDb()

     

       69
       69
       -
           {

     

       70
       70
       -
               dburl=$1

     

       71
       71
       -
               curl_out=$("${pkgs.curl.bin}/bin/curl" \

     

       72
       72
       -
                   --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1)

     

       73
       73
       -
               if [ $? -ne 0 ]; then

     

       74
       74
       -
                   error "Failed to download $dburl: $curl_out"

     

       75
       75
       -
                   return 1

     

       76
       76
       -
               fi

     

       77
       77
       -
           }

     

       78
       78
       -
           decompressDb()

     

       79
       79
       -
           {

     

       80
       80
       -
               fn=$(dbFnameTmp "$1")

     

       81
       81
       -
               ret=0

     

       82
       82
       -
               case "$fn" in

     

       83
       83
       -
                   *.gz)

     

       84
       84
       -
                       cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1)

     

       85
       85
       -
                       ;;

     

       86
       86
       -
                   *.xz)

     

       87
       87
       -
                       cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1)

     

       88
       88
       -
                       ;;

     

       89
       89
       -
                   *)

     

       90
       90
       -
                       cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file")

     

       91
       91
       -
                       false

     

       92
       92
       -
                       ;;

     

       93
       93
       -
               esac

     

       94
       94
       -
               if [ $? -ne 0 ]; then

     

       95
       95
       -
                   error "$cmd_out"

     

       96
       96
       -
                   ret=1

     

       97
       97
       -
               fi

     

       98
       98
       -
           }

     

       99
       99
       -
           atomicRename()

     

       100
       100
       -
           {

     

       101
       101
       -
               dburl=$1

     

       102
       102
       -
               mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")"

     

       103
       103
       -
           }

     

       104
       104
       -
           removeIfNotInConfig()

     

       105
       105
       -
           {

     

       106
       106
       -
               # Arg 1 is the full path of an installed DB.

     

       107
       107
       -
               # If the corresponding database is not specified in the NixOS config we

     

       108
       108
       -
               # remove it.

     

       109
       109
       -
               db=$1

     

       110
       110
       -
               for cdb in ${lib.concatStringsSep " " cfg.databases}; do

     

       111
       111
       -
                   confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//')

     

       112
       112
       -
                   if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then

     

       113
       113
       -
                       return 0

     

       114
       114
       -
                   fi

     

       115
       115
       -
               done

     

       116
       116
       -
               rm "$db"

     

       117
       117
       -
               if [ $? -eq 0 ]; then

     

       118
       118
       -
                   debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)"

     

       119
       119
       -
               else

     

       120
       120
       -
                   error "Failed to remove $db"

     

       121
       121
       -
               fi

     

       122
       122
       -
           }

     

       123
       123
       -
           removeUnspecifiedDbs()

     

       124
       124
       -
           {

     

       125
       125
       -
               for f in "${cfg.databaseDir}/"*; do

     

       126
       126
       -
                   test -f "$f" || continue

     

       127
       127
       -
                   case "$f" in

     

       128
       128
       -
                       *.dat|*.mmdb|*.csv)

     

       129
       129
       -
                           removeIfNotInConfig "$f"

     

       130
       130
       -
                           ;;

     

       131
       131
       -
                       *)

     

       132
       132
       -
                           debug "Not removing \"$f\" (unknown file extension)"

     

       133
       133
       -
                           ;;

     

       134
       134
       -
                   esac

     

       135
       135
       -
               done

     

       136
       136
       -
           }

     

       137
       137
       -
           downloadAndInstall()

     

       138
       138
       -
           {

     

       139
       139
       -
               dburl=$1

     

       140
       140
       -
               if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then

     

       141
       141
       -
                   debug "Skipping existing file: $(dbFname "$dburl")"

     

       142
       142
       -
                   return 0

     

       143
       143
       -
               fi

     

       144
       144
       -
               downloadDb "$dburl" || return 1

     

       145
       145
       -
               decompressDb "$dburl" || return 1

     

       146
       146
       -
               atomicRename "$dburl" || return 1

     

       147
       147
       -
               info "Updated $(basename "$(dbFname "$dburl")")"

     

       148
       148
       -
           }

     

       149
       149
       -
           for arg in "$@"; do

     

       150
       150
       -
               case "$arg" in

     

       151
       151
       -
                   --skip-existing)

     

       152
       152
       -
                       skipExisting=1

     

       153
       153
       -
                       info "Option --skip-existing is set: not updating existing databases"

     

       154
       154
       -
                       ;;

     

       155
       155
       -
                   *)

     

       156
       156
       -
                       error "Unknown argument: $arg";;

     

       157
       157
       -
               esac

     

       158
       158
       -
           done

     

       159
       159
       -
           waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)"

     

       160
       160
       -
           test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist"

     

       161
       161
       -
           debug "Starting update of GeoIP databases in ${cfg.databaseDir}"

     

       162
       162
       -
           all_ret=0

     

       163
       163
       -
           for db in ${lib.concatStringsSep " \\\n        " cfg.databases}; do

     

       164
       164
       -
               downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1

     

       165
       165
       -
           done

     

       166
       166
       -
           removeUnspecifiedDbs || all_ret=1

     

       167
       167
       -
           if [ $all_ret -eq 0 ]; then

     

       168
       168
       -
               info "Completed GeoIP database update in ${cfg.databaseDir}"

     

       169
       169
       -
           else

     

       170
       170
       -
               error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)"

     

       171
       171
       -
           fi

     

       172
       172
       -
           # Hack to work around systemd journal race:

     

       173
       173
       -
           # https://github.com/systemd/systemd/issues/2913

     

       174
       174
       -
           sleep 2

     

       175
       175
       -
           exit $all_ret

     

       176
       176
       -
         '';

     

       177
       177
       -
       

     

       178
       178
       -
       in

     

       179
       179
       -
       

     

       180
       180
       -
       {

     

       181
       181
       -
         options = {

     

       182
       182
       -
           services.geoip-updater = {

     

       183
       183
       -
             enable = mkOption {

     

       184
       184
       -
               default = false;

     

       185
       185
       -
               type = types.bool;

     

       186
       186
       -
               description = ''

     

       187
       187
       -
                 Whether to enable periodic downloading of GeoIP databases from

     

       188
       188
       -
                 maxmind.com. You might want to enable this if you, for instance, use

     

       189
       189
       -
                 ntopng or Wireshark.

     

       190
       190
       -
               '';

     

       191
       191
       -
             };

     

       192
       192
       -
       

     

       193
       193
       -
             interval = mkOption {

     

       194
       194
       -
               type = types.str;

     

       195
       195
       -
               default = "weekly";

     

       196
       196
       -
               description = ''

     

       197
       197
       -
                 Update the GeoIP databases at this time / interval.

     

       198
       198
       -
                 The format is described in

     

       199
       199
       -
                 <citerefentry><refentrytitle>systemd.time</refentrytitle>

     

       200
       200
       -
                 <manvolnum>7</manvolnum></citerefentry>.

     

       201
       201
       -
                 To prevent load spikes on maxmind.com, the timer interval is

     

       202
       202
       -
                 randomized by an additional delay of ${randomizedTimerDelaySec}

     

       203
       203
       -
                 seconds. Setting a shorter interval than this is not recommended.

     

       204
       204
       -
               '';

     

       205
       205
       -
             };

     

       206
       206
       -
       

     

       207
       207
       -
             databaseDir = mkOption {

     

       208
       208
       -
               type = types.path;

     

       209
       209
       -
               default = "/var/lib/geoip-databases";

     

       210
       210
       -
               description = ''

     

       211
       211
       -
                 Directory that will contain GeoIP databases.

     

       212
       212
       -
               '';

     

       213
       213
       -
             };

     

       214
       214
       -
       

     

       215
       215
       -
             databases = mkOption {

     

       216
       216
       -
               type = types.listOf types.str;

     

       217
       217
       -
               default = [

     

       218
       218
       -
                 "GeoLiteCountry/GeoIP.dat.gz"

     

       219
       219
       -
                 "GeoIPv6.dat.gz"

     

       220
       220
       -
                 "GeoLiteCity.dat.xz"

     

       221
       221
       -
                 "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"

     

       222
       222
       -
                 "asnum/GeoIPASNum.dat.gz"

     

       223
       223
       -
                 "asnum/GeoIPASNumv6.dat.gz"

     

       224
       224
       -
                 "GeoLite2-Country.mmdb.gz"

     

       225
       225
       -
                 "GeoLite2-City.mmdb.gz"

     

       226
       226
       -
               ];

     

       227
       227
       -
               description = ''

     

       228
       228
       -
                 Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ +

     

       229
       229
       -
                 <literal>the_database</literal>.

     

       230
       230
       -
               '';

     

       231
       231
       -
             };

     

       232
       232
       -
       

     

       233
       233
       -
           };

     

       234
       234
       -
       

     

       235
       235
       -
         };

     

       236
       236
       -
       

     

       237
       237
       -
         config = mkIf cfg.enable {

     

       238
       238
       -
       

     

       239
       239
       -
           assertions = [

     

       240
       240
       -
             { assertion = (builtins.filter

     

       241
       241
       -
                 (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases) == [];

     

       242
       242
       -
               message = ''

     

       243
       243
       -
                 services.geoip-updater.databases supports only .gz and .xz databases.

     

       244
       244
       -
       

     

       245
       245
       -
                 Current value:

     

       246
       246
       -
                 ${toString cfg.databases}

     

       247
       247
       -
       

     

       248
       248
       -
                 Offending element(s):

     

       249
       249
       -
                 ${toString (builtins.filter (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases)};

     

       250
       250
       -
               '';

     

       251
       251
       -
             }

     

       252
       252
       -
           ];

     

       253
       253
       -
       

     

       254
       254
       -
           users.users.geoip = {

     

       255
       255
       -
             group = "root";

     

       256
       256
       -
             description = "GeoIP database updater";

     

       257
       257
       -
             uid = config.ids.uids.geoip;

     

       258
       258
       -
           };

     

       259
       259
       -
       

     

       260
       260
       -
           systemd.timers.geoip-updater =

     

       261
       261
       -
             { description = "GeoIP Updater Timer";

     

       262
       262
       -
               partOf = [ "geoip-updater.service" ];

     

       263
       263
       -
               wantedBy = [ "timers.target" ];

     

       264
       264
       -
               timerConfig.OnCalendar = cfg.interval;

     

       265
       265
       -
               timerConfig.Persistent = "true";

     

       266
       266
       -
               timerConfig.RandomizedDelaySec = randomizedTimerDelaySec;

     

       267
       267
       -
             };

     

       268
       268
       -
       

     

       269
       269
       -
           systemd.services.geoip-updater = {

     

       270
       270
       -
             description = "GeoIP Updater";

     

       271
       271
       -
             after = [ "network-online.target" "nss-lookup.target" ];

     

       272
       272
       -
             wants = [ "network-online.target" ];

     

       273
       273
       -
             preStart = ''

     

       274
       274
       -
               mkdir -p "${cfg.databaseDir}"

     

       275
       275
       -
               chmod 755 "${cfg.databaseDir}"

     

       276
       276
       -
               chown geoip:root "${cfg.databaseDir}"

     

       277
       277
       -
             '';

     

       278
       278
       -
             serviceConfig = {

     

       279
       279
       -
               ExecStart = "${geoip-updater}/bin/geoip-updater";

     

       280
       280
       -
               User = "geoip";

     

       281
       281
       -
               PermissionsStartOnly = true;

     

       282
       282
       -
             };

     

       283
       283
       -
           };

     

       284
       284
       -
       

     

       285
       285
       -
           systemd.services.geoip-updater-setup = {

     

       286
       286
       -
             description = "GeoIP Updater Setup";

     

       287
       287
       -
             after = [ "network-online.target" "nss-lookup.target" ];

     

       288
       288
       -
             wants = [ "network-online.target" ];

     

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

     

       290
       290
       -
             conflicts = [ "geoip-updater.service" ];

     

       291
       291
       -
             preStart = ''

     

       292
       292
       -
               mkdir -p "${cfg.databaseDir}"

     

       293
       293
       -
               chmod 755 "${cfg.databaseDir}"

     

       294
       294
       -
               chown geoip:root "${cfg.databaseDir}"

     

       295
       295
       -
             '';

     

       296
       296
       -
             serviceConfig = {

     

       297
       297
       -
               ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";

     

       298
       298
       -
               User = "geoip";

     

       299
       299
       -
               PermissionsStartOnly = true;

     

       300
       300
       -
               # So it won't be (needlessly) restarted:

     

       301
       301
       -
               RemainAfterExit = true;

     

       302
       302
       -
             };

     

       303
       303
       -
           };

     

       304
       304
       -
       

     

       305
       305
       -
         };

     

       306
       306
       -
       }

+145

nixos/modules/services/misc/geoipupdate.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.geoipupdate;

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         imports = [

     

       8
       8
       +
           (lib.mkRemovedOptionModule [ "services" "geoip-updater" ] "services.geoip-updater has been removed, use services.geoipupdate instead.")

     

       9
       9
       +
         ];

     

       10
       10
       +
       

     

       11
       11
       +
         options = {

     

       12
       12
       +
           services.geoipupdate = {

     

       13
       13
       +
             enable = lib.mkEnableOption ''

     

       14
       14
       +
               periodic downloading of GeoIP databases using

     

       15
       15
       +
               <productname>geoipupdate</productname>.

     

       16
       16
       +
             '';

     

       17
       17
       +
       

     

       18
       18
       +
             interval = lib.mkOption {

     

       19
       19
       +
               type = lib.types.str;

     

       20
       20
       +
               default = "weekly";

     

       21
       21
       +
               description = ''

     

       22
       22
       +
                 Update the GeoIP databases at this time / interval.

     

       23
       23
       +
                 The format is described in

     

       24
       24
       +
                 <citerefentry><refentrytitle>systemd.time</refentrytitle>

     

       25
       25
       +
                 <manvolnum>7</manvolnum></citerefentry>.

     

       26
       26
       +
               '';

     

       27
       27
       +
             };

     

       28
       28
       +
       

     

       29
       29
       +
             settings = lib.mkOption {

     

       30
       30
       +
               description = ''

     

       31
       31
       +
                 <productname>geoipupdate</productname> configuration

     

       32
       32
       +
                 options. See

     

       33
       33
       +
                 <link xlink:href="https://github.com/maxmind/geoipupdate/blob/main/doc/GeoIP.conf.md" />

     

       34
       34
       +
                 for a full list of available options.

     

       35
       35
       +
               '';

     

       36
       36
       +
               type = lib.types.submodule {

     

       37
       37
       +
                 freeformType =

     

       38
       38
       +
                   with lib.types;

     

       39
       39
       +
                   let

     

       40
       40
       +
                     type = oneOf [str int bool];

     

       41
       41
       +
                   in

     

       42
       42
       +
                     attrsOf (either type (listOf type));

     

       43
       43
       +
       

     

       44
       44
       +
                 options = {

     

       45
       45
       +
       

     

       46
       46
       +
                   AccountID = lib.mkOption {

     

       47
       47
       +
                     type = lib.types.int;

     

       48
       48
       +
                     description = ''

     

       49
       49
       +
                       Your MaxMind account ID.

     

       50
       50
       +
                     '';

     

       51
       51
       +
                   };

     

       52
       52
       +
       

     

       53
       53
       +
                   EditionIDs = lib.mkOption {

     

       54
       54
       +
                     type = with lib.types; listOf (either str int);

     

       55
       55
       +
                     example = [

     

       56
       56
       +
                       "GeoLite2-ASN"

     

       57
       57
       +
                       "GeoLite2-City"

     

       58
       58
       +
                       "GeoLite2-Country"

     

       59
       59
       +
                     ];

     

       60
       60
       +
                     description = ''

     

       61
       61
       +
                       List of database edition IDs. This includes new string

     

       62
       62
       +
                       IDs like <literal>GeoIP2-City</literal> and old

     

       63
       63
       +
                       numeric IDs like <literal>106</literal>.

     

       64
       64
       +
                     '';

     

       65
       65
       +
                   };

     

       66
       66
       +
       

     

       67
       67
       +
                   LicenseKey = lib.mkOption {

     

       68
       68
       +
                     type = lib.types.path;

     

       69
       69
       +
                     description = ''

     

       70
       70
       +
                       A file containing the <productname>MaxMind</productname>

     

       71
       71
       +
                       license key.

     

       72
       72
       +
                     '';

     

       73
       73
       +
                   };

     

       74
       74
       +
       

     

       75
       75
       +
                   DatabaseDirectory = lib.mkOption {

     

       76
       76
       +
                     type = lib.types.path;

     

       77
       77
       +
                     default = "/var/lib/GeoIP";

     

       78
       78
       +
                     example = "/run/GeoIP";

     

       79
       79
       +
                     description = ''

     

       80
       80
       +
                       The directory to store the database files in. The

     

       81
       81
       +
                       directory will be automatically created, the owner

     

       82
       82
       +
                       changed to <literal>geoip</literal> and permissions

     

       83
       83
       +
                       set to world readable. This applies if the directory

     

       84
       84
       +
                       already exists as well, so don't use a directory with

     

       85
       85
       +
                       sensitive contents.

     

       86
       86
       +
                     '';

     

       87
       87
       +
                   };

     

       88
       88
       +
       

     

       89
       89
       +
                 };

     

       90
       90
       +
               };

     

       91
       91
       +
             };

     

       92
       92
       +
           };

     

       93
       93
       +
       

     

       94
       94
       +
         };

     

       95
       95
       +
       

     

       96
       96
       +
         config = lib.mkIf cfg.enable {

     

       97
       97
       +
       

     

       98
       98
       +
           services.geoipupdate.settings = {

     

       99
       99
       +
             LockFile = "/run/geoipupdate/.lock";

     

       100
       100
       +
           };

     

       101
       101
       +
       

     

       102
       102
       +
           systemd.services.geoipupdate = {

     

       103
       103
       +
             description = "GeoIP Updater";

     

       104
       104
       +
             after = [ "network-online.target" "nss-lookup.target" ];

     

       105
       105
       +
             wants = [ "network-online.target" ];

     

       106
       106
       +
             startAt = cfg.interval;

     

       107
       107
       +
             serviceConfig = {

     

       108
       108
       +
               ExecStartPre =

     

       109
       109
       +
                 let

     

       110
       110
       +
                   geoipupdateKeyValue = lib.generators.toKeyValue {

     

       111
       111
       +
                     mkKeyValue = lib.flip lib.generators.mkKeyValueDefault " " rec {

     

       112
       112
       +
                       mkValueString = v: with builtins;

     

       113
       113
       +
                         if isInt           v then toString v

     

       114
       114
       +
                         else if isString   v then v

     

       115
       115
       +
                         else if true  ==   v then "1"

     

       116
       116
       +
                         else if false ==   v then "0"

     

       117
       117
       +
                         else if isList     v then lib.concatMapStringsSep " " mkValueString v

     

       118
       118
       +
                         else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}";

     

       119
       119
       +
                     };

     

       120
       120
       +
                   };

     

       121
       121
       +
       

     

       122
       122
       +
                   geoipupdateConf = pkgs.writeText "discourse.conf" (geoipupdateKeyValue cfg.settings);

     

       123
       123
       +
       

     

       124
       124
       +
                   script = ''

     

       125
       125
       +
                     mkdir -p "${cfg.settings.DatabaseDirectory}"

     

       126
       126
       +
                     chmod 755 "${cfg.settings.DatabaseDirectory}"

     

       127
       127
       +
                     chown geoip "${cfg.settings.DatabaseDirectory}"

     

       128
       128
       +
       

     

       129
       129
       +
                     cp ${geoipupdateConf} /run/geoipupdate/GeoIP.conf

     

       130
       130
       +
                     ${pkgs.replace-secret}/bin/replace-secret '${cfg.settings.LicenseKey}' \

     

       131
       131
       +
                                                               '${cfg.settings.LicenseKey}' \

     

       132
       132
       +
                                                               /run/geoipupdate/GeoIP.conf

     

       133
       133
       +
                   '';

     

       134
       134
       +
                 in

     

       135
       135
       +
                   "+${pkgs.writeShellScript "start-pre-full-privileges" script}";

     

       136
       136
       +
               ExecStart = "${pkgs.geoipupdate}/bin/geoipupdate -f /run/geoipupdate/GeoIP.conf";

     

       137
       137
       +
               User = "geoip";

     

       138
       138
       +
               DynamicUser = true;

     

       139
       139
       +
               ReadWritePaths = cfg.settings.DatabaseDirectory;

     

       140
       140
       +
               RuntimeDirectory = "geoipupdate";

     

       141
       141
       +
               RuntimeDirectoryMode = 0700;

     

       142
       142
       +
             };

     

       143
       143
       +
           };

     

       144
       144
       +
         };

     

       145
       145
       +
       }

nixos/release-combined.nix

···

       147
       147
        
               (onFullSupported "nixos.tests.sddm.default")

     

       148
       148
        
               (onFullSupported "nixos.tests.shadow")

     

       149
       149
        
               (onFullSupported "nixos.tests.simple")

     

       150
       150
       +
               (onFullSupported "nixos.tests.sway")

     

       150
       151
        
               (onFullSupported "nixos.tests.switchTest")

     

       151
       152
        
               (onFullSupported "nixos.tests.udisks2")

     

       152
       153
        
               (onFullSupported "nixos.tests.xfce")

+1 -1

nixos/tests/make-test-python.nix

···

       1
       1
        
       f: {

     

       2
       2
        
         system ? builtins.currentSystem,

     

       3
       3
       -
         pkgs ? import ../.. { inherit system; config = {}; },

     

       3
       3
       +
         pkgs ? import ../.. { inherit system; },

     

       4
       4
        
         ...

     

       5
       5
        
       } @ args:

     

       6
       6

+2 -2

nixos/tests/snapcast.nix

···

       72
       72
        
               )

     

       73
       73
        
       

     

       74
       74
        
           with subtest("test a connection"):

     

       75
       75
       -
               client.execute("systemd-run snapclient -h server -p ${toString port}")

     

       75
       75
       +
               client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")

     

       76
       76
        
               server.wait_until_succeeds(

     

       77
       77
        
                   "journalctl -o cat -u snapserver.service | grep -q 'Hello from'"

     

       78
       78
        
               )

     

       79
       79
       -
               client.wait_until_succeeds("journalctl -o cat -u run-\* | grep -q ${toString bufferSize}")

     

       79
       79
       +
               client.wait_until_succeeds("journalctl -o cat -u snapcast-client | grep -q 'buffer: ${toString bufferSize}'")

     

       80
       80
        
         '';

     

       81
       81
        
       })

+2 -2

pkgs/applications/audio/renoise/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "renoise";

     

       17
       17
       -
         version = "3.3.1";

     

       17
       17
       +
         version = "3.3.2";

     

       18
       18
        
       

     

       19
       19
        
         src =

     

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

     
···

       24
       24
        
                     "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"

     

       25
       25
        
                     "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"

     

       26
       26
        
                 ];

     

       27
       27
       -
                 sha256 = "05baicks5dx278z2dx6h5n2vabsn64niwqssgys36xy469l9m1h0";

     

       27
       27
       +
                 sha256 = "0d9pnrvs93d4bwbfqxwyr3lg3k6gnzmp81m95gglzwdzczxkw38k";

     

       28
       28
        
               }

     

       29
       29
        
               else

     

       30
       30
        
                 releasePath

+5 -4

pkgs/applications/audio/snapcast/default.nix

···

       1
       1
        
       { stdenv, lib, fetchFromGitHub, cmake, pkg-config

     

       2
       2
       -
       , alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr

     

       2
       2
       +
       , alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr

     

       3
       3
        
       , nixosTests }:

     

       4
       4
        
       

     

       5
       5
        
       let

     
···

       34
       34
        
       

     

       35
       35
        
       stdenv.mkDerivation rec {

     

       36
       36
        
         pname = "snapcast";

     

       37
       37
       -
         version = "0.24.0";

     

       37
       37
       +
         version = "0.25.0";

     

       38
       38
        
       

     

       39
       39
        
         src = fetchFromGitHub {

     

       40
       40
        
           owner  = "badaix";

     

       41
       41
        
           repo   = "snapcast";

     

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

     

       43
       43
       -
           sha256 = "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g";

     

       43
       43
       +
           sha256 = "064pcpr5dsv9hncqkrnxriva4xjv1vcxhvc69h1an8x8vn4dwgmf";

     

       44
       44
        
         };

     

       45
       45
        
       

     

       46
       46
       -
         nativeBuildInputs = [ cmake pkg-config boost170.dev ];

     

       46
       46
       +
         nativeBuildInputs = [ cmake pkg-config ];

     

       47
       47
        
         # snapcast also supports building against tremor but as we have libogg, that's

     

       48
       48
        
         # not needed

     

       49
       49
        
         buildInputs = [

     

       50
       50
       +
           boost17x

     

       50
       51
        
           alsaLib asio avahi flac libogg libvorbis

     

       51
       52
        
           aixlog popl soxr

     

       52
       53
        
         ];

+13 -2

pkgs/applications/audio/vocal/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       3
       5
        
       , nix-update-script

     

       4
       6
        
       , cmake

     

       5
       7
        
       , ninja

     
···

       61
       63
        
           glib-networking

     

       62
       64
        
         ];

     

       63
       65
        
       

     

       66
       66
       +
         patches = [

     

       67
       67
       +
           # granite 6.0.0 removed about dialogs

     

       68
       68
       +
           # see: https://github.com/needle-and-thread/vocal/issues/483

     

       69
       69
       +
           (fetchpatch {

     

       70
       70
       +
             name = "remove-about.patch";

     

       71
       71
       +
             url = "https://raw.githubusercontent.com/archlinux/svntogit-community/03543ffdb6cd52ce1a8293f3303225b3afac2431/trunk/remove-about.patch";

     

       72
       72
       +
             sha256 = "sha256-yGD7BYOTmqs4h+Odh/mB3fI1HM7GDO6F+QaHpRUD5p4=";

     

       73
       73
       +
           })

     

       74
       74
       +
         ];

     

       75
       75
       +
       

     

       64
       76
        
         passthru = {

     

       65
       77
        
           updateScript = nix-update-script {

     

       66
       78
        
             attrPath = pname;

     

       67
       79
        
           };

     

       68
       80
        
         };

     

       69
       69
       -
       

     

       70
       81
        
       

     

       71
       82
        
         meta = with lib; {

     

       72
       83
        
           description = "The podcast client for the modern free desktop";

+1 -1

pkgs/applications/audio/whipper/default.nix

···

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = with python3.pkgs; [

     

       26
       26
       -
           setuptools_scm

     

       26
       26
       +
           setuptools-scm

     

       27
       27
        
           docutils

     

       28
       28
        
         ];

     

       29
       29

+1 -1

pkgs/applications/blockchains/chia/default.nix

···

       20
       20
        
           python3Packages.setuptools-scm

     

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
       -
         # give a hint to setuptools_scm on package version

     

       23
       23
       +
         # give a hint to setuptools-scm on package version

     

       24
       24
        
         SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = with python3Packages; [

+2 -2

pkgs/applications/editors/cudatext/default.nix

···

       38
       38
        
       in

     

       39
       39
        
       stdenv.mkDerivation rec {

     

       40
       40
        
         pname = "cudatext";

     

       41
       41
       -
         version = "1.131.0";

     

       41
       41
       +
         version = "1.133.5";

     

       42
       42
        
       

     

       43
       43
        
         src = fetchFromGitHub {

     

       44
       44
        
           owner = "Alexey-T";

     

       45
       45
        
           repo = "CudaText";

     

       46
       46
        
           rev = version;

     

       47
       47
       -
           sha256 = "1zq17yi5zn4hdgrrn3c3cdk6s38fv36r66dl0dqz2z8jjd6vy4p3";

     

       47
       47
       +
           sha256 = "sha256-0QWYitlOS3x7BQpFTYDAjIgkw83IkRFfA/slyEvQUnw=";

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
        
         postPatch = ''

+12 -12

pkgs/applications/editors/cudatext/deps.json

···

       11
       11
        
         },

     

       12
       12
        
         "ATFlatControls": {

     

       13
       13
        
           "owner": "Alexey-T",

     

       14
       14
       -
           "rev": "2021.04.01",

     

       15
       15
       -
           "sha256": "12sncivsv6pvwflzzy12rpn1fjiq64n2n3bcj7630xxlrbygkhxb"

     

       14
       14
       +
           "rev": "2021.05.16",

     

       15
       15
       +
           "sha256": "sha256-oQW0M8Sx1bC+keOWivXwlD5SDKJuO5Sk/3HiO9HvJtY="

     

       16
       16
        
         },

     

       17
       17
        
         "ATSynEdit": {

     

       18
       18
        
           "owner": "Alexey-T",

     

       19
       19
       -
           "rev": "2021.04.09",

     

       20
       20
       -
           "sha256": "1ldr2z88zywn0ccgs17vfhq55ibihjcmfjjxcqsjifrbm0y6wipp"

     

       19
       19
       +
           "rev": "2021.05.31",

     

       20
       20
       +
           "sha256": "sha256-4B6/I0CH9gfslwUbCTTI4kycgTHUjLGtVrCctfO6gRo="

     

       21
       21
        
         },

     

       22
       22
        
         "ATSynEdit_Cmp": {

     

       23
       23
        
           "owner": "Alexey-T",

     

       24
       24
       -
           "rev": "2021.04.01",

     

       25
       25
       -
           "sha256": "1g6zp9d7vwjisad3y1mfnk1jcbjqxp3yimm0sh1655al6qwn886m"

     

       24
       24
       +
           "rev": "2021.05.03",

     

       25
       25
       +
           "sha256": "sha256-zns83XA2SslHRGqa3iro0phIBlz5/neJ34TTYAKhX5Q="

     

       26
       26
        
         },

     

       27
       27
        
         "EControl": {

     

       28
       28
        
           "owner": "Alexey-T",

     

       29
       29
       -
           "rev": "2021.03.16",

     

       30
       30
       -
           "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8"

     

       29
       29
       +
           "rev": "2021.05.27",

     

       30
       30
       +
           "sha256": "sha256-D0UBK69V28Izs9FgevtvX6vyDU7KpfIGJqcqpWaxU9E="

     

       31
       31
        
         },

     

       32
       32
        
         "ATSynEdit_Ex": {

     

       33
       33
        
           "owner": "Alexey-T",

     

       34
       34
       -
           "rev": "2021.04.01",

     

       35
       35
       -
           "sha256": "1hq9hbv81mcymjcms97wcwcfqfpxis6h6v5m0syyih4r53khv0az"

     

       34
       34
       +
           "rev": "2021.05.27",

     

       35
       35
       +
           "sha256": "sha256-1zhSB6bgeW5G6RAZvhznNTpRk0uEDZnLXsk+cgElKLw="

     

       36
       36
        
         },

     

       37
       37
        
         "Python-for-Lazarus": {

     

       38
       38
        
           "owner": "Alexey-T",

     

       39
       39
       -
           "rev": "2021.02.18",

     

       40
       40
       -
           "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5"

     

       39
       39
       +
           "rev": "2021.04.16",

     

       40
       40
       +
           "sha256": "sha256-HN3Lr3uDCyNk+8+J09ivyC0LZxQ6x6SaUH4swZJBFkM="

     

       41
       41
        
         },

     

       42
       42
        
         "Emmet-Pascal": {

     

       43
       43
        
           "owner": "Alexey-T",

+26 -43

pkgs/applications/editors/nvi/default.nix

···

       1
       1
       -
       { fetchurl, lib, stdenv, ncurses }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, fetchpatch, ncurses, db }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "nvi-1.79";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "nvi";

     

       5
       5
       +
         version = "1.81.6";

     

       5
       6
        
       

     

       6
       7
        
         src = fetchurl {

     

       7
       7
       -
           urls =

     

       8
       8
       -
             [ "ftp://ftp.eenet.ee/pub/cpan/src/misc/nvi-1.79.tar.gz"

     

       9
       9
       -
               "ftp://ftp.saintjoe.edu/pub/CPAN/src/misc/nvi-1.79.tar.gz"

     

       10
       10
       -
               "ftp://ftp.free.fr/.mirrors1/ftp.netbsd.org/packages/distfiles/nvi-1.79.tar.gz"

     

       11
       11
       -
             ];

     

       12
       12
       -
           sha256 = "0cvf56rbylz7ksny6g2256sjg8yrsxrmbpk82r64rhi53sm8fnvm";

     

       8
       8
       +
           url = "https://deb.debian.org/debian/pool/main/n/nvi/nvi_${version}.orig.tar.gz";

     

       9
       9
       +
           sha256 = "13cp9iz017bk6ryi05jn7drbv7a5dyr201zqd3r4r8srj644ihwb";

     

       13
       10
        
         };

     

       14
       11
        
       

     

       15
       15
       -
         buildInputs = [ ncurses ];

     

       12
       12
       +
         patches = [

     

       13
       13
       +
           # Fix runtime error with modern versions of db.

     

       14
       14
       +
           (fetchpatch {

     

       15
       15
       +
             url = "https://src.fedoraproject.org/rpms/nvi/raw/f33/f/nvi-03-db4.patch";

     

       16
       16
       +
             sha256 = "1vpnly3dcldwl8gwl0jrh5yh0vhgbdhsh6xn7lnwhrawlvk6d55y";

     

       17
       17
       +
           })

     

       16
       18
        
       

     

       17
       17
       -
         # nvi tries to write to a usual tmp directory (/var/tmp),

     

       18
       18
       -
         # so we will force it to use /tmp.

     

       19
       19
       -
         patchPhase = ''

     

       20
       20
       -
           sed -i build/configure \

     

       21
       21
       -
             -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \

     

       22
       22
       -
             -e s@/var/tmp@@ \

     

       23
       23
       -
             -e s@-lcurses@-lncurses@

     

       24
       24
       -
         '';

     

       19
       19
       +
           # Fix build with Glibc.

     

       20
       20
       +
           (fetchpatch {

     

       21
       21
       +
             url = "https://src.fedoraproject.org/rpms/nvi/raw/f33/f/nvi-20-glibc_has_grantpt.patch";

     

       22
       22
       +
             sha256 = "1ypqj263wh53m5rgiag5c4gy1rksj2waginny1lcj34n72p2dsml";

     

       23
       23
       +
           })

     

       24
       24
       +
         ];

     

       25
       25
        
       

     

       26
       26
       -
         configurePhase = ''

     

       27
       27
       -
           mkdir mybuild

     

       28
       28
       -
           cd mybuild

     

       29
       29
       -
           ../build/configure --prefix=$out --disable-curses

     

       30
       30
       -
         '';

     

       31
       31
       -
       

     

       32
       32
       -
         installPhase = ''

     

       33
       33
       -
           mkdir -p $out/bin $out/share/vi/catalog

     

       34
       34
       -
           for a in dutch english french german ru_SU.KOI8-R spanish swedish; do

     

       35
       35
       -
             cp ../catalog/$a $out/share/vi/catalog

     

       36
       36
       -
           done

     

       37
       37
       -
           cp nvi $out/bin/nvi

     

       38
       38
       -
           ln -s $out/bin/nvi $out/bin/vi

     

       39
       39
       -
           ln -s $out/bin/nvi $out/bin/ex

     

       40
       40
       -
           ln -s $out/bin/nvi $out/bin/view

     

       26
       26
       +
         buildInputs = [ ncurses db ];

     

       41
       27
        
       

     

       42
       42
       -
           mkdir -p $out/share/man/man1

     

       43
       43
       -
           cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1

     

       44
       44
       -
           ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi

     

       45
       45
       -
           ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex

     

       46
       46
       -
           ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/view

     

       47
       47
       -
           ln -s $out/bin/{,vi-}nvi # create a symlink so that all vi(m) users will find it

     

       28
       28
       +
         preConfigure = ''

     

       29
       29
       +
           cd build.unix

     

       48
       30
        
         '';

     

       31
       31
       +
         configureScript = "../dist/configure";

     

       32
       32
       +
         configureFlags = [ "vi_cv_path_preserve=/tmp" ];

     

       49
       33
        
       

     

       50
       50
       -
         meta = {

     

       51
       51
       -
           homepage = "http://www.bostic.com/vi/";

     

       34
       34
       +
         meta = with lib; {

     

       52
       35
        
           description = "The Berkeley Vi Editor";

     

       53
       53
       -
           license = lib.licenses.free;

     

       54
       54
       -
           broken = true; # since 2020-02-08

     

       36
       36
       +
           license = licenses.free;

     

       37
       37
       +
           platforms = platforms.unix;

     

       55
       38
        
         };

     

       56
       39
        
       }

+4 -3

pkgs/applications/graphics/hydrus/default.nix

···

       3
       3
        
       , xz

     

       4
       4
        
       , wrapQtAppsHook

     

       5
       5
        
       , miniupnpc_2

     

       6
       6
       +
       , enableSwftools ? false

     

       6
       7
        
       , swftools

     

       7
       8
        
       , pythonPackages

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       10
       11
        
       pythonPackages.buildPythonPackage rec {

     

       11
       12
        
         pname = "hydrus";

     

       12
       12
       -
         version = "438";

     

       13
       13
       +
         version = "441";

     

       13
       14
        
         format = "other";

     

       14
       15
        
       

     

       15
       16
        
         src = fetchFromGitHub {

     

       16
       17
        
           owner = "hydrusnetwork";

     

       17
       18
        
           repo = "hydrus";

     

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

     

       19
       19
       -
           sha256 = "sha256-iBJkbVUlsjt26SbDe92eIrWKQwWBhkjjeLM14Pm/obc=";

     

       20
       20
       +
           sha256 = "13h4qcz0iqba4mwyvgmdqh99jy22x7kw20f3g43b5aq3qyk9ca2h";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         nativeBuildInputs = [

     
···

       79
       80
        
         postPatch = ''

     

       80
       81
        
           sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \

     

       81
       82
        
             -i ./hydrus/core/networking/HydrusNATPunch.py

     

       82
       82
       -
       

     

       83
       83
       +
         '' + lib.optionalString enableSwftools ''

     

       83
       84
        
           sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \

     

       84
       85
        
             -i ./hydrus/core/HydrusFlashHandling.py

     

       85
       86
        
         '';

pkgs/applications/graphics/openimageio/2.x.nix

···

       2
       2
        
       , fetchFromGitHub

     

       3
       3
        
       , boost

     

       4
       4
        
       , cmake

     

       5
       5
       +
       , giflib

     

       5
       6
        
       , ilmbase

     

       6
       7
        
       , libjpeg

     

       7
       8
        
       , libpng

     
···

       33
       34
        
       

     

       34
       35
        
         buildInputs = [

     

       35
       36
        
           boost

     

       37
       37
       +
           giflib

     

       36
       38
        
           ilmbase

     

       37
       39
        
           libjpeg

     

       38
       40
        
           libpng

+3 -3

pkgs/applications/misc/josm/default.nix

···

       3
       3
        
       }:

     

       4
       4
        
       let

     

       5
       5
        
         pname = "josm";

     

       6
       6
       -
         version = "17833";

     

       6
       6
       +
         version = "17919";

     

       7
       7
        
         srcs = {

     

       8
       8
        
           jar = fetchurl {

     

       9
       9
        
             url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";

     

       10
       10
       -
             sha256 = "sha256-i3seRVfCLXNvUkWAAPZK0XloRHuXWCNp1tqnVr7CQ7Y=";

     

       10
       10
       +
             sha256 = "sha256-Bj1s3vFSHPiZNTjp7hQhu1X2v8nlynC37Cm6sMNOi3g=";

     

       11
       11
        
           };

     

       12
       12
        
           macosx = fetchurl {

     

       13
       13
        
             url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";

     

       14
       14
       -
             sha256 = "sha256-PM/wNXqtEwalhorWHqVHWsaiGv60SFrHXZrb1Mw/QqQ=";

     

       14
       14
       +
             sha256 = "sha256-W+s6ARA5lyRwTuRD89wm4HChb2Up5AXQwh5uk0U7pQk=";

     

       15
       15
        
           };

     

       16
       16
        
           pkg = fetchsvn {

     

       17
       17
        
             url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

+1 -1

pkgs/applications/misc/khal/default.nix

···

       30
       30
        
           pkginfo

     

       31
       31
        
           freezegun

     

       32
       32
        
         ];

     

       33
       33
       -
         nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ];

     

       33
       33
       +
         nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ];

     

       34
       34
        
         checkInputs = [ pytest glibcLocales ];

     

       35
       35
        
         LC_ALL = "en_US.UTF-8";

     

       36
       36

+36

pkgs/applications/misc/natural-docs/default.nix

···

       1
       1
       +
       { stdenv, fetchzip, makeWrapper, mono, lib }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "natural-docs";

     

       5
       5
       +
         version = "2.1.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchzip {

     

       8
       8
       +
           url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip";

     

       9
       9
       +
           sha256 = "03fizjgvhiw3lqyykqw1whdh97xyiy3f226c1348ll61ryjxamqw";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         dontPatch = true;

     

       13
       13
       +
         dontConfigure = true;

     

       14
       14
       +
         dontBuild = true;

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [ makeWrapper ];

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           mkdir -p $out/bin

     

       20
       20
       +
           cp -r . $out/

     

       21
       21
       +
           makeWrapper ${mono}/bin/mono $out/bin/NaturalDocs --add-flags "$out/NaturalDocs.exe"

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         meta = with lib; {

     

       25
       25
       +
           description = "Documentation generator for multiple programming languages.";

     

       26
       26
       +
           longDescription = ''

     

       27
       27
       +
             Natural Docs is an open source documentation generator for multiple

     

       28
       28
       +
             programming languages. You document your code in a natural syntax that

     

       29
       29
       +
             reads like plain English. Natural Docs then scans your code and builds

     

       30
       30
       +
             high-quality HTML documentation from it.

     

       31
       31
       +
           '';

     

       32
       32
       +
           homepage = "https://naturaldocs.org";

     

       33
       33
       +
           license = licenses.agpl3Only;

     

       34
       34
       +
           maintainers = [ maintainers.nkpvk ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+11 -9

pkgs/applications/misc/oneko/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version_name = "1.2.sakura.5";

     

       5
       5
       -
         version = "1.2.5";

     

       4
       4
       +
         version_name = "1.2.hanami.6";

     

       5
       5
       +
         version = "1.2.6";

     

       6
       6
        
         pname = "oneko";

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";

     

       9
       9
       -
           sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "IreneKnapp";

     

       9
       9
       +
           repo = "oneko";

     

       10
       10
       +
           rev = version_name;

     

       11
       11
       +
           sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc";

     

       10
       12
        
         };

     

       11
       13
        
         nativeBuildInputs = [ imake gccmakedep ];

     

       12
       14
        
         buildInputs = [ xlibsWrapper ];

     
···

       22
       24
        
           chasing around your mouse cursor.

     

       23
       25
        
           When the cat is done catching the mouse, it starts sleeping.

     

       24
       26
        
           '';

     

       25
       25
       -
           homepage = "http://www.daidouji.com/oneko/";

     

       26
       26
       -
           license = licenses.publicDomain;

     

       27
       27
       -
           maintainers = [ maintainers.xaverdh ];

     

       27
       27
       +
           homepage = "https://github.com/IreneKnapp/oneko";

     

       28
       28
       +
           license = with licenses; [ publicDomain ];

     

       29
       29
       +
           maintainers = with maintainers; [ xaverdh irenes ];

     

       28
       30
        
           platforms = platforms.unix;

     

       29
       31
        
         };

     

       30
       32
        
       }

+1 -1

pkgs/applications/misc/plover/default.nix

···

       17
       17
        
             sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";

     

       18
       18
        
           };

     

       19
       19
        
       

     

       20
       20
       -
           nativeBuildInputs     = [ setuptools_scm ];

     

       20
       20
       +
           nativeBuildInputs     = [ setuptools-scm ];

     

       21
       21
        
           buildInputs           = [ pytest mock ];

     

       22
       22
        
           propagatedBuildInputs = [

     

       23
       23
        
             six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python

+51 -11

pkgs/applications/misc/polar-bookshelf/default.nix

···

       1
       1
       -
       { stdenv, lib, makeWrapper, fetchurl

     

       2
       2
       -
       , dpkg, wrapGAppsHook, autoPatchelfHook

     

       3
       3
       -
       , gtk3, cairo, pango, atk, gdk-pixbuf, glib

     

       4
       4
       -
       , at-spi2-atk, dbus, libX11, libxcb, libXi

     

       5
       5
       -
       , libXcursor, libXdamage, libXrandr, libXcomposite

     

       6
       6
       -
       , libXext, libXfixes, libXrender, libXtst, libXScrnSaver

     

       7
       7
       -
       , nss, nspr, alsaLib, cups, fontconfig, expat

     

       8
       8
       -
       , libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , makeWrapper

     

       4
       4
       +
       , fetchurl

     

       5
       5
       +
       , dpkg

     

       6
       6
       +
       , wrapGAppsHook

     

       7
       7
       +
       , autoPatchelfHook

     

       8
       8
       +
       , gtk3

     

       9
       9
       +
       , cairo

     

       10
       10
       +
       , pango

     

       11
       11
       +
       , atk

     

       12
       12
       +
       , gdk-pixbuf

     

       13
       13
       +
       , glib

     

       14
       14
       +
       , at-spi2-atk

     

       15
       15
       +
       , dbus

     

       16
       16
       +
       , libX11

     

       17
       17
       +
       , libxcb

     

       18
       18
       +
       , libXi

     

       19
       19
       +
       , libXcursor

     

       20
       20
       +
       , libXdamage

     

       21
       21
       +
       , libXrandr

     

       22
       22
       +
       , libXcomposite

     

       23
       23
       +
       , libXext

     

       24
       24
       +
       , libXfixes

     

       25
       25
       +
       , libXrender

     

       26
       26
       +
       , libXtst

     

       27
       27
       +
       , libXScrnSaver

     

       28
       28
       +
       , nss

     

       29
       29
       +
       , nspr

     

       30
       30
       +
       , alsaLib

     

       31
       31
       +
       , cups

     

       32
       32
       +
       , fontconfig

     

       33
       33
       +
       , expat

     

       34
       34
       +
       , libudev0-shim

     

       35
       35
       +
       , glibc

     

       36
       36
       +
       , curl

     

       37
       37
       +
       , openssl

     

       38
       38
       +
       , libnghttp2

     

       39
       39
       +
       , gsettings-desktop-schemas

     

       40
       40
       +
       , libdrm

     

       41
       41
       +
       , mesa

     

       42
       42
       +
       }:

     

       9
       43
        
       

     

       10
       44
        
       

     

       11
       45
        
       stdenv.mkDerivation rec {

     

       12
       46
        
         pname = "polar-bookshelf";

     

       13
       13
       -
         version = "2.0.42";

     

       47
       47
       +
         version = "2.0.103";

     

       14
       48
        
       

     

       15
       49
        
         # fetching a .deb because there's no easy way to package this Electron app

     

       16
       50
        
         src = fetchurl {

     

       17
       51
        
           url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb";

     

       18
       18
       -
           hash = "sha256-JyO71wyE6b0iHAYs/6/WbG+OdUVUUPpJla+ZUzg0Gng=";

     

       52
       52
       +
           hash = "sha256-jcq0hW698bAhVM3fLQQeKAnld33XLkHsGjS3QwUpciQ=";

     

       19
       53
        
         };

     

       20
       54
        
       

     

       21
       55
        
         buildInputs = [

     

       56
       56
       +
           libdrm

     

       57
       57
       +
           mesa

     

       22
       58
        
           gsettings-desktop-schemas

     

       23
       59
        
           glib

     

       24
       60
        
           gtk3

     
···

       60
       96
        
         unpackPhase = "dpkg-deb -x $src .";

     

       61
       97
        
       

     

       62
       98
        
         installPhase = ''

     

       99
       99
       +
           runHook preInstall

     

       100
       100
       +
       

     

       63
       101
        
           mkdir -p $out/share/polar-bookshelf

     

       64
       102
        
           mkdir -p $out/bin

     

       65
       103
        
           mkdir -p $out/lib

     
···

       73
       111
        
       

     

       74
       112
        
           substituteInPlace $out/share/applications/polar-desktop-app.desktop \

     

       75
       113
        
             --replace "/opt/Polar/polar-desktop-app" "$out/bin/polar-desktop-app"

     

       114
       114
       +
       

     

       115
       115
       +
           runHook postInstall

     

       76
       116
        
         '';

     

       77
       117
        
       

     

       78
       118
        
         preFixup = ''

     
···

       82
       122
        
         meta = {

     

       83
       123
        
           homepage = "https://getpolarized.io/";

     

       84
       124
        
           description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation";

     

       85
       85
       -
           license = lib.licenses.gpl3;

     

       125
       125
       +
           license = lib.licenses.gpl3Only;

     

       86
       126
        
           platforms = lib.platforms.linux;

     

       87
       127
        
           maintainers = [ lib.maintainers.noneucat ];

     

       88
       128
        
         };

+1 -1

pkgs/applications/misc/pyditz/default.nix

···

       12
       12
        
           inherit pname version;

     

       13
       13
        
           sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551";

     

       14
       14
        
         };

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
         propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];

     

       17
       17
        
       

     

       18
       18
        
         checkPhase = ''

+1 -1

pkgs/applications/misc/raiseorlaunch/default.nix

···

       9
       9
        
           sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ python3Packages.setuptools_scm ];

     

       12
       12
       +
         nativeBuildInputs = [ python3Packages.setuptools-scm ];

     

       13
       13
        
         pythonPath = with python3Packages; [ i3ipc ];

     

       14
       14
        
       

     

       15
       15
        
         # no tests

+9 -13

pkgs/applications/misc/tiramisu/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, pkg-config, glib }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
        
         pname = "tiramisu";

     

       5
       5
       -
         version = "1.0";

     

       5
       5
       +
         version = "unstable-2021-05-20";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Sweets";

     

       9
       9
       -
           repo = pname;

     

       10
       10
       -
           rev = version;

     

       11
       11
       -
           sha256 = "0aw17riwgrhsmcndzh7sw2zw8xvn3d203c2gcrqi9nk5pa7fwp9m";

     

       9
       9
       +
           repo = "tiramisu";

     

       10
       10
       +
           rev = "e53833d0b5b0ae41ceb7dc434d8e25818fe62291";

     

       11
       11
       +
           sha256 = "sha256-F4oaTOAQQfOkEXeBVbGH+0CHc9v9Ac08GyzHliOdAfc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         postPatch = ''

     

       15
       15
       -
           sed -i 's/printf(element_delimiter)/printf("%s", element_delimiter)/' src/output.c

     

       16
       16
       -
         '';

     

       17
       17
       -
       

     

       18
       14
        
         buildInputs = [ glib ];

     

       19
       15
        
       

     

       20
       16
        
         nativeBuildInputs = [ pkg-config ];

     
···

       24
       20
        
         meta = with lib; {

     

       25
       21
        
           description = "Desktop notifications, the UNIX way";

     

       26
       22
        
           longDescription = ''

     

       27
       27
       -
           tiramisu is a notification daemon based on dunst that outputs notifications

     

       28
       28
       -
           to STDOUT in order to allow the user to process notifications any way they

     

       29
       29
       -
           prefer.

     

       23
       23
       +
             tiramisu is a notification daemon based on dunst that outputs notifications

     

       24
       24
       +
             to STDOUT in order to allow the user to process notifications any way they

     

       25
       25
       +
             prefer.

     

       30
       26
        
           '';

     

       31
       27
        
           homepage = "https://github.com/Sweets/tiramisu";

     

       32
       28
        
           license = licenses.mit;

     

       33
       29
        
           platforms = platforms.linux;

     

       34
       34
       -
           maintainers = with maintainers; [ wishfort36 ];

     

       30
       30
       +
           maintainers = with maintainers; [ wishfort36 fortuneteller2k ];

     

       35
       31
        
         };

     

       36
       32
        
       }

+6 -5

pkgs/applications/misc/xmrig/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "xmrig";

     

       7
       7
       -
         version = "6.6.1";

     

       7
       7
       +
         version = "6.12.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "xmrig";

     

       11
       11
        
           repo = "xmrig";

     

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

     

       13
       13
       -
           sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z";

     

       13
       13
       +
           sha256 = "1gjwh509cxs8vqz72v97cir0aazcrd9y9l0k1q5ywbl5l3yf6ryf";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ cmake ];

     

       17
       17
        
         buildInputs = [ libuv libmicrohttpd openssl hwloc ];

     

       18
       18
        
       

     

       19
       19
       +
         inherit donateLevel;

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [ ./donate-level.patch ];

     

       19
       22
        
         postPatch = ''

     

       20
       20
       -
           substituteInPlace src/donate.h \

     

       21
       21
       -
             --replace "kDefaultDonateLevel = 5;" "kDefaultDonateLevel = ${toString donateLevel};" \

     

       22
       22
       -
             --replace "kMinimumDonateLevel = 1;" "kMinimumDonateLevel = ${toString donateLevel};"

     

       23
       23
       +
           substituteAllInPlace src/donate.h

     

       23
       24
        
         '';

     

       24
       25
        
       

     

       25
       26
        
         installPhase = ''

+12

pkgs/applications/misc/xmrig/donate-level.patch

···

       1
       1
       +
       diff --git a/src/donate.h b/src/donate.h

     

       2
       2
       +
       --- a/src/donate.h

     

       3
       3
       +
       +++ b/src/donate.h

     

       4
       4
       +
       @@ -46,6 +46,6 @@

     

       5
       5
       +
         */

     

       6
       6
       +
       -constexpr const int kDefaultDonateLevel = 1;

     

       7
       7
       +
       -constexpr const int kMinimumDonateLevel = 1;

     

       8
       8
       +
       +constexpr const int kDefaultDonateLevel = @donateLevel@;

     

       9
       9
       +
       +constexpr const int kMinimumDonateLevel = @donateLevel@;

     

       10
       10
       +
        

     

       11
       11
       +
        

     

       12
       12
       +
        #endif /* XMRIG_DONATE_H */

+1 -1

pkgs/applications/misc/yokadi/default.nix

···

       24
       24
        
           description = "A command line oriented, sqlite powered, todo-list";

     

       25
       25
        
           homepage = "https://yokadi.github.io/index.html";

     

       26
       26
        
           license = licenses.gpl3Plus;

     

       27
       27
       -
           maintainers = [ maintainers.nipav ];

     

       27
       27
       +
           maintainers = [ maintainers.nkpvk ];

     

       28
       28
        
         };

     

       29
       29
        
       }

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "lagrange";

     

       18
       18
       -
         version = "1.4.0";

     

       18
       18
       +
         version = "1.5.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "skyjake";

     

       22
       22
        
           repo = "lagrange";

     

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

     

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

     

       24
       24
       +
           sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ=";

     

       25
       25
        
           fetchSubmodules = true;

     

       26
       26
        
         };

     

       27
       27

+49

pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , python3

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , wrapGAppsHook

     

       5
       5
       +
       , gobject-introspection

     

       6
       6
       +
       , libnotify

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       python3.pkgs.buildPythonApplication rec {

     

       10
       10
       +
         pname = "deltachat-cursed";

     

       11
       11
       +
         version = "0.2.0";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "adbenitez";

     

       15
       15
       +
           repo = "deltachat-cursed";

     

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

     

       17
       17
       +
           sha256 = "0kbb7lh17dbkd85mcqf438qwk5masz2fxsy8ljdh23kis55nksh8";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [

     

       21
       21
       +
           wrapGAppsHook

     

       22
       22
       +
         ];

     

       23
       23
       +
       

     

       24
       24
       +
         buildInputs = [

     

       25
       25
       +
           gobject-introspection

     

       26
       26
       +
           libnotify

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       30
       30
       +
           deltachat

     

       31
       31
       +
           pygobject3

     

       32
       32
       +
           urwid-readline

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         dontWrapGApps = true;

     

       36
       36
       +
       

     

       37
       37
       +
         preFixup = ''

     

       38
       38
       +
           makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         doCheck = false; # no tests implemented

     

       42
       42
       +
       

     

       43
       43
       +
         meta = with lib; {

     

       44
       44
       +
           description = "Lightweight Delta Chat client";

     

       45
       45
       +
           homepage = "https://github.com/adbenitez/deltachat-cursed";

     

       46
       46
       +
           license = licenses.gpl3Plus;

     

       47
       47
       +
           maintainers = with maintainers; [ dotlambda ];

     

       48
       48
       +
         };

     

       49
       49
       +
       }

pkgs/applications/networking/instant-messengers/teams/default.nix

···

       6
       6
        
       , dpkg

     

       7
       7
        
       , atomEnv

     

       8
       8
        
       , libuuid

     

       9
       9
       +
       , libappindicator-gtk3

     

       9
       10
        
       , pulseaudio

     

       10
       11
        
       , at-spi2-atk

     

       11
       12
        
       , coreutils

     
···

       34
       35
        
         runtimeDependencies = [

     

       35
       36
        
           (lib.getLib systemd)

     

       36
       37
        
           pulseaudio

     

       38
       38
       +
           libappindicator-gtk3

     

       37
       39
        
         ];

     

       38
       40
        
       

     

       39
       41
        
         preFixup = ''

+1 -1

pkgs/applications/networking/mailreaders/afew/default.nix

···

       9
       9
        
           sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ];

     

       12
       12
       +
         nativeBuildInputs = with python3Packages; [ sphinx setuptools-scm ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3Packages; [

     

       15
       15
        
           python3Packages.setuptools python3Packages.notmuch chardet dkimpy

+1 -1

pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix

···

       9
       9
        
           sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];

     

       12
       12
       +
         nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = with python3.pkgs; [

     

       15
       15
        
           beautifulsoup4

+4 -2

pkgs/applications/networking/onionshare/default.nix

···

       4
       4
        
         substituteAll,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         isPy3k,

     

       7
       7
       +
         colorama,

     

       7
       8
        
         flask,

     

       8
       9
        
         flask-httpauth,

     

       9
       10
        
         flask-socketio,

     
···

       22
       23
        
       }:

     

       23
       24
        
       

     

       24
       25
        
       let

     

       25
       25
       -
         version = "2.3.1";

     

       26
       26
       +
         version = "2.3.2";

     

       26
       27
        
         src = fetchFromGitHub {

     

       27
       28
        
           owner = "micahflee";

     

       28
       29
        
           repo = "onionshare";

     

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

     

       30
       30
       -
           sha256 = "sha256-H09x3OF6l1HLHukGPvV2rZUjW9fxeKKMZkKbY9a2m9I=";

     

       31
       31
       +
           sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI=";

     

       31
       32
        
         };

     

       32
       33
        
         meta = with lib; {

     

       33
       34
        
           description = "Securely and anonymously send and receive files";

     
···

       69
       70
        
           ];

     

       70
       71
        
           disable = !isPy3k;

     

       71
       72
        
           propagatedBuildInputs = [

     

       73
       73
       +
             colorama

     

       72
       74
        
             flask

     

       73
       75
        
             flask-httpauth

     

       74
       76
        
             flask-socketio

+2 -3

pkgs/applications/networking/onionshare/fix-paths-gui.patch

···

       1
       1
       -
       

     

       2
       1
        
       --- a/onionshare/gui_common.py

     

       3
       2
        
       +++ b/onionshare/gui_common.py

     

       4
       4
       -
       @@ -376,29 +376,10 @@ class GuiCommon:

     

       3
       3
       +
       @@ -391,29 +391,10 @@ class GuiCommon:

     

       5
       4
        
                }

     

       6
       5
        
        

     

       7
       6
        
            def get_tor_paths(self):

     
···

       20
       19
        
       -        elif self.common.platform == "Darwin":

     

       21
       20
        
       -            base_path = self.get_resource_path("tor")

     

       22
       21
        
       -            tor_path = os.path.join(base_path, "tor")

     

       23
       23
       -
       -            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")

     

       22
       22
       +
       -            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")

     

       24
       23
        
       -            tor_geo_ip_file_path = os.path.join(base_path, "geoip")

     

       25
       24
        
       -            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")

     

       26
       25
        
       -        elif self.common.platform == "BSD":

+4 -3

pkgs/applications/networking/onionshare/fix-paths.patch

···

       1
       1
        
       --- a/onionshare_cli/common.py

     

       2
       2
        
       +++ b/onionshare_cli/common.py

     

       3
       3
       -
       @@ -86,33 +86,10 @@ class Common:

     

       3
       3
       +
       @@ -308,33 +308,10 @@ class Common:

     

       4
       4
        
                return path

     

       5
       5
       -
        

     

       5
       5
       +
       

     

       6
       6
        
            def get_tor_paths(self):

     

       7
       7
        
       -        if self.platform == "Linux":

     

       8
       8
        
       -            tor_path = shutil.which("tor")

     
···

       35
       35
        
       +        tor_geo_ip_file_path = "@geoip@/share/tor/geoip"

     

       36
       36
        
       +        tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"

     

       37
       37
        
       +        obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"

     

       38
       38
       -
        

     

       38
       38
       +
       

     

       39
       39
        
                return (

     

       40
       40
        
                    tor_path,

     

       41
       41
       +

pkgs/applications/networking/p2p/transmission/default.nix

···

       98
       98
        
             rwk /tmp/tr_session_id_*,

     

       99
       99
        
             r /run/systemd/resolve/stub-resolv.conf,

     

       100
       100
        
       

     

       101
       101
       +
             r $out/share/transmission/web/**,

     

       102
       102
       +
       

     

       101
       103
        
             include <local/bin.transmission-daemon>

     

       102
       104
        
           }

     

       103
       105
        
           EOF

+6 -3

pkgs/applications/version-management/git-repo/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script

     

       2
       2
       -
       , python3, git, gnupg, less

     

       2
       2
       +
       , python3, git, gnupg, less, openssh

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     
···

       10
       10
        
           owner = "android";

     

       11
       11
        
           repo = "tools_repo";

     

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

     

       13
       13
       -
           sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";

     

       13
       13
       +
           sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU=";

     

       14
       14
        
         };

     

       15
       15
       +
       

     

       16
       16
       +
         # Fix 'NameError: name 'ssl' is not defined'

     

       17
       17
       +
         patches = [ ./import-ssl-module.patch ];

     

       15
       18
        
       

     

       16
       19
        
         nativeBuildInputs = [ makeWrapper ];

     

       17
       20
        
         buildInputs = [ python3 ];

     
···

       34
       37
        
         # Important runtime dependencies

     

       35
       38
        
         postFixup = ''

     

       36
       39
        
           wrapProgram $out/bin/repo --prefix PATH ":" \

     

       37
       37
       -
             "${lib.makeBinPath [ git gnupg less ]}"

     

       40
       40
       +
             "${lib.makeBinPath [ git gnupg less openssh ]}"

     

       38
       41
        
         '';

     

       39
       42
        
       

     

       40
       43
        
         passthru = {

+28

pkgs/applications/version-management/git-repo/import-ssl-module.patch

···

       1
       1
       +
       Fix runtime error due missing import

     

       2
       2
       +
       

     

       3
       3
       +
       Traceback (most recent call last):

     

       4
       4
       +
         File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1339, in <module>

     

       5
       5
       +
           main(sys.argv[1:])

     

       6
       6
       +
         File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1304, in main

     

       7
       7
       +
           _Init(args, gitc_init=(cmd == 'gitc-init'))

     

       8
       8
       +
         File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 607, in _Init

     

       9
       9
       +
           _Clone(url, dst, opt.clone_bundle, opt.quiet, opt.verbose)

     

       10
       10
       +
         File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 912, in _Clone

     

       11
       11
       +
           if clone_bundle and _DownloadBundle(url, cwd, quiet, verbose):

     

       12
       12
       +
         File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 860, in _DownloadBundle

     

       13
       13
       +
           r = urllib.request.urlopen(url, context=ssl.create_default_context())

     

       14
       14
       +
       NameError: name 'ssl' is not defined

     

       15
       15
       +
       builder for '/nix/store/4hvds8fv8xmzlm86yg9cf1lj6hrya7sg-amdvlk-src.drv' failed with exit code 1

     

       16
       16
       +
       

     

       17
       17
       +
       diff --git a/repo b/repo

     

       18
       18
       +
       index 8b05def..f394b3e 100755

     

       19
       19
       +
       --- a/repo

     

       20
       20
       +
       +++ b/repo

     

       21
       21
       +
       @@ -236,6 +236,7 @@ import optparse

     

       22
       22
       +
        import re

     

       23
       23
       +
        import shutil

     

       24
       24
       +
        import stat

     

       25
       25
       +
       +import ssl

     

       26
       26
       +
        

     

       27
       27
       +
        if sys.version_info[0] == 3:

     

       28
       28
       +
          import urllib.request

+2 -2

pkgs/applications/video/freetube/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "freetube";

     

       5
       5
       -
         version = "0.13.0";

     

       5
       5
       +
         version = "0.13.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";

     

       9
       9
       -
           sha256 = "sha256-CutTSpwb0G7FZgeKf/lvWHlhOn+X5AWLvPk0cpFQ1lk=";

     

       9
       9
       +
           sha256 = "sha256-DN78ASe29h7o6emCtN861arGqWKAWjjWKtsHs8jjROI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         appimageContents = appimageTools.extractType2 {

+2 -2

pkgs/applications/video/obs-studio/default.nix

···

       43
       43
        
       

     

       44
       44
        
       in mkDerivation rec {

     

       45
       45
        
         pname = "obs-studio";

     

       46
       46
       -
         version = "26.1.2";

     

       46
       46
       +
         version = "27.0.0";

     

       47
       47
        
       

     

       48
       48
        
         src = fetchFromGitHub {

     

       49
       49
        
           owner = "obsproject";

     

       50
       50
        
           repo = "obs-studio";

     

       51
       51
        
           rev = version;

     

       52
       52
       -
           sha256 = "1plr5a7k5scxlibhbknhhk19ipk8las14dzs7v64zx7rhpj00009";

     

       52
       52
       +
           sha256 = "1n71705b9lbdff3svkmgwmbhlhhxvi8ajxqb74lm07v56a5bvi6p";

     

       53
       53
        
           fetchSubmodules = true;

     

       54
       54
        
         };

     

       55
       55

+2 -2

pkgs/applications/window-managers/i3/lock-color.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
       -
         version = "2.13.c.2";

     

       7
       7
       +
         version = "2.13.c.3";

     

       8
       8
        
         pname = "i3lock-color";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "PandorasFox";

     

       12
       12
        
           repo = "i3lock-color";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           sha256 = "sha256-cMj1uB2Hf7v5Rukw9c5YeUmwbdTn1+PV13bUaOWzBp0=";

     

       14
       14
       +
           sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

+1 -1

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

···

       38
       38
        
           xcffib

     

       39
       39
        
           cairocffi-xcffib

     

       40
       40
        
           setuptools

     

       41
       41
       -
           setuptools_scm

     

       41
       41
       +
           setuptools-scm

     

       42
       42
        
           dateutil

     

       43
       43
        
           dbus-python

     

       44
       44
        
           mpd2

+2 -2

pkgs/data/fonts/noto-fonts/tools.nix

···

       3
       3
        
       , defcon, fontmath, fontparts, fontpens, fonttools, lxml

     

       4
       4
        
       , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour

     

       5
       5
        
       , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli

     

       6
       6
       -
       , pillow, six, bash, setuptools_scm }:

     

       6
       6
       +
       , pillow, six, bash, setuptools-scm }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "nototools";

     
···

       22
       22
        
           sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       25
       25
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     

       28
       28
        
           afdko

+2 -2

pkgs/data/themes/matcha/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "matcha-gtk-theme";

     

       5
       5
       -
         version = "2021-05-20";

     

       5
       5
       +
         version = "2021-06-02";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "vinceliuice";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "0jx55dn9j0395ws7507mj8px4yq4jlmms6xr9jlhp0qxnr4y1smd";

     

       11
       11
       +
           sha256 = "0wx0dgfl71wx02nrmf794xn28cvjx81vcmbnzwyyzwcbb9pacdpp";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ gdk-pixbuf librsvg ];

+42 -34

pkgs/development/beam-modules/build-erlang-mk.nix

···

       1
       1
        
       { stdenv, writeText, erlang, perl, which, gitMinimal, wget, lib }:

     

       2
       2
        
       

     

       3
       3
       -
       { name, version

     

       3
       3
       +
       { name

     

       4
       4
       +
       , version

     

       4
       5
        
       , src

     

       5
       6
        
       , setupHook ? null

     

       6
       6
       -
       , buildInputs ? []

     

       7
       7
       -
       , beamDeps ? []

     

       7
       7
       +
       , buildInputs ? [ ]

     

       8
       8
       +
       , beamDeps ? [ ]

     

       8
       9
        
       , postPatch ? ""

     

       9
       10
        
       , compilePorts ? false

     

       10
       11
        
       , installPhase ? null

     

       11
       12
        
       , buildPhase ? null

     

       12
       13
        
       , configurePhase ? null

     

       13
       13
       -
       , meta ? {}

     

       14
       14
       +
       , meta ? { }

     

       14
       15
        
       , enableDebugInfo ? false

     

       15
       15
       -
       , buildFlags ? []

     

       16
       16
       -
       , ... }@attrs:

     

       16
       16
       +
       , buildFlags ? [ ]

     

       17
       17
       +
       , ...

     

       18
       18
       +
       }@attrs:

     

       17
       19
        
       

     

       18
       20
        
       with lib;

     

       19
       21
        
       

     
···

       21
       23
        
         debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";

     

       22
       24
        
       

     

       23
       25
        
         shell = drv: stdenv.mkDerivation {

     

       24
       24
       -
                 name = "interactive-shell-${drv.name}";

     

       25
       25
       -
                 buildInputs = [ drv ];

     

       26
       26
       -
           };

     

       26
       26
       +
           name = "interactive-shell-${drv.name}";

     

       27
       27
       +
           buildInputs = [ drv ];

     

       28
       28
       +
         };

     

       27
       29
        
       

     

       28
       28
       -
         pkg = self: stdenv.mkDerivation ( attrs // {

     

       30
       30
       +
         pkg = self: stdenv.mkDerivation (attrs // {

     

       29
       31
        
           app_name = name;

     

       30
       32
        
           name = "${name}-${version}";

     

       31
       33
        
           inherit version;

     
···

       34
       36
        
       

     

       35
       37
        
           inherit src;

     

       36
       38
        
       

     

       37
       37
       -
           setupHook = if setupHook == null

     

       38
       38
       -
           then writeText "setupHook.sh" ''

     

       39
       39
       -
              addToSearchPath ERL_LIBS "$1/lib/erlang/lib"

     

       40
       40
       -
           ''

     

       41
       41
       -
           else setupHook;

     

       39
       39
       +
           setupHook =

     

       40
       40
       +
             if setupHook == null

     

       41
       41
       +
             then

     

       42
       42
       +
               writeText "setupHook.sh" ''

     

       43
       43
       +
                 addToSearchPath ERL_LIBS "$1/lib/erlang/lib"

     

       44
       44
       +
               ''

     

       45
       45
       +
             else setupHook;

     

       42
       46
        
       

     

       43
       47
        
           buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ];

     

       44
       48
        
           propagatedBuildInputs = beamDeps;

     
···

       47
       51
        
             ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"''

     

       48
       52
        
             ++ buildFlags;

     

       49
       53
        
       

     

       50
       50
       -
           configurePhase = if configurePhase == null

     

       51
       51
       -
           then ''

     

       52
       52
       -
             runHook preConfigure

     

       54
       54
       +
           configurePhase =

     

       55
       55
       +
             if configurePhase == null

     

       56
       56
       +
             then ''

     

       57
       57
       +
               runHook preConfigure

     

       53
       58
        
       

     

       54
       54
       -
             # We shouldnt need to do this, but it seems at times there is a *.app in

     

       55
       55
       -
             # the repo/package. This ensures we start from a clean slate

     

       56
       56
       -
             make SKIP_DEPS=1 clean

     

       59
       59
       +
               # We shouldnt need to do this, but it seems at times there is a *.app in

     

       60
       60
       +
               # the repo/package. This ensures we start from a clean slate

     

       61
       61
       +
               make SKIP_DEPS=1 clean

     

       57
       62
        
       

     

       58
       58
       -
             runHook postConfigure

     

       59
       59
       -
           ''

     

       60
       60
       -
           else configurePhase;

     

       63
       63
       +
               runHook postConfigure

     

       64
       64
       +
             ''

     

       65
       65
       +
             else configurePhase;

     

       61
       66
        
       

     

       62
       62
       -
           buildPhase = if buildPhase == null

     

       63
       63
       -
           then ''

     

       67
       67
       +
           buildPhase =

     

       68
       68
       +
             if buildPhase == null

     

       69
       69
       +
             then ''

     

       64
       70
        
               runHook preBuild

     

       65
       71
        
       

     

       66
       72
        
               make $buildFlags "''${buildFlagsArray[@]}"

     

       67
       73
        
       

     

       68
       74
        
               runHook postBuild

     

       69
       69
       -
           ''

     

       70
       70
       -
           else buildPhase;

     

       75
       75
       +
             ''

     

       76
       76
       +
             else buildPhase;

     

       71
       77
        
       

     

       72
       72
       -
           installPhase =  if installPhase == null

     

       73
       73
       -
           then ''

     

       78
       78
       +
           installPhase =

     

       79
       79
       +
             if installPhase == null

     

       80
       80
       +
             then ''

     

       74
       81
        
               runHook preInstall

     

       75
       82
        
       

     

       76
       83
        
               mkdir -p $out/lib/erlang/lib/${name}

     
···

       90
       97
        
               fi

     

       91
       98
        
       

     

       92
       99
        
               runHook postInstall

     

       93
       93
       -
           ''

     

       94
       94
       -
           else installPhase;

     

       100
       100
       +
             ''

     

       101
       101
       +
             else installPhase;

     

       95
       102
        
       

     

       96
       103
        
           passthru = {

     

       97
       104
        
             packageName = name;

     

       98
       105
        
             env = shell self;

     

       99
       106
        
             inherit beamDeps;

     

       100
       107
        
           };

     

       101
       101
       -
       });

     

       102
       102
       -
       in fix pkg

     

       108
       108
       +
         });

     

       109
       109
       +
       in

     

       110
       110
       +
       fix pkg

+1 -3

pkgs/development/beam-modules/build-mix.nix

···

       35
       35
        
       

     

       36
       36
        
           # add to ERL_LIBS so other modules can find at runtime.

     

       37
       37
        
           # http://erlang.org/doc/man/code.html#code-path

     

       38
       38
       -
           # Mix also searches the code path when compiling with the --no-deps-check

     

       39
       39
       -
           # flag, which is why there is no complicated booterstrapper like the one

     

       40
       40
       -
           # used by buildRebar3.

     

       38
       38
       +
           # Mix also searches the code path when compiling with the --no-deps-check flag

     

       41
       39
        
           setupHook = attrs.setupHook or

     

       42
       40
        
             writeText "setupHook.sh" ''

     

       43
       41
        
             addToSearchPath ERL_LIBS "$1/lib/erlang/lib"

+13 -9

pkgs/development/beam-modules/build-rebar3.nix

···

       1
       1
        
       { stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml, lib }:

     

       2
       2
        
       

     

       3
       3
       -
       { name, version

     

       3
       3
       +
       { name

     

       4
       4
       +
       , version

     

       4
       5
        
       , src

     

       5
       6
        
       , setupHook ? null

     

       6
       6
       -
       , buildInputs ? [], beamDeps ? [], buildPlugins ? []

     

       7
       7
       +
       , buildInputs ? [ ]

     

       8
       8
       +
       , beamDeps ? [ ]

     

       9
       9
       +
       , buildPlugins ? [ ]

     

       7
       10
        
       , postPatch ? ""

     

       8
       11
        
       , installPhase ? null

     

       9
       12
        
       , buildPhase ? null

     

       10
       13
        
       , configurePhase ? null

     

       11
       11
       -
       , meta ? {}

     

       14
       14
       +
       , meta ? { }

     

       12
       15
        
       , enableDebugInfo ? false

     

       13
       13
       -
       , ... }@attrs:

     

       16
       16
       +
       , ...

     

       17
       17
       +
       }@attrs:

     

       14
       18
        
       

     

       15
       19
        
       with lib;

     

       16
       20
        
       

     
···

       22
       26
        
         };

     

       23
       27
        
       

     

       24
       28
        
         shell = drv: stdenv.mkDerivation {

     

       25
       25
       -
                 name = "interactive-shell-${drv.name}";

     

       26
       26
       -
                 buildInputs = [ drv ];

     

       27
       27
       -
           };

     

       29
       29
       +
           name = "interactive-shell-${drv.name}";

     

       30
       30
       +
           buildInputs = [ drv ];

     

       31
       31
       +
         };

     

       28
       32
        
       

     

       29
       33
        
         customPhases = filterAttrs

     

       30
       34
        
           (_: v: v != null)

     
···

       42
       46
        
           inherit src;

     

       43
       47
        
       

     

       44
       48
        
           setupHook = writeText "setupHook.sh" ''

     

       45
       45
       -
              addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"

     

       49
       49
       +
             addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"

     

       46
       50
        
           '';

     

       47
       51
        
       

     

       48
       52
        
           postPatch = ''

     
···

       77
       81
        
           };

     

       78
       82
        
         } // customPhases);

     

       79
       83
        
       in

     

       80
       80
       -
         fix pkg

     

       84
       84
       +
       fix pkg

pkgs/development/compilers/purescript/purescript/default.nix

···

       61
       61
        
           license = licenses.bsd3;

     

       62
       62
        
           maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ];

     

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

     

       64
       64
       +
           mainProgram = "purs";

     

       64
       65
        
         };

     

       65
       66
        
       }

+22 -15

pkgs/development/compilers/zasm/default.nix

···

       1
       1
       -
       { fetchFromGitHub, zlib, lib, stdenv }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, zlib }:

     

       2
       2
        
       let

     

       3
       3
        
         libs-src = fetchFromGitHub {

     

       4
       4
        
           owner = "megatokio";

     

       5
       5
        
           repo = "Libraries";

     

       6
       6
       -
           rev = "97ea480051b106e83a086dd42583dfd3e9d458a1";

     

       7
       7
       -
           sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh";

     

       6
       6
       +
           # 2021-02-02

     

       7
       7
       +
           rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b";

     

       8
       8
       +
           sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk=";

     

       8
       9
        
         };

     

       9
       10
        
       in

     

       10
       10
       -
       stdenv.mkDerivation {

     

       11
       11
       +
       stdenv.mkDerivation rec {

     

       11
       12
        
         pname = "zasm";

     

       12
       12
       -
         version = "4.2.6";

     

       13
       13
       +
         version = "4.4.7";

     

       14
       14
       +
       

     

       13
       15
        
         src = fetchFromGitHub {

     

       14
       16
        
           owner = "megatokio";

     

       15
       17
        
           repo = "zasm";

     

       16
       16
       -
           rev = "f1424add17a5514895a598d6b5e3982579961519";

     

       17
       17
       -
           sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks";

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68=";

     

       20
       20
       +
           extraPostFetch = ''

     

       21
       21
       +
             # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux)

     

       22
       22
       +
             rm -rv $out/Test

     

       23
       23
       +
           '';

     

       18
       24
        
         };

     

       19
       25
        
       

     

       20
       26
        
         buildInputs = [ zlib ];

     
···

       23
       29
        
           ln -sf ${libs-src} Libraries

     

       24
       30
        
         '';

     

       25
       31
        
       

     

       26
       26
       -
         buildPhase = ''

     

       27
       27
       -
           cd Linux

     

       28
       28
       -
           make

     

       29
       29
       -
         '';

     

       32
       32
       +
         makeFlags = [

     

       33
       33
       +
           "CC=${stdenv.cc.targetPrefix}cc"

     

       34
       34
       +
           "CXX=${stdenv.cc.targetPrefix}c++"

     

       35
       35
       +
           "LINK=${stdenv.cc.targetPrefix}c++"

     

       36
       36
       +
           "STRIP=${stdenv.cc.targetPrefix}strip"

     

       37
       37
       +
         ];

     

       30
       38
        
       

     

       31
       39
        
         installPhase = ''

     

       32
       32
       -
           mkdir -p $out/bin

     

       33
       33
       -
           mv zasm $out/bin

     

       40
       40
       +
           install -Dm755 -t $out/bin zasm

     

       34
       41
        
         '';

     

       35
       42
        
       

     

       36
       43
        
         meta = with lib; {

     

       37
       37
       -
           description = "Z80 / 8080 assembler (for unix-style OS)";

     

       44
       44
       +
           description = "Z80 / 8080 / Z180 assembler (for unix-style OS)";

     

       38
       45
        
           homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";

     

       39
       46
        
           license = licenses.bsd2;

     

       40
       47
        
           maintainers = [ maintainers.turbomack ];

     

       41
       41
       -
           platforms = platforms.linux;

     

       48
       48
       +
           platforms = platforms.unix;

     

       42
       49
        
           badPlatforms = platforms.aarch64;

     

       43
       50
        
         };

     

       44
       51
        
       }

+90 -51

pkgs/development/interpreters/erlang/generic-builder.nix

···

       1
       1
       -
       { pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused

     

       2
       2
       -
       , libxml2, libxslt, ncurses, openssl, perl, autoconf

     

       1
       1
       +
       { pkgs

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , stdenv

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , gawk

     

       7
       7
       +
       , gnum4

     

       8
       8
       +
       , gnused

     

       9
       9
       +
       , libxml2

     

       10
       10
       +
       , libxslt

     

       11
       11
       +
       , ncurses

     

       12
       12
       +
       , openssl

     

       13
       13
       +
       , perl

     

       14
       14
       +
       , autoconf

     

       3
       15
        
       , openjdk11 ? null # javacSupport

     

       4
       16
        
       , unixODBC ? null # odbcSupport

     

       5
       5
       -
       , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null

     

       17
       17
       +
       , libGL ? null

     

       18
       18
       +
       , libGLU ? null

     

       19
       19
       +
       , wxGTK ? null

     

       20
       20
       +
       , wxmac ? null

     

       21
       21
       +
       , xorg ? null

     

       6
       22
        
       , parallelBuild ? false

     

       7
       7
       -
       , systemd, wxSupport ? true

     

       8
       8
       -
       # updateScript deps

     

       9
       9
       -
       , writeScript, common-updater-scripts, coreutils, git

     

       23
       23
       +
       , systemd

     

       24
       24
       +
       , wxSupport ? true

     

       25
       25
       +
         # updateScript deps

     

       26
       26
       +
       , writeScript

     

       27
       27
       +
       , common-updater-scripts

     

       28
       28
       +
       , coreutils

     

       29
       29
       +
       , git

     

       10
       30
        
       }:

     

       11
       31
        
       { baseName ? "erlang"

     

       12
       32
        
       , version

     
···

       18
       38
        
       , enableThreads ? true

     

       19
       39
        
       , enableSmpSupport ? true

     

       20
       40
        
       , enableKernelPoll ? true

     

       21
       21
       -
       , javacSupport ? false, javacPackages ? [ openjdk11 ]

     

       22
       22
       -
       , odbcSupport ? false, odbcPackages ? [ unixODBC ]

     

       41
       41
       +
       , javacSupport ? false

     

       42
       42
       +
       , javacPackages ? [ openjdk11 ]

     

       43
       43
       +
       , odbcSupport ? false

     

       44
       44
       +
       , odbcPackages ? [ unixODBC ]

     

       23
       45
        
       , withSystemd ? stdenv.isLinux # systemd support in epmd

     

       24
       46
        
       , opensslPackage ? openssl

     

       25
       47
        
       , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]

     

       26
       26
       -
       , preUnpack ? "", postUnpack ? ""

     

       27
       27
       -
       , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""

     

       28
       28
       -
       , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""

     

       29
       29
       -
       , buildPhase ? "", preBuild ? "", postBuild ? ""

     

       30
       30
       -
       , installPhase ? "", preInstall ? "", postInstall ? ""

     

       48
       48
       +
       , preUnpack ? ""

     

       49
       49
       +
       , postUnpack ? ""

     

       50
       50
       +
       , patches ? [ ]

     

       51
       51
       +
       , patchPhase ? ""

     

       52
       52
       +
       , prePatch ? ""

     

       53
       53
       +
       , postPatch ? ""

     

       54
       54
       +
       , configureFlags ? [ ]

     

       55
       55
       +
       , configurePhase ? ""

     

       56
       56
       +
       , preConfigure ? ""

     

       57
       57
       +
       , postConfigure ? ""

     

       58
       58
       +
       , buildPhase ? ""

     

       59
       59
       +
       , preBuild ? ""

     

       60
       60
       +
       , postBuild ? ""

     

       61
       61
       +
       , installPhase ? ""

     

       62
       62
       +
       , preInstall ? ""

     

       63
       63
       +
       , postInstall ? ""

     

       31
       64
        
       , installTargets ? [ "install" "install-docs" ]

     

       32
       32
       -
       , checkPhase ? "", preCheck ? "", postCheck ? ""

     

       33
       33
       -
       , fixupPhase ? "", preFixup ? "", postFixup ? ""

     

       34
       34
       -
       , meta ? {}

     

       65
       65
       +
       , checkPhase ? ""

     

       66
       66
       +
       , preCheck ? ""

     

       67
       67
       +
       , postCheck ? ""

     

       68
       68
       +
       , fixupPhase ? ""

     

       69
       69
       +
       , preFixup ? ""

     

       70
       70
       +
       , postFixup ? ""

     

       71
       71
       +
       , meta ? { }

     

       35
       72
        
       }:

     

       36
       73
        
       

     

       37
       74
        
       assert wxSupport -> (if stdenv.isDarwin

     

       38
       38
       -
         then wxmac != null

     

       39
       39
       -
         else libGL != null && libGLU != null && wxGTK != null && xorg != null);

     

       75
       75
       +
       then wxmac != null

     

       76
       76
       +
       else libGL != null && libGLU != null && wxGTK != null && xorg != null);

     

       40
       77
        
       

     

       41
       78
        
       assert odbcSupport -> unixODBC != null;

     

       42
       79
        
       assert javacSupport -> openjdk11 != null;

     
···

       45
       82
        
         inherit (lib) optional optionals optionalAttrs optionalString;

     

       46
       83
        
         wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;

     

       47
       84
        
       

     

       48
       48
       -
       in stdenv.mkDerivation ({

     

       85
       85
       +
       in

     

       86
       86
       +
       stdenv.mkDerivation ({

     

       49
       87
        
         name = "${baseName}-${version}"

     

       50
       88
        
           + optionalString javacSupport "-javac"

     

       51
       89
        
           + optionalString odbcSupport "-odbc";

     
···

       109
       147
        
         passthru = {

     

       110
       148
        
           updateScript =

     

       111
       149
        
             let major = builtins.head (builtins.splitVersion version);

     

       112
       112
       -
             in writeScript "update.sh" ''

     

       113
       113
       -
             #!${stdenv.shell}

     

       114
       114
       -
             set -ox errexit

     

       115
       115
       -
             PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]}

     

       116
       116
       -
             latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)

     

       117
       117
       -
             if [ "$latest" != "${version}" ]; then

     

       118
       118
       -
               nixpkgs="$(git rev-parse --show-toplevel)"

     

       119
       119
       -
               nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix"

     

       120
       120
       -
               update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file"

     

       121
       121
       -
             else

     

       122
       122
       -
               echo "${baseName}R${major} is already up-to-date"

     

       123
       123
       -
             fi

     

       124
       124
       -
           '';

     

       150
       150
       +
             in

     

       151
       151
       +
             writeScript "update.sh" ''

     

       152
       152
       +
               #!${stdenv.shell}

     

       153
       153
       +
               set -ox errexit

     

       154
       154
       +
               PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]}

     

       155
       155
       +
               latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1)

     

       156
       156
       +
               if [ "$latest" != "${version}" ]; then

     

       157
       157
       +
                 nixpkgs="$(git rev-parse --show-toplevel)"

     

       158
       158
       +
                 nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix"

     

       159
       159
       +
                 update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file"

     

       160
       160
       +
               else

     

       161
       161
       +
                 echo "${baseName}R${major} is already up-to-date"

     

       162
       162
       +
               fi

     

       163
       163
       +
             '';

     

       125
       164
        
         };

     

       126
       165
        
       

     

       127
       166
        
         meta = with lib; ({

     
···

       143
       182
        
           license = licenses.asl20;

     

       144
       183
        
         } // meta);

     

       145
       184
        
       }

     

       146
       146
       -
       // optionalAttrs (preUnpack != "")      { inherit preUnpack; }

     

       147
       147
       -
       // optionalAttrs (postUnpack != "")     { inherit postUnpack; }

     

       148
       148
       -
       // optionalAttrs (patches != [])        { inherit patches; }

     

       149
       149
       -
       // optionalAttrs (prePatch != "")       { inherit prePatch; }

     

       150
       150
       -
       // optionalAttrs (patchPhase != "")     { inherit patchPhase; }

     

       185
       185
       +
       // optionalAttrs (preUnpack != "") { inherit preUnpack; }

     

       186
       186
       +
       // optionalAttrs (postUnpack != "") { inherit postUnpack; }

     

       187
       187
       +
       // optionalAttrs (patches != [ ]) { inherit patches; }

     

       188
       188
       +
       // optionalAttrs (prePatch != "") { inherit prePatch; }

     

       189
       189
       +
       // optionalAttrs (patchPhase != "") { inherit patchPhase; }

     

       151
       190
        
       // optionalAttrs (configurePhase != "") { inherit configurePhase; }

     

       152
       152
       -
       // optionalAttrs (preConfigure != "")   { inherit preConfigure; }

     

       153
       153
       -
       // optionalAttrs (postConfigure != "")  { inherit postConfigure; }

     

       154
       154
       -
       // optionalAttrs (buildPhase != "")     { inherit buildPhase; }

     

       155
       155
       -
       // optionalAttrs (preBuild != "")       { inherit preBuild; }

     

       156
       156
       -
       // optionalAttrs (postBuild != "")      { inherit postBuild; }

     

       157
       157
       -
       // optionalAttrs (checkPhase != "")     { inherit checkPhase; }

     

       158
       158
       -
       // optionalAttrs (preCheck != "")       { inherit preCheck; }

     

       159
       159
       -
       // optionalAttrs (postCheck != "")      { inherit postCheck; }

     

       160
       160
       -
       // optionalAttrs (installPhase != "")   { inherit installPhase; }

     

       161
       161
       -
       // optionalAttrs (installTargets != []) { inherit installTargets; }

     

       162
       162
       -
       // optionalAttrs (preInstall != "")     { inherit preInstall; }

     

       163
       163
       -
       // optionalAttrs (fixupPhase != "")     { inherit fixupPhase; }

     

       164
       164
       -
       // optionalAttrs (preFixup != "")       { inherit preFixup; }

     

       165
       165
       -
       // optionalAttrs (postFixup != "")      { inherit postFixup; }

     

       191
       191
       +
       // optionalAttrs (preConfigure != "") { inherit preConfigure; }

     

       192
       192
       +
       // optionalAttrs (postConfigure != "") { inherit postConfigure; }

     

       193
       193
       +
       // optionalAttrs (buildPhase != "") { inherit buildPhase; }

     

       194
       194
       +
       // optionalAttrs (preBuild != "") { inherit preBuild; }

     

       195
       195
       +
       // optionalAttrs (postBuild != "") { inherit postBuild; }

     

       196
       196
       +
       // optionalAttrs (checkPhase != "") { inherit checkPhase; }

     

       197
       197
       +
       // optionalAttrs (preCheck != "") { inherit preCheck; }

     

       198
       198
       +
       // optionalAttrs (postCheck != "") { inherit postCheck; }

     

       199
       199
       +
       // optionalAttrs (installPhase != "") { inherit installPhase; }

     

       200
       200
       +
       // optionalAttrs (installTargets != [ ]) { inherit installTargets; }

     

       201
       201
       +
       // optionalAttrs (preInstall != "") { inherit preInstall; }

     

       202
       202
       +
       // optionalAttrs (fixupPhase != "") { inherit fixupPhase; }

     

       203
       203
       +
       // optionalAttrs (preFixup != "") { inherit preFixup; }

     

       204
       204
       +
       // optionalAttrs (postFixup != "") { inherit postFixup; }

     

       166
       205
        
       )

+13 -8

pkgs/development/interpreters/perl/default.nix

···

       1
       1
       -
       { config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage

     

       1
       1
       +
       { config, lib, stdenv, fetchurl, fetchFromGitHub, pkgs, buildPackages

     

       2
       2
       +
       , callPackage

     

       2
       3
        
       , enableThreading ? true, coreutils, makeWrapper

     

       3
       4
        
       }:

     

       4
       5
        
       

     
···

       171
       172
        
             priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`

     

       172
       173
        
           };

     

       173
       174
        
         } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {

     

       174
       174
       -
           crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021

     

       175
       175
       +
           crossVersion = "1.3.6";

     

       175
       176
        
       

     

       176
       176
       -
           perl-cross-src = fetchurl {

     

       177
       177
       -
             url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";

     

       178
       178
       -
             sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6";

     

       177
       177
       +
           perl-cross-src = fetchFromGitHub {

     

       178
       178
       +
             name = "perl-cross-${crossVersion}";

     

       179
       179
       +
             owner = "arsv";

     

       180
       180
       +
             repo = "perl-cross";

     

       181
       181
       +
             rev = crossVersion;

     

       182
       182
       +
             sha256 = "0k5vyj40czbkfl7r3dcwxpc7dvdlp2xliaav358bviq3dq9vq9bb";

     

       179
       183
        
           };

     

       180
       184
        
       

     

       181
       185
        
           depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];

     

       182
       186
        
       

     

       183
       187
        
           postUnpack = ''

     

       184
       188
        
             unpackFile ${perl-cross-src}

     

       185
       185
       -
             cp -R perl-cross-${crossVersion}/* perl-${version}/

     

       189
       189
       +
             chmod -R u+w ${perl-cross-src.name}

     

       190
       190
       +
             cp -R ${perl-cross-src.name}/* perl-${version}/

     

       186
       191
        
           '';

     

       187
       192
        
       

     

       188
       193
        
           configurePlatforms = [ "build" "host" "target" ];

     
···

       211
       216
        
         perldevel = common {

     

       212
       217
        
           perl = pkgs.perldevel;

     

       213
       218
        
           buildPerl = buildPackages.perldevel;

     

       214
       214
       -
           version = "5.33.8";

     

       215
       215
       -
           sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl";

     

       219
       219
       +
           version = "5.35.0";

     

       220
       220
       +
           sha256 = "0217nbswhkjhw60kng2p64611xna7za681kk30fkriyicd3yph6n";

     

       216
       221
        
         };

     

       217
       222
        
       }

+2 -2

pkgs/development/libraries/lasso/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
       

     

       5
       5
        
         pname = "lasso";

     

       6
       6
       -
         version = "2.6.1";

     

       6
       6
       +
         version = "2.7.0";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1pniisy4z9cshf6lvlz28kfa3qnwnhldb2rvkjxzc0l84g7dpa7q";

     

       10
       10
       +
           sha256 = "138x8pmj4k1pbah32z14rd8ylyx4lgz70s93m39vd17f8sjz50lj";

     

       11
       11
        
       

     

       12
       12
        
         };

     

       13
       13

+1 -1

pkgs/development/libraries/libraspberrypi/default.nix

···

       19
       19
        
         patches = [

     

       20
       20
        
           (fetchpatch {

     

       21
       21
        
             # https://github.com/raspberrypi/userland/pull/670

     

       22
       22
       -
             url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";

     

       22
       22
       +
             url = "https://github.com/raspberrypi/userland/commit/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch";

     

       23
       23
        
             sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw";

     

       24
       24
        
           })

     

       25
       25
        
         ];

+8 -10

pkgs/development/libraries/science/benchmark/papi/default.nix

···

       2
       2
        
       , fetchurl

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation {

     

       6
       6
       -
         version = "5.6.0";

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         version = "6.0.0.1";

     

       7
       7
        
         pname = "papi";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";

     

       11
       11
       -
           sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";

     

       10
       10
       +
           url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz";

     

       11
       11
       +
           sha256 = "1jd67yadyffzxwsqlylsi0bx8ishb0cgj2ziz1wdslaz6ylvyf9j";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation";

     

       15
       15
       -
       

     

       16
       16
       -
         preConfigure = ''

     

       17
       17
       -
           cd src

     

       14
       14
       +
         setSourceRoot = ''

     

       15
       15
       +
           sourceRoot=$(echo */src)

     

       18
       16
        
         '';

     

       19
       17
        
       

     

       20
       18
        
         doCheck = true;

     
···

       22
       20
        
       

     

       23
       21
        
         meta = with lib; {

     

       24
       22
        
           homepage = "https://icl.utk.edu/papi/";

     

       25
       25
       -
           description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";

     

       23
       23
       +
           description = "Library providing access to various hardware performance counters";

     

       26
       24
        
           license = licenses.bsdOriginal;

     

       27
       25
        
           platforms = platforms.linux;

     

       28
       28
       -
           maintainers = [ maintainers.costrouc ];

     

       26
       26
       +
           maintainers = with maintainers; [ costrouc zhaofengli ];

     

       29
       27
        
         };

     

       30
       28
        
       }

+11

pkgs/development/node-packages/default.nix

···

       331
       331
        
               --prefix NODE_PATH : ${self.prettier}/lib/node_modules

     

       332
       332
        
             '';

     

       333
       333
        
           };

     

       334
       334
       +
       

     

       335
       335
       +
           wavedrom-cli = super.wavedrom-cli.override {

     

       336
       336
       +
             nativeBuildInputs = [ pkgs.pkg-config self.node-pre-gyp ];

     

       337
       337
       +
             # These dependencies are required by

     

       338
       338
       +
             # https://github.com/Automattic/node-canvas.

     

       339
       339
       +
             buildInputs = with pkgs; [

     

       340
       340
       +
               pixman

     

       341
       341
       +
               cairo

     

       342
       342
       +
               pango

     

       343
       343
       +
             ];

     

       344
       344
       +
           };

     

       334
       345
        
         };

     

       335
       346
        
       in self

pkgs/development/node-packages/node-packages.json

···

       261
       261
        
       , { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" }

     

       262
       262
        
       , "vue-cli"

     

       263
       263
        
       , "vue-language-server"

     

       264
       264
       +
       , "wavedrom-cli"

     

       264
       265
        
       , "web-ext"

     

       265
       266
        
       , "webpack"

     

       266
       267
        
       , "webpack-cli"

+1195 -740

pkgs/development/node-packages/node-packages.nix

···

       1498
       1498
        
               sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==";

     

       1499
       1499
        
             };

     

       1500
       1500
        
           };

     

       1501
       1501
       +
           "@babel/runtime-corejs3-7.14.0" = {

     

       1502
       1502
       +
             name = "_at_babel_slash_runtime-corejs3";

     

       1503
       1503
       +
             packageName = "@babel/runtime-corejs3";

     

       1504
       1504
       +
             version = "7.14.0";

     

       1505
       1505
       +
             src = fetchurl {

     

       1506
       1506
       +
               url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz";

     

       1507
       1507
       +
               sha512 = "0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==";

     

       1508
       1508
       +
             };

     

       1509
       1509
       +
           };

     

       1501
       1510
        
           "@babel/standalone-7.14.4" = {

     

       1502
       1511
        
             name = "_at_babel_slash_standalone";

     

       1503
       1512
        
             packageName = "@babel/standalone";

     
···

       2038
       2047
        
               sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==";

     

       2039
       2048
        
             };

     

       2040
       2049
        
           };

     

       2041
       2041
       -
           "@expo/config-4.0.0" = {

     

       2050
       2050
       +
           "@expo/config-4.0.2" = {

     

       2042
       2051
        
             name = "_at_expo_slash_config";

     

       2043
       2052
        
             packageName = "@expo/config";

     

       2044
       2044
       -
             version = "4.0.0";

     

       2053
       2053
       +
             version = "4.0.2";

     

       2045
       2054
        
             src = fetchurl {

     

       2046
       2046
       -
               url = "https://registry.npmjs.org/@expo/config/-/config-4.0.0.tgz";

     

       2047
       2047
       -
               sha512 = "Hy2/49BMMzziDhJFf+N0gG5znLuhoorS9/+OFO7wqDbRV4LRraNx4UuGdyY06yLI7F0BgEJBGy109pZ4LZoKrA==";

     

       2055
       2055
       +
               url = "https://registry.npmjs.org/@expo/config/-/config-4.0.2.tgz";

     

       2056
       2056
       +
               sha512 = "zKKWt6Qs2lJLSwp8NeBCQ+iAPuKYkRJB6PZZJFIXaXD9AC5uJYSElUG+HVfy73se4KF/4JjndOWXWZEkCAivxw==";

     

       2048
       2057
        
             };

     

       2049
       2058
        
           };

     

       2050
       2050
       -
           "@expo/config-plugins-2.0.0" = {

     

       2059
       2059
       +
           "@expo/config-plugins-2.0.2" = {

     

       2051
       2060
        
             name = "_at_expo_slash_config-plugins";

     

       2052
       2061
        
             packageName = "@expo/config-plugins";

     

       2053
       2053
       -
             version = "2.0.0";

     

       2062
       2062
       +
             version = "2.0.2";

     

       2054
       2063
        
             src = fetchurl {

     

       2055
       2055
       -
               url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.0.tgz";

     

       2056
       2056
       -
               sha512 = "MyD9cdoVuXEw/xzpHiFNzRvMFi1DWTU2oShTTviA8xt1U1gyuBTa9aBwFSyvZmpMoCEscOsC8ED0sZl7LM5wNw==";

     

       2064
       2064
       +
               url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.2.tgz";

     

       2065
       2065
       +
               sha512 = "kaTfzLfg9sjy9uAHq708FVqC2hlVQyzCmrCsnfRguk2d+5V9ZyCVdMPiDdAIKHtWCPygIPNmlIP4FYQ093RNzQ==";

     

       2057
       2066
        
             };

     

       2058
       2067
        
           };

     

       2059
       2059
       -
           "@expo/config-types-40.0.0-beta.2" = {

     

       2068
       2068
       +
           "@expo/config-types-41.0.0" = {

     

       2060
       2069
        
             name = "_at_expo_slash_config-types";

     

       2061
       2070
        
             packageName = "@expo/config-types";

     

       2062
       2062
       -
             version = "40.0.0-beta.2";

     

       2071
       2071
       +
             version = "41.0.0";

     

       2063
       2072
        
             src = fetchurl {

     

       2064
       2064
       -
               url = "https://registry.npmjs.org/@expo/config-types/-/config-types-40.0.0-beta.2.tgz";

     

       2065
       2065
       -
               sha512 = "t9pHCQMXOP4nwd7LGXuHkLlFy0JdfknRSCAeVF4Kw2/y+5OBbR9hW9ZVnetpBf0kORrekgiI7K/qDaa3hh5+Qg==";

     

       2073
       2073
       +
               url = "https://registry.npmjs.org/@expo/config-types/-/config-types-41.0.0.tgz";

     

       2074
       2074
       +
               sha512 = "Ax0pHuY5OQaSrzplOkT9DdpdmNzaVDnq9VySb4Ujq7UJ4U4jriLy8u93W98zunOXpcu0iiKubPsqD6lCiq0pig==";

     

       2066
       2075
        
             };

     

       2067
       2076
        
           };

     

       2068
       2077
        
           "@expo/configure-splash-screen-0.4.0" = {

     
···

       2074
       2083
        
               sha512 = "IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g==";

     

       2075
       2084
        
             };

     

       2076
       2085
        
           };

     

       2077
       2077
       -
           "@expo/dev-server-0.1.70" = {

     

       2086
       2086
       +
           "@expo/dev-server-0.1.72" = {

     

       2078
       2087
        
             name = "_at_expo_slash_dev-server";

     

       2079
       2088
        
             packageName = "@expo/dev-server";

     

       2080
       2080
       -
             version = "0.1.70";

     

       2089
       2089
       +
             version = "0.1.72";

     

       2081
       2090
        
             src = fetchurl {

     

       2082
       2082
       -
               url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.70.tgz";

     

       2083
       2083
       -
               sha512 = "6OytCPP8krQwjhJeluzDZd1dBb9oIptpkskSsrZHQTHyCGK9m3CLILu/hSiUffN73vINscnUXwCusfbKU+g3yQ==";

     

       2091
       2091
       +
               url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.72.tgz";

     

       2092
       2092
       +
               sha512 = "W1ULabPSCDiV1ySy3ZkX2nTUPiWLqj1ocMLE8sk1wddO8RWneKGB9FlrGDj0+RFTDOYi6ZmBESesKrH/elNkRw==";

     

       2084
       2093
        
             };

     

       2085
       2094
        
           };

     

       2086
       2086
       -
           "@expo/dev-tools-0.13.100" = {

     

       2095
       2095
       +
           "@expo/dev-tools-0.13.102" = {

     

       2087
       2096
        
             name = "_at_expo_slash_dev-tools";

     

       2088
       2097
        
             packageName = "@expo/dev-tools";

     

       2089
       2089
       -
             version = "0.13.100";

     

       2098
       2098
       +
             version = "0.13.102";

     

       2090
       2099
        
             src = fetchurl {

     

       2091
       2091
       -
               url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.100.tgz";

     

       2092
       2092
       -
               sha512 = "S/kI8boX8cc8pSkLApARxeW3ukdOMXFDBS02bQYx7+oZsY6hqfefUX2gvAnWatzCSOUBnRRdmrDAcFuZRnRP3w==";

     

       2100
       2100
       +
               url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.102.tgz";

     

       2101
       2101
       +
               sha512 = "yVpt9EERqMrPXaFgjV5HumcDSoni0rhaafTB186NB4BYPNuBDytSeb9RnpxyHHWxzF3/mav5DIQ+x6HB6TdWig==";

     

       2093
       2102
        
             };

     

       2094
       2103
        
           };

     

       2095
       2104
        
           "@expo/devcert-1.0.0" = {

     
···

       2119
       2128
        
               sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A==";

     

       2120
       2129
        
             };

     

       2121
       2130
        
           };

     

       2122
       2122
       -
           "@expo/metro-config-0.1.70" = {

     

       2131
       2131
       +
           "@expo/metro-config-0.1.72" = {

     

       2123
       2132
        
             name = "_at_expo_slash_metro-config";

     

       2124
       2133
        
             packageName = "@expo/metro-config";

     

       2125
       2125
       -
             version = "0.1.70";

     

       2134
       2134
       +
             version = "0.1.72";

     

       2126
       2135
        
             src = fetchurl {

     

       2127
       2127
       -
               url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.70.tgz";

     

       2128
       2128
       -
               sha512 = "zegpHSI0EedKSXkBg0wtU99YYA6OY8qCgm0urdKszDJ9c8Oea26b2+x2j0PBqspUiTC4kY+t/pzZkKWDEFAquQ==";

     

       2136
       2136
       +
               url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.72.tgz";

     

       2137
       2137
       +
               sha512 = "PvWn5DZCV6hNYA9CTOBWEfwb9FCjyQCiyYnmxjsT0k9eplIBGTtfy74uIOd0SdDdCTPCgCO8SMyabc+Qg599xg==";

     

       2129
       2138
        
             };

     

       2130
       2139
        
           };

     

       2131
       2140
        
           "@expo/osascript-2.0.28" = {

     
···

       2155
       2164
        
               sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw==";

     

       2156
       2165
        
             };

     

       2157
       2166
        
           };

     

       2158
       2158
       -
           "@expo/prebuild-config-1.0.1" = {

     

       2167
       2167
       +
           "@expo/prebuild-config-1.0.3" = {

     

       2159
       2168
        
             name = "_at_expo_slash_prebuild-config";

     

       2160
       2169
        
             packageName = "@expo/prebuild-config";

     

       2161
       2161
       -
             version = "1.0.1";

     

       2170
       2170
       +
             version = "1.0.3";

     

       2162
       2171
        
             src = fetchurl {

     

       2163
       2163
       -
               url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.1.tgz";

     

       2164
       2164
       -
               sha512 = "A0MBD5NceJWwRO8dKe+yMjV5LMJX0CXGRX5q57XuV/UJ4RkdX0ZuRdiVpAPpkHXWU5lJAHwtebV0swuDMkWKMQ==";

     

       2172
       2172
       +
               url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.3.tgz";

     

       2173
       2173
       +
               sha512 = "4rkWeVs6FaO4TcOVf5GnH5HTPOaVHJX9d1GnqF/Msh3IdhX1+v+c3s6HYmxDezkild27SYwrinqu89CWRUtM/A==";

     

       2165
       2174
        
             };

     

       2166
       2175
        
           };

     

       2167
       2176
        
           "@expo/results-1.0.0" = {

     
···

       2200
       2209
        
               sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==";

     

       2201
       2210
        
             };

     

       2202
       2211
        
           };

     

       2203
       2203
       -
           "@expo/webpack-config-0.12.74" = {

     

       2212
       2212
       +
           "@expo/webpack-config-0.12.76" = {

     

       2204
       2213
        
             name = "_at_expo_slash_webpack-config";

     

       2205
       2214
        
             packageName = "@expo/webpack-config";

     

       2206
       2206
       -
             version = "0.12.74";

     

       2215
       2215
       +
             version = "0.12.76";

     

       2207
       2216
        
             src = fetchurl {

     

       2208
       2208
       -
               url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.74.tgz";

     

       2209
       2209
       -
               sha512 = "xYyiin5uvRwRC3ehqRxb+MSzv9ArJSb3spOgl4yNZPkojXUbNjgyC3xfliVAH7ZuRMlEgL1Is7miixVe69ftYw==";

     

       2217
       2217
       +
               url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.76.tgz";

     

       2218
       2218
       +
               sha512 = "8Q4sH+KBgM9jsH7Dp0A5lEmGiKvBXNcax2H6k8i54vfptaUh8gBZqohGuLshzeTJYT43I3LDulheOGr83yNB3g==";

     

       2210
       2219
        
             };

     

       2211
       2220
        
           };

     

       2212
       2221
        
           "@expo/xcpretty-2.0.1" = {

     
···

       3109
       3118
        
               sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ==";

     

       3110
       3119
        
             };

     

       3111
       3120
        
           };

     

       3112
       3112
       -
           "@joplin/fork-htmlparser2-4.1.24" = {

     

       3121
       3121
       +
           "@joplin/fork-htmlparser2-4.1.26" = {

     

       3113
       3122
        
             name = "_at_joplin_slash_fork-htmlparser2";

     

       3114
       3123
        
             packageName = "@joplin/fork-htmlparser2";

     

       3115
       3115
       -
             version = "4.1.24";

     

       3124
       3124
       +
             version = "4.1.26";

     

       3116
       3125
        
             src = fetchurl {

     

       3117
       3117
       -
               url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.24.tgz";

     

       3118
       3118
       -
               sha512 = "lggBrPT0Lg/WcD7oe166HbpAS+ajQwSNAzUl8pYBhNChJzjbngJxm5hs94xYJ3qDzyxHRMU+x4iTZAn0/SNFDQ==";

     

       3126
       3126
       +
               url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.26.tgz";

     

       3127
       3127
       +
               sha512 = "ltw7n6MdZyz+oM8DUzOxDeVPdOs/ZTavkmHeP4mp7FE4HYyU7ynhRAVsBpGmzRbXTCYXzl6QHVtocKEUZHkbSg==";

     

       3119
       3128
        
             };

     

       3120
       3129
        
           };

     

       3121
       3121
       -
           "@joplin/fork-sax-1.2.28" = {

     

       3130
       3130
       +
           "@joplin/fork-sax-1.2.30" = {

     

       3122
       3131
        
             name = "_at_joplin_slash_fork-sax";

     

       3123
       3132
        
             packageName = "@joplin/fork-sax";

     

       3124
       3124
       -
             version = "1.2.28";

     

       3133
       3133
       +
             version = "1.2.30";

     

       3125
       3134
        
             src = fetchurl {

     

       3126
       3126
       -
               url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.28.tgz";

     

       3127
       3127
       -
               sha512 = "oWUpaBZlfUC+dGJqmb8hwwgjk3dSHcKL7e8n1LpmkUBqqdh1lxLrrFoGqYpKiSBgDY0KTIdyB8S8INBMlY+l7A==";

     

       3135
       3135
       +
               url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.30.tgz";

     

       3136
       3136
       +
               sha512 = "cRSVysAJwLnaRbFRGHCLDl3rB980iLThCDVwL5lVLpaB43pk+0GVJF3k288mJ1U20mPoZqwc0hV8C0Q5oDMKHw==";

     

       3128
       3137
        
             };

     

       3129
       3138
        
           };

     

       3130
       3139
        
           "@joplin/lib-1.8.2" = {

     
···

       3145
       3154
        
               sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ==";

     

       3146
       3155
        
             };

     

       3147
       3156
        
           };

     

       3148
       3148
       -
           "@joplin/turndown-4.0.46" = {

     

       3157
       3157
       +
           "@joplin/turndown-4.0.48" = {

     

       3149
       3158
        
             name = "_at_joplin_slash_turndown";

     

       3150
       3159
        
             packageName = "@joplin/turndown";

     

       3151
       3151
       -
             version = "4.0.46";

     

       3160
       3160
       +
             version = "4.0.48";

     

       3152
       3161
        
             src = fetchurl {

     

       3153
       3153
       -
               url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.46.tgz";

     

       3154
       3154
       -
               sha512 = "OqI9DFEKdEOxfQUkbfRiWpNfDXf+/E4u9c9hXVRK66xFrVkZww7FBmoGqIMHzOrKeQBIPZQuHCav31cFl7oMCQ==";

     

       3162
       3162
       +
               url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.48.tgz";

     

       3163
       3163
       +
               sha512 = "QJeys/bR9qtEdUs8EFfpwRTfu01+iGQ6GaW+gxQjgXttsmfV+NuoVWfz5/NCdZ+9hqF6DdE9tU45G4EX1diFJA==";

     

       3155
       3164
        
             };

     

       3156
       3165
        
           };

     

       3157
       3157
       -
           "@joplin/turndown-plugin-gfm-1.0.28" = {

     

       3166
       3166
       +
           "@joplin/turndown-plugin-gfm-1.0.30" = {

     

       3158
       3167
        
             name = "_at_joplin_slash_turndown-plugin-gfm";

     

       3159
       3168
        
             packageName = "@joplin/turndown-plugin-gfm";

     

       3160
       3160
       -
             version = "1.0.28";

     

       3169
       3169
       +
             version = "1.0.30";

     

       3161
       3170
        
             src = fetchurl {

     

       3162
       3162
       -
               url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.28.tgz";

     

       3163
       3163
       -
               sha512 = "CAmcFWK2bgAgQq3h+xEKjjk8/7v8ZaY2ixHDoiSCRiSqv868EuAQLCks6Ox4rq35R2yX8FK/pHeciRpZo5wNcg==";

     

       3171
       3171
       +
               url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.30.tgz";

     

       3172
       3172
       +
               sha512 = "81syBeLWxduhIM+gZSdM9OGOBL5XXFSMymwfWSFTzS8svYx/I95TPwq0oERcIz6rZkeqf6C9Q52iY30GvKEOog==";

     

       3164
       3173
        
             };

     

       3165
       3174
        
           };

     

       3166
       3175
        
           "@josephg/resolvable-1.0.1" = {

     
···

       3811
       3820
        
               sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";

     

       3812
       3821
        
             };

     

       3813
       3822
        
           };

     

       3814
       3814
       -
           "@microsoft/load-themed-styles-1.10.173" = {

     

       3823
       3823
       +
           "@microsoft/load-themed-styles-1.10.174" = {

     

       3815
       3824
        
             name = "_at_microsoft_slash_load-themed-styles";

     

       3816
       3825
        
             packageName = "@microsoft/load-themed-styles";

     

       3817
       3817
       -
             version = "1.10.173";

     

       3826
       3826
       +
             version = "1.10.174";

     

       3818
       3827
        
             src = fetchurl {

     

       3819
       3819
       -
               url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.173.tgz";

     

       3820
       3820
       -
               sha512 = "Bi4U2IQr5uWl1RVhCZduWO04em4CbYcH6cvmgvkN2K09kFW9VSQ4qAQYnnZ6w8HOCOsa3BJaHtGq+TTOP4eYkg==";

     

       3828
       3828
       +
               url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.174.tgz";

     

       3829
       3829
       +
               sha512 = "O0ERVgeTrpzCzCLHOTZZDSg0K3FKdWRdBpFjs+X5wS21Jg21QqrA4T9FhCheilEcrF4Qmf41gBtgZ/16JNSWIA==";

     

       3821
       3830
        
             };

     

       3822
       3831
        
           };

     

       3823
       3832
        
           "@mitmaro/errors-1.0.0" = {

     
···

       3883
       3892
        
               sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";

     

       3884
       3893
        
             };

     

       3885
       3894
        
           };

     

       3886
       3886
       -
           "@netlify/build-11.29.0" = {

     

       3895
       3895
       +
           "@netlify/build-11.29.2" = {

     

       3887
       3896
        
             name = "_at_netlify_slash_build";

     

       3888
       3897
        
             packageName = "@netlify/build";

     

       3889
       3889
       -
             version = "11.29.0";

     

       3898
       3898
       +
             version = "11.29.2";

     

       3890
       3899
        
             src = fetchurl {

     

       3891
       3891
       -
               url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.0.tgz";

     

       3892
       3892
       -
               sha512 = "e5tmKxHORmJABpgSdlylXBnhibwHZGdSTZWJa3eVIHSMwRC5xK37TLi+HmSL+AeCEqaHozFhHedsdgkKB9figw==";

     

       3900
       3900
       +
               url = "https://registry.npmjs.org/@netlify/build/-/build-11.29.2.tgz";

     

       3901
       3901
       +
               sha512 = "fxVBpKjsTdcRkfj9RdMBVxy/TABQJhkf5/vFwzNZqnnBwes/Em6YFutNpML6zm5Ub9hpvE0HaceyOU4HkvjSFg==";

     

       3893
       3902
        
             };

     

       3894
       3903
        
           };

     

       3895
       3904
        
           "@netlify/cache-utils-1.0.7" = {

     
···

       3910
       3919
        
               sha512 = "4DyiSauSFaorJ46l4tBu+nbvPKY9i1gOQvw9L4yql7gd7qqJsHJi2zivdJ50+MPedQn0cgcs5lk303UBEfFsBQ==";

     

       3911
       3920
        
             };

     

       3912
       3921
        
           };

     

       3913
       3913
       -
           "@netlify/framework-info-5.0.0" = {

     

       3922
       3922
       +
           "@netlify/framework-info-5.1.2" = {

     

       3914
       3923
        
             name = "_at_netlify_slash_framework-info";

     

       3915
       3924
        
             packageName = "@netlify/framework-info";

     

       3916
       3916
       -
             version = "5.0.0";

     

       3925
       3925
       +
             version = "5.1.2";

     

       3917
       3926
        
             src = fetchurl {

     

       3918
       3918
       -
               url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.0.0.tgz";

     

       3919
       3919
       -
               sha512 = "EVyCVfSi9SKI7siVqAggQ4gsgkjzIxpUgUwh6ChNw7wQ8UykZ4gqYJjtw81VrxNqGV37yyI3Upy1u3MeusLLig==";

     

       3927
       3927
       +
               url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.1.2.tgz";

     

       3928
       3928
       +
               sha512 = "v3Fs9REofVNMgye8j1c0NBfVRA+P+2cS50Y1RRwrlVz344UUwZd7b0LKhZl0EkQadsdyxG2a3XgjxF5Zb3jJ0Q==";

     

       3920
       3929
        
             };

     

       3921
       3930
        
           };

     

       3922
       3922
       -
           "@netlify/functions-utils-1.3.35" = {

     

       3931
       3931
       +
           "@netlify/functions-utils-1.3.37" = {

     

       3923
       3932
        
             name = "_at_netlify_slash_functions-utils";

     

       3924
       3933
        
             packageName = "@netlify/functions-utils";

     

       3925
       3925
       -
             version = "1.3.35";

     

       3934
       3934
       +
             version = "1.3.37";

     

       3926
       3935
        
             src = fetchurl {

     

       3927
       3927
       -
               url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.35.tgz";

     

       3928
       3928
       -
               sha512 = "b607BKWwh81DDDLEW+430v0MJka71Rr5aIeEUtkWqPe6Io+ei6DjqIJJrHsBnNh0vWXeo0Stf3f1kMAA2P+fUA==";

     

       3936
       3936
       +
               url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.37.tgz";

     

       3937
       3937
       +
               sha512 = "Lq1Aj3N2vWB3nNFRbEHgVjB+MpwCsZz+rUOCki3h5PwEUwnGFyFi2VcdHQ2FJtzF7vrcm5NoMfg4pG8iY91YGA==";

     

       3929
       3938
        
             };

     

       3930
       3939
        
           };

     

       3931
       3940
        
           "@netlify/git-utils-1.0.11" = {

     
···

       3946
       3955
        
               sha512 = "ffNpGiJulY4is1pWkrs1dn3/ytNoqJxyAD/N70cnkIVNpOWMnPGSPKGBk/TBpaZhispgSBBQ+JZXEMJAGMDZ6Q==";

     

       3947
       3956
        
             };

     

       3948
       3957
        
           };

     

       3949
       3949
       -
           "@netlify/plugin-edge-handlers-1.11.12" = {

     

       3958
       3958
       +
           "@netlify/plugin-edge-handlers-1.11.13" = {

     

       3950
       3959
        
             name = "_at_netlify_slash_plugin-edge-handlers";

     

       3951
       3960
        
             packageName = "@netlify/plugin-edge-handlers";

     

       3952
       3952
       -
             version = "1.11.12";

     

       3961
       3961
       +
             version = "1.11.13";

     

       3953
       3962
        
             src = fetchurl {

     

       3954
       3954
       -
               url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.12.tgz";

     

       3955
       3955
       -
               sha512 = "zbQkQHho/SkTTTOsRBvVvx74IEMsLHL/FxJYhkfgMXwXTQSsq35/pRRYq6TfQyRBSlUkllDRmTOB+f2DQCvQrw==";

     

       3963
       3963
       +
               url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.13.tgz";

     

       3964
       3964
       +
               sha512 = "GPSg5bYlU2hgmt1MGx22+ZoXbPdnEiqkdj40hWxJjHuDIGqfvFa3nGup7BvHBNfd1uI+OVSlLXzabWl6aVjQIg==";

     

       3956
       3965
        
             };

     

       3957
       3966
        
           };

     

       3958
       3967
        
           "@netlify/plugins-list-2.14.2" = {

     
···

       4009
       4018
        
               sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g==";

     

       4010
       4019
        
             };

     

       4011
       4020
        
           };

     

       4012
       4012
       -
           "@netlify/zip-it-and-ship-it-4.2.1" = {

     

       4021
       4021
       +
           "@netlify/zip-it-and-ship-it-4.2.5" = {

     

       4013
       4022
        
             name = "_at_netlify_slash_zip-it-and-ship-it";

     

       4014
       4023
        
             packageName = "@netlify/zip-it-and-ship-it";

     

       4015
       4015
       -
             version = "4.2.1";

     

       4024
       4024
       +
             version = "4.2.5";

     

       4016
       4025
        
             src = fetchurl {

     

       4017
       4017
       -
               url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.1.tgz";

     

       4018
       4018
       -
               sha512 = "IWh/VhLOH1412Mm1eBBKktV1SeSJHAiBehhdFMTrKJfFdK7vh+TylNImc/wuGCAdci85FXOWQ+YpnMOibhGvng==";

     

       4026
       4026
       +
               url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.2.5.tgz";

     

       4027
       4027
       +
               sha512 = "2ncCQEs49I8Ir30w2T3E1yogJp9cw+X8vfvL9a8i1AA0VE51F2rfhNsLbceWrEWn2T3TgogOMQP/0Qsxw2v0Tg==";

     

       4019
       4028
        
             };

     

       4020
       4029
        
           };

     

       4021
       4030
        
           "@node-red/editor-api-1.3.5" = {

     
···

       4495
       4504
        
               sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A==";

     

       4496
       4505
        
             };

     

       4497
       4506
        
           };

     

       4498
       4498
       -
           "@ot-builder/bin-composite-types-1.0.7" = {

     

       4507
       4507
       +
           "@ot-builder/bin-composite-types-1.0.8" = {

     

       4499
       4508
        
             name = "_at_ot-builder_slash_bin-composite-types";

     

       4500
       4509
        
             packageName = "@ot-builder/bin-composite-types";

     

       4501
       4501
       -
             version = "1.0.7";

     

       4510
       4510
       +
             version = "1.0.8";

     

       4502
       4511
        
             src = fetchurl {

     

       4503
       4503
       -
               url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.7.tgz";

     

       4504
       4504
       -
               sha512 = "JGXpefpLj/FDhhTldcVbw4tXW5OBBbHalfOCiR7Af6SOdHD2Fy3gXSrkuULFS/4t8lw0byREhjCHZ3mKbOdCjw==";

     

       4512
       4512
       +
               url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.8.tgz";

     

       4513
       4513
       +
               sha512 = "YVSC2OhhBYx4nTELZrS/DKbdseDhCIlyMiey4Zgc6VKQgC33ZXaGB9gUnAT/CHuGJINQJoKtsgyRA3nkd+2QJw==";

     

       4505
       4514
        
             };

     

       4506
       4515
        
           };

     

       4507
       4507
       -
           "@ot-builder/bin-util-1.0.7" = {

     

       4516
       4516
       +
           "@ot-builder/bin-util-1.0.8" = {

     

       4508
       4517
        
             name = "_at_ot-builder_slash_bin-util";

     

       4509
       4518
        
             packageName = "@ot-builder/bin-util";

     

       4510
       4510
       -
             version = "1.0.7";

     

       4519
       4519
       +
             version = "1.0.8";

     

       4511
       4520
        
             src = fetchurl {

     

       4512
       4512
       -
               url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.7.tgz";

     

       4513
       4513
       -
               sha512 = "diiALKLHQwiyQJ1hDrLdPNfZXs0GXtOm5QDYn1U/gJWewCfgWr1LVwX8+QzwgVEI/QuZi+A3G0I6qqvegPrEGg==";

     

       4521
       4521
       +
               url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.8.tgz";

     

       4522
       4522
       +
               sha512 = "GkyOMuUD3AQGCguvyaAgraEc7DMsKAHoujFPSUN76h6C9LUYGmayCDsbHjZoInkb90+m2OXcZ9hqSCIThZ6dcA==";

     

       4514
       4523
        
             };

     

       4515
       4524
        
           };

     

       4516
       4516
       -
           "@ot-builder/cli-help-shower-1.0.7" = {

     

       4525
       4525
       +
           "@ot-builder/cli-help-shower-1.0.8" = {

     

       4517
       4526
        
             name = "_at_ot-builder_slash_cli-help-shower";

     

       4518
       4527
        
             packageName = "@ot-builder/cli-help-shower";

     

       4519
       4519
       -
             version = "1.0.7";

     

       4528
       4528
       +
             version = "1.0.8";

     

       4520
       4529
        
             src = fetchurl {

     

       4521
       4521
       -
               url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.7.tgz";

     

       4522
       4522
       -
               sha512 = "SsipXPTXTAWlxXVFvWd+TY01gWC/3VSp8l4Cs1p1PguzourRyWtLD6y8prQV+zvuARDJ+XLjn3Fy1RoL3PMjiA==";

     

       4530
       4530
       +
               url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.8.tgz";

     

       4531
       4531
       +
               sha512 = "MXbzoFtpSbU9eQozzynlEPRjUBDbtDq187SylpYIeV7FARfkaKd7f8M6FDH+gqeNMeAUcivnMYifAC+nz8bWOA==";

     

       4523
       4532
        
             };

     

       4524
       4533
        
           };

     

       4525
       4525
       -
           "@ot-builder/cli-proc-1.0.7" = {

     

       4534
       4534
       +
           "@ot-builder/cli-proc-1.0.8" = {

     

       4526
       4535
        
             name = "_at_ot-builder_slash_cli-proc";

     

       4527
       4536
        
             packageName = "@ot-builder/cli-proc";

     

       4528
       4528
       -
             version = "1.0.7";

     

       4537
       4537
       +
             version = "1.0.8";

     

       4529
       4538
        
             src = fetchurl {

     

       4530
       4530
       -
               url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.7.tgz";

     

       4531
       4531
       -
               sha512 = "cDCfKjsnu0iGrEoAR2XCoZfIjo9WXu8Xdhc3VTyBfV9tmrUpyh9t/9YCRyq6haFU69l9BzoDC3Vsl32vh27eSQ==";

     

       4539
       4539
       +
               url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.8.tgz";

     

       4540
       4540
       +
               sha512 = "kOGCHlc7cSI8J24gCRHXNbl4IvsjdorRUX9L3HtDDH9pVpHqVrlb3X2opcNVtPo0kYbKidANEGf76c/WRi0ERQ==";

     

       4532
       4541
        
             };

     

       4533
       4542
        
           };

     

       4534
       4534
       -
           "@ot-builder/cli-shared-1.0.7" = {

     

       4543
       4543
       +
           "@ot-builder/cli-shared-1.0.8" = {

     

       4535
       4544
        
             name = "_at_ot-builder_slash_cli-shared";

     

       4536
       4545
        
             packageName = "@ot-builder/cli-shared";

     

       4537
       4537
       -
             version = "1.0.7";

     

       4546
       4546
       +
             version = "1.0.8";

     

       4538
       4547
        
             src = fetchurl {

     

       4539
       4539
       -
               url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.7.tgz";

     

       4540
       4540
       -
               sha512 = "BPBEpZQ04KFHFMlR/xDGLYjGihwI6b22UfgQolckpySKduk328Li4dE7kUBKPpoLsWAF6Z+SMImHifrcNkOwOQ==";

     

       4548
       4548
       +
               url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.8.tgz";

     

       4549
       4549
       +
               sha512 = "B5c0RqrRkB8gb7h0+mX+JQAP6I8TtnLD8JiYRGMo+JszI2anh7ecD3XbVgMF0oJi8e5r5+p0xq8sDrJi4qy9SQ==";

     

       4541
       4550
        
             };

     

       4542
       4551
        
           };

     

       4543
       4543
       -
           "@ot-builder/common-impl-1.0.7" = {

     

       4552
       4552
       +
           "@ot-builder/common-impl-1.0.8" = {

     

       4544
       4553
        
             name = "_at_ot-builder_slash_common-impl";

     

       4545
       4554
        
             packageName = "@ot-builder/common-impl";

     

       4546
       4546
       -
             version = "1.0.7";

     

       4555
       4555
       +
             version = "1.0.8";

     

       4547
       4556
        
             src = fetchurl {

     

       4548
       4548
       -
               url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.7.tgz";

     

       4549
       4549
       -
               sha512 = "alYW8r3tH33cK87Dnmz4TaPxOR6ViA249OZYhkdbMVKz4Dj1LBceXdpJp7NgcQbLDSIqzB+yI4/zEQEYFIg4cQ==";

     

       4557
       4557
       +
               url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.8.tgz";

     

       4558
       4558
       +
               sha512 = "ho7WtOf+MiMq6jjF6LbepqTTnyzEv6OeNTT1erkdWb52QETZnINYtbMks/HVPYHnGMZqy62dmN8f1PSe74yD0A==";

     

       4550
       4559
        
             };

     

       4551
       4560
        
           };

     

       4552
       4552
       -
           "@ot-builder/errors-1.0.7" = {

     

       4561
       4561
       +
           "@ot-builder/errors-1.0.8" = {

     

       4553
       4562
        
             name = "_at_ot-builder_slash_errors";

     

       4554
       4563
        
             packageName = "@ot-builder/errors";

     

       4555
       4555
       -
             version = "1.0.7";

     

       4564
       4564
       +
             version = "1.0.8";

     

       4556
       4565
        
             src = fetchurl {

     

       4557
       4557
       -
               url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.7.tgz";

     

       4558
       4558
       -
               sha512 = "iHBTQuIzgoojViqQlduL8LJhX+hUpvQZb34oV0foTBMLBUL444q9WgBoOq1YfE34eizxuEXi2tUf2wHI1Lsw0g==";

     

       4566
       4566
       +
               url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.8.tgz";

     

       4567
       4567
       +
               sha512 = "I8XzcO4tg8rWKFTS3nHKvPOE27uGH8fZLy9HsqU4yw8rGMYUo1EDxabReQ8v53DhrIlpbObW3/nSrGF4LT6m8Q==";

     

       4559
       4568
        
             };

     

       4560
       4569
        
           };

     

       4561
       4561
       -
           "@ot-builder/io-bin-cff-1.0.7" = {

     

       4570
       4570
       +
           "@ot-builder/io-bin-cff-1.0.8" = {

     

       4562
       4571
        
             name = "_at_ot-builder_slash_io-bin-cff";

     

       4563
       4572
        
             packageName = "@ot-builder/io-bin-cff";

     

       4564
       4564
       -
             version = "1.0.7";

     

       4573
       4573
       +
             version = "1.0.8";

     

       4565
       4574
        
             src = fetchurl {

     

       4566
       4566
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.7.tgz";

     

       4567
       4567
       -
               sha512 = "bnI4ZTTzZkx70KjVBlMv4LrarFKV8mDGcYOY2ZreWGDg0netY9lMUNmCXvEOOx1g4SX619wf1UWx599vepsZcQ==";

     

       4575
       4575
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.8.tgz";

     

       4576
       4576
       +
               sha512 = "rHp9PFGeoblPwuCZd/i5l/CgNGv9hWEDQHZP11uQcO45H83iZugVxaT65ChBHoKDFp5x/+oxLSxp6kMu/7diZg==";

     

       4568
       4577
        
             };

     

       4569
       4578
        
           };

     

       4570
       4570
       -
           "@ot-builder/io-bin-encoding-1.0.7" = {

     

       4579
       4579
       +
           "@ot-builder/io-bin-encoding-1.0.8" = {

     

       4571
       4580
        
             name = "_at_ot-builder_slash_io-bin-encoding";

     

       4572
       4581
        
             packageName = "@ot-builder/io-bin-encoding";

     

       4573
       4573
       -
             version = "1.0.7";

     

       4582
       4582
       +
             version = "1.0.8";

     

       4574
       4583
        
             src = fetchurl {

     

       4575
       4575
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.7.tgz";

     

       4576
       4576
       -
               sha512 = "HWybHlIZfD/lsC9XjCmkq4EHNV8jv7/TBKZBC61DZuqe2P1IldKVSTg73si133/IHGP49qMyVplmF3ihq29hUQ==";

     

       4584
       4584
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.8.tgz";

     

       4585
       4585
       +
               sha512 = "bP7U7cr3fkdM3jYtW6fSgBfqjIcVKJu3iZfAOtcP0o+aID6FbETWGpxYrfGcJuvjcQLDPhc0pda1Ag/ypeTnvg==";

     

       4577
       4586
        
             };

     

       4578
       4587
        
           };

     

       4579
       4579
       -
           "@ot-builder/io-bin-ext-private-1.0.7" = {

     

       4588
       4588
       +
           "@ot-builder/io-bin-ext-private-1.0.8" = {

     

       4580
       4589
        
             name = "_at_ot-builder_slash_io-bin-ext-private";

     

       4581
       4590
        
             packageName = "@ot-builder/io-bin-ext-private";

     

       4582
       4582
       -
             version = "1.0.7";

     

       4591
       4591
       +
             version = "1.0.8";

     

       4583
       4592
        
             src = fetchurl {

     

       4584
       4584
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.7.tgz";

     

       4585
       4585
       -
               sha512 = "McugROG+MkmqDqJGIh6zHNO2s7k/gido1T4Ow/dmNQBRYUSikRLOm+eusUP7X2dV1H148fIGbIJYXjldTVwyKw==";

     

       4593
       4593
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.8.tgz";

     

       4594
       4594
       +
               sha512 = "RTCaiGvbO340gLHh2omj62v0ysOE+rEdcVuISiIb08fo0azLsi+MvzQdwprCOc1+8s5wY/peDCQ38HN/gYC7dA==";

     

       4586
       4595
        
             };

     

       4587
       4596
        
           };

     

       4588
       4588
       -
           "@ot-builder/io-bin-font-1.0.7" = {

     

       4597
       4597
       +
           "@ot-builder/io-bin-font-1.0.8" = {

     

       4589
       4598
        
             name = "_at_ot-builder_slash_io-bin-font";

     

       4590
       4599
        
             packageName = "@ot-builder/io-bin-font";

     

       4591
       4591
       -
             version = "1.0.7";

     

       4600
       4600
       +
             version = "1.0.8";

     

       4592
       4601
        
             src = fetchurl {

     

       4593
       4593
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.7.tgz";

     

       4594
       4594
       -
               sha512 = "gN6QQ90Kg29GQS5DW9HSk7z/BHccdZTFIPA7z2xbhb94b+r7gvkt+MGFFTpPdh+7JEFUGhKkHcv05fRh1kDOGw==";

     

       4602
       4602
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.8.tgz";

     

       4603
       4603
       +
               sha512 = "6cL1cn7Qmzu1bsx4hr2aqKCMVu1+Si2xA8uGEVOryD94odjX76HJMta4bjH9P///PcQdIeJDczpk1s21LPg6Cw==";

     

       4595
       4604
        
             };

     

       4596
       4605
        
           };

     

       4597
       4597
       -
           "@ot-builder/io-bin-glyph-store-1.0.7" = {

     

       4606
       4606
       +
           "@ot-builder/io-bin-glyph-store-1.0.8" = {

     

       4598
       4607
        
             name = "_at_ot-builder_slash_io-bin-glyph-store";

     

       4599
       4608
        
             packageName = "@ot-builder/io-bin-glyph-store";

     

       4600
       4600
       -
             version = "1.0.7";

     

       4609
       4609
       +
             version = "1.0.8";

     

       4601
       4610
        
             src = fetchurl {

     

       4602
       4602
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.7.tgz";

     

       4603
       4603
       -
               sha512 = "AI0/pOqaWxhvuKIk5Rm1aRVCuVDJj/F34L9t6F5fvUhkOha6+FOwkZdXaVzUF82396CdVYY7X4D6m+YOjDCQXA==";

     

       4611
       4611
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.8.tgz";

     

       4612
       4612
       +
               sha512 = "vqr4pyK1oa3ADPUydKQgWZHKk1WAjO7hmMYARbqKzUCPHrqrr2dXJHMW8RNg+JhQykhG0ibHf6NdjHklBzTWIQ==";

     

       4604
       4613
        
             };

     

       4605
       4614
        
           };

     

       4606
       4606
       -
           "@ot-builder/io-bin-layout-1.0.7" = {

     

       4615
       4615
       +
           "@ot-builder/io-bin-layout-1.0.8" = {

     

       4607
       4616
        
             name = "_at_ot-builder_slash_io-bin-layout";

     

       4608
       4617
        
             packageName = "@ot-builder/io-bin-layout";

     

       4609
       4609
       -
             version = "1.0.7";

     

       4618
       4618
       +
             version = "1.0.8";

     

       4610
       4619
        
             src = fetchurl {

     

       4611
       4611
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.7.tgz";

     

       4612
       4612
       -
               sha512 = "Y0UOiIkNPlbzUcJ4yccTrgS8lwLGHlleJkntTKnMIcYbXhMYTARhiJOZYJ7RjSzZ5n01bpejzGeXYCt4YpfwNw==";

     

       4620
       4620
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.8.tgz";

     

       4621
       4621
       +
               sha512 = "0xrUl6WPQLpRwsVQXh1aBF28f7gJ0OR7N9xK5CZLsEku6R/uEGPSR0K9xlw8L+74J/ZWCX/WkbNgvvNUfyQLcw==";

     

       4613
       4622
        
             };

     

       4614
       4623
        
           };

     

       4615
       4615
       -
           "@ot-builder/io-bin-metadata-1.0.7" = {

     

       4624
       4624
       +
           "@ot-builder/io-bin-metadata-1.0.8" = {

     

       4616
       4625
        
             name = "_at_ot-builder_slash_io-bin-metadata";

     

       4617
       4626
        
             packageName = "@ot-builder/io-bin-metadata";

     

       4618
       4618
       -
             version = "1.0.7";

     

       4627
       4627
       +
             version = "1.0.8";

     

       4619
       4628
        
             src = fetchurl {

     

       4620
       4620
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.7.tgz";

     

       4621
       4621
       -
               sha512 = "Ze5D2ngX6bSM1Rjm9/0OWUKWVEJRE69ck/aIt1b3cAkreu8p1ldsPMFSL02LcmUpUhGTUCgUzqfhyq3eDC/46Q==";

     

       4629
       4629
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.8.tgz";

     

       4630
       4630
       +
               sha512 = "hgkeZy8JI5pgr3B0ayLDHxOxuIDRSnK/PRxZBydOCsArcW61N8cEPv/DzMKS3iNY0hpTUghZ7INLWC5+0KL63g==";

     

       4622
       4631
        
             };

     

       4623
       4632
        
           };

     

       4624
       4624
       -
           "@ot-builder/io-bin-metric-1.0.7" = {

     

       4633
       4633
       +
           "@ot-builder/io-bin-metric-1.0.8" = {

     

       4625
       4634
        
             name = "_at_ot-builder_slash_io-bin-metric";

     

       4626
       4635
        
             packageName = "@ot-builder/io-bin-metric";

     

       4627
       4627
       -
             version = "1.0.7";

     

       4636
       4636
       +
             version = "1.0.8";

     

       4628
       4637
        
             src = fetchurl {

     

       4629
       4629
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.7.tgz";

     

       4630
       4630
       -
               sha512 = "DILo1KPj6ZP8VOZIeXCLGXRwgzSmxwGlqjv5b36j+Z+YoOs3pUqrpGz1KK1hWR/URQvDjEXMIWI3bFsiVFgxXw==";

     

       4638
       4638
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.8.tgz";

     

       4639
       4639
       +
               sha512 = "dKtTJ8AB1VWj/WYv9i+qhm6uKcwdC++MqQiaTLA7/eCnG9O2QjfTbOptYr6KI3+BKwe6/tbyzrqj7G5ZaVmtKA==";

     

       4631
       4640
        
             };

     

       4632
       4641
        
           };

     

       4633
       4633
       -
           "@ot-builder/io-bin-name-1.0.7" = {

     

       4642
       4642
       +
           "@ot-builder/io-bin-name-1.0.8" = {

     

       4634
       4643
        
             name = "_at_ot-builder_slash_io-bin-name";

     

       4635
       4644
        
             packageName = "@ot-builder/io-bin-name";

     

       4636
       4636
       -
             version = "1.0.7";

     

       4645
       4645
       +
             version = "1.0.8";

     

       4637
       4646
        
             src = fetchurl {

     

       4638
       4638
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.7.tgz";

     

       4639
       4639
       -
               sha512 = "NmIXTMXGJ4kP8eIKx99u620b9XSSUinZT47KKxjqtYLLuZcsmaToh/eUN7Z4XSMDKO33PeNwWlXNcDAkC82K6g==";

     

       4647
       4647
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.8.tgz";

     

       4648
       4648
       +
               sha512 = "p93QSIEoBXtRyBEWI4KLuTTh3EtJTsoSeM7Ifopga7sCPDWFky5GeRqTq+Mvlk0cPiJtV24qdPdaIem5r5PBmg==";

     

       4640
       4649
        
             };

     

       4641
       4650
        
           };

     

       4642
       4642
       -
           "@ot-builder/io-bin-sfnt-1.0.7" = {

     

       4651
       4651
       +
           "@ot-builder/io-bin-sfnt-1.0.8" = {

     

       4643
       4652
        
             name = "_at_ot-builder_slash_io-bin-sfnt";

     

       4644
       4653
        
             packageName = "@ot-builder/io-bin-sfnt";

     

       4645
       4645
       -
             version = "1.0.7";

     

       4654
       4654
       +
             version = "1.0.8";

     

       4646
       4655
        
             src = fetchurl {

     

       4647
       4647
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.7.tgz";

     

       4648
       4648
       -
               sha512 = "CtjuqqR+QjEXwo630PPtvW7RYxqfekFGqIZkYHbHI8SnBXGv70jB62itEszuJcipAqfcHBO7ndCCQU9dY/7N3g==";

     

       4656
       4656
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.8.tgz";

     

       4657
       4657
       +
               sha512 = "2yogXf3cdd6dI022HPU6lnzL10KU4DOOALkeg84qQCmse0WZdhZAKhdn08sqHIJ+EDjkfpRjHld0F96sKH8e0g==";

     

       4649
       4658
        
             };

     

       4650
       4659
        
           };

     

       4651
       4651
       -
           "@ot-builder/io-bin-ttf-1.0.7" = {

     

       4660
       4660
       +
           "@ot-builder/io-bin-ttf-1.0.8" = {

     

       4652
       4661
        
             name = "_at_ot-builder_slash_io-bin-ttf";

     

       4653
       4662
        
             packageName = "@ot-builder/io-bin-ttf";

     

       4654
       4654
       -
             version = "1.0.7";

     

       4663
       4663
       +
             version = "1.0.8";

     

       4655
       4664
        
             src = fetchurl {

     

       4656
       4656
       -
               url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.7.tgz";

     

       4657
       4657
       -
               sha512 = "47ZXRatZFx4E7WeFPMOhndkWxeW5uIgUCMu6bVZTxUnw8qRIHXfl+Vgcw9SPxBEod1/9RL0koFcbWIQj5RoE6Q==";

     

       4665
       4665
       +
               url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.8.tgz";

     

       4666
       4666
       +
               sha512 = "TaX7s9UFyoyajgig7944DgWFmEzzcGjVGz3qz3olgAZcHhrgLoqIlmaxt1jEHgb7LZx3wG4G9WwcSl6arqMdAQ==";

     

       4658
       4667
        
             };

     

       4659
       4668
        
           };

     

       4660
       4660
       -
           "@ot-builder/ot-1.0.7" = {

     

       4669
       4669
       +
           "@ot-builder/ot-1.0.8" = {

     

       4661
       4670
        
             name = "_at_ot-builder_slash_ot";

     

       4662
       4671
        
             packageName = "@ot-builder/ot";

     

       4663
       4663
       -
             version = "1.0.7";

     

       4672
       4672
       +
             version = "1.0.8";

     

       4664
       4673
        
             src = fetchurl {

     

       4665
       4665
       -
               url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.7.tgz";

     

       4666
       4666
       -
               sha512 = "kHdj0NcWHx+UetLZL+aVfMMTs+tQ/jEp3p+aaWGUI77lJF7ChRWpHdZx7TxnNaoz5/C4WkthHL9pcL0dr0DuPA==";

     

       4674
       4674
       +
               url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.8.tgz";

     

       4675
       4675
       +
               sha512 = "X2/4GcLGA1dTaR2+iHdhGn64cCLQJ9gZdoAVS3DZjMJIyyScFDVLAGhYHPLYk97EDQ5Pm7RnQNoY11U5igm28g==";

     

       4667
       4676
        
             };

     

       4668
       4677
        
           };

     

       4669
       4669
       -
           "@ot-builder/ot-encoding-1.0.7" = {

     

       4678
       4678
       +
           "@ot-builder/ot-encoding-1.0.8" = {

     

       4670
       4679
        
             name = "_at_ot-builder_slash_ot-encoding";

     

       4671
       4680
        
             packageName = "@ot-builder/ot-encoding";

     

       4672
       4672
       -
             version = "1.0.7";

     

       4681
       4681
       +
             version = "1.0.8";

     

       4673
       4682
        
             src = fetchurl {

     

       4674
       4674
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.7.tgz";

     

       4675
       4675
       -
               sha512 = "rM8bYLy+fAAqtO4lKNkpE6UdXlenJiKG7buGD/GwIcTyCLdmIh8V1iJkMm6g2EJ/CkSR9+6b+YnR38TeU2CFwA==";

     

       4683
       4683
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.8.tgz";

     

       4684
       4684
       +
               sha512 = "dRmxL8WUfjZAjd8RcSmd3wI442Gzy9i4X7Ock2rj0ZwVxlfQB7F3dx71IVgvSRbrkz2Ny+7htW3eq+V0be+cmw==";

     

       4676
       4685
        
             };

     

       4677
       4686
        
           };

     

       4678
       4678
       -
           "@ot-builder/ot-ext-private-1.0.7" = {

     

       4687
       4687
       +
           "@ot-builder/ot-ext-private-1.0.8" = {

     

       4679
       4688
        
             name = "_at_ot-builder_slash_ot-ext-private";

     

       4680
       4689
        
             packageName = "@ot-builder/ot-ext-private";

     

       4681
       4681
       -
             version = "1.0.7";

     

       4690
       4690
       +
             version = "1.0.8";

     

       4682
       4691
        
             src = fetchurl {

     

       4683
       4683
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.7.tgz";

     

       4684
       4684
       -
               sha512 = "P/+ZsjPRyR2tyKrUOXdXOfY1KrmeNo0zQ78jE5LVuOzv5DfC8+rIMnZlmlCwPmUS9mk6up5AapxFaJ+6REjhPw==";

     

       4692
       4692
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.8.tgz";

     

       4693
       4693
       +
               sha512 = "uloryF2vSRkIGHPqLN6FkAb1oZ6xkTR2w407PCgVYO9Pkq/j5d8ZHGM80VOYukfHFUdqskFyYcmojF/0WUA06A==";

     

       4685
       4694
        
             };

     

       4686
       4695
        
           };

     

       4687
       4687
       -
           "@ot-builder/ot-glyphs-1.0.7" = {

     

       4696
       4696
       +
           "@ot-builder/ot-glyphs-1.0.8" = {

     

       4688
       4697
        
             name = "_at_ot-builder_slash_ot-glyphs";

     

       4689
       4698
        
             packageName = "@ot-builder/ot-glyphs";

     

       4690
       4690
       -
             version = "1.0.7";

     

       4699
       4699
       +
             version = "1.0.8";

     

       4691
       4700
        
             src = fetchurl {

     

       4692
       4692
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.7.tgz";

     

       4693
       4693
       -
               sha512 = "JRg/9XwgyrTZOHSeA9oe11FUKC4ho4o9PZq6QtfQ2kyoRtsvHGeQNuBdJ50GOFz1AypMCowfSo6qPHly15IKnQ==";

     

       4701
       4701
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.8.tgz";

     

       4702
       4702
       +
               sha512 = "XP7pRUJPq/2dbDqzEAHWIFvwIdVK+BkZ/xPV75hGECEIquh7MpFKAXtLjRyFpVU+RRD0Xplmj/1P4W0047A4JQ==";

     

       4694
       4703
        
             };

     

       4695
       4704
        
           };

     

       4696
       4696
       -
           "@ot-builder/ot-layout-1.0.7" = {

     

       4705
       4705
       +
           "@ot-builder/ot-layout-1.0.8" = {

     

       4697
       4706
        
             name = "_at_ot-builder_slash_ot-layout";

     

       4698
       4707
        
             packageName = "@ot-builder/ot-layout";

     

       4699
       4699
       -
             version = "1.0.7";

     

       4708
       4708
       +
             version = "1.0.8";

     

       4700
       4709
        
             src = fetchurl {

     

       4701
       4701
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.7.tgz";

     

       4702
       4702
       -
               sha512 = "vg7AIL6HtsrdRfPi8HIP3UdikG3WB9nawSb1MOd9/wCjYvln/elikzxCDVxcMaV9ojrzqQYTa53PBZFTSGaR3g==";

     

       4710
       4710
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.8.tgz";

     

       4711
       4711
       +
               sha512 = "fRazZF4bTzyeYjFivbWim6/+dsWeGI6ZW6mCES5GmgidHzcFw2OrvDO1VYIKg5KSafjEZxe4QcMrF86bFkSDTg==";

     

       4703
       4712
        
             };

     

       4704
       4713
        
           };

     

       4705
       4705
       -
           "@ot-builder/ot-metadata-1.0.7" = {

     

       4714
       4714
       +
           "@ot-builder/ot-metadata-1.0.8" = {

     

       4706
       4715
        
             name = "_at_ot-builder_slash_ot-metadata";

     

       4707
       4716
        
             packageName = "@ot-builder/ot-metadata";

     

       4708
       4708
       -
             version = "1.0.7";

     

       4717
       4717
       +
             version = "1.0.8";

     

       4709
       4718
        
             src = fetchurl {

     

       4710
       4710
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.7.tgz";

     

       4711
       4711
       -
               sha512 = "y7p6yZ5anIrK2SpU4zLrgFZUWzYTUJzN2kvOVl7hCGLnRWLoQKmyGZ3cMF93BsuHiTRuAv2LoASrDIzup2uL2A==";

     

       4719
       4719
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.8.tgz";

     

       4720
       4720
       +
               sha512 = "p0z1ywytkvDVUivKV9m8dE7jFztnBFvn/WIqXgpxaqhzXcDIc5mDl1hca/1DJU1ZAwdR03fifEsniCz+3Vaynw==";

     

       4712
       4721
        
             };

     

       4713
       4722
        
           };

     

       4714
       4714
       -
           "@ot-builder/ot-name-1.0.7" = {

     

       4723
       4723
       +
           "@ot-builder/ot-name-1.0.8" = {

     

       4715
       4724
        
             name = "_at_ot-builder_slash_ot-name";

     

       4716
       4725
        
             packageName = "@ot-builder/ot-name";

     

       4717
       4717
       -
             version = "1.0.7";

     

       4726
       4726
       +
             version = "1.0.8";

     

       4718
       4727
        
             src = fetchurl {

     

       4719
       4719
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.7.tgz";

     

       4720
       4720
       -
               sha512 = "0y6hkn3v2Z6DgJwy1jjt0mXg+O6DNXbq0sZxKVN3iGvEo2dW9MVCIdDvFT3uEIeaA8Etbr7p2gMmUXh+7SWomQ==";

     

       4728
       4728
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.8.tgz";

     

       4729
       4729
       +
               sha512 = "P9X7Fwg7s27n4eTXJqh68Cfrg2K5x28JaIINdgIo4wnRNVfmc/JjH/Z5Rz5U3ahytUdY6+pS+YJAW9BYJ2DJOw==";

     

       4721
       4730
        
             };

     

       4722
       4731
        
           };

     

       4723
       4723
       -
           "@ot-builder/ot-sfnt-1.0.7" = {

     

       4732
       4732
       +
           "@ot-builder/ot-sfnt-1.0.8" = {

     

       4724
       4733
        
             name = "_at_ot-builder_slash_ot-sfnt";

     

       4725
       4734
        
             packageName = "@ot-builder/ot-sfnt";

     

       4726
       4726
       -
             version = "1.0.7";

     

       4735
       4735
       +
             version = "1.0.8";

     

       4727
       4736
        
             src = fetchurl {

     

       4728
       4728
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.7.tgz";

     

       4729
       4729
       -
               sha512 = "1DZQoSqirRPHOHpUcVBOo3M3s1DefEyLYVURwNQEH9HmJkcaNNAaZpBcqW2NtqGLQ/fUVeuM3cOI3Ek+4L+QGQ==";

     

       4737
       4737
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.8.tgz";

     

       4738
       4738
       +
               sha512 = "tfKv7EuSVKWgKFKOcdCMqWA6tCTf+bye3kWyYYJaG149w1YpzFqMMYk1uB95rL6cjJWvkphZdN2BSbEaUcD+sg==";

     

       4730
       4739
        
             };

     

       4731
       4740
        
           };

     

       4732
       4732
       -
           "@ot-builder/ot-standard-glyph-namer-1.0.7" = {

     

       4741
       4741
       +
           "@ot-builder/ot-standard-glyph-namer-1.0.8" = {

     

       4733
       4742
        
             name = "_at_ot-builder_slash_ot-standard-glyph-namer";

     

       4734
       4743
        
             packageName = "@ot-builder/ot-standard-glyph-namer";

     

       4735
       4735
       -
             version = "1.0.7";

     

       4744
       4744
       +
             version = "1.0.8";

     

       4736
       4745
        
             src = fetchurl {

     

       4737
       4737
       -
               url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.7.tgz";

     

       4738
       4738
       -
               sha512 = "9Icp+Bb6g6Su+7Q9thSiLtmzbHDU5dOlhAUFnrKmHBu13UGYXJBHoe2F6GQ7kDooSrIBvO7b3v61beY+Pi2fwg==";

     

       4746
       4746
       +
               url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.8.tgz";

     

       4747
       4747
       +
               sha512 = "sNEu9Ye5IdISzSaLnyNl/0ZwQY8DLUfvGuQs45JPT84WTpkB7c1BpndlSfcCDZaqdtTXN/tNS2fAN7TJm1g9Ig==";

     

       4739
       4748
        
             };

     

       4740
       4749
        
           };

     

       4741
       4741
       -
           "@ot-builder/prelude-1.0.7" = {

     

       4750
       4750
       +
           "@ot-builder/prelude-1.0.8" = {

     

       4742
       4751
        
             name = "_at_ot-builder_slash_prelude";

     

       4743
       4752
        
             packageName = "@ot-builder/prelude";

     

       4744
       4744
       -
             version = "1.0.7";

     

       4753
       4753
       +
             version = "1.0.8";

     

       4745
       4754
        
             src = fetchurl {

     

       4746
       4746
       -
               url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.7.tgz";

     

       4747
       4747
       -
               sha512 = "bh+7Tp847MvnwZYV7ghSJkekprxsEAPlCgGopTwBWhgk7So/8+RZK+a24VSK4qSNDCr8lNoYh9PSMO4mAR0j/Q==";

     

       4755
       4755
       +
               url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.8.tgz";

     

       4756
       4756
       +
               sha512 = "wknxzHrwwcN4m32P1FmYScTD03Vtj5mQWCx21NCzcsUyEfGasUvTzoPhOw5qUdklN3azFSjByfjpMUAjCRfnJg==";

     

       4748
       4757
        
             };

     

       4749
       4758
        
           };

     

       4750
       4750
       -
           "@ot-builder/primitive-1.0.7" = {

     

       4759
       4759
       +
           "@ot-builder/primitive-1.0.8" = {

     

       4751
       4760
        
             name = "_at_ot-builder_slash_primitive";

     

       4752
       4761
        
             packageName = "@ot-builder/primitive";

     

       4753
       4753
       -
             version = "1.0.7";

     

       4762
       4762
       +
             version = "1.0.8";

     

       4754
       4763
        
             src = fetchurl {

     

       4755
       4755
       -
               url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.7.tgz";

     

       4756
       4756
       -
               sha512 = "rvIDdf+20reSTbZWro6RcBwmIoeLE0r8wprUWEWP/hBEzbIvfTw4cik188zBjRXKhZUsAnLUynjeqokhP51Txw==";

     

       4764
       4764
       +
               url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.8.tgz";

     

       4765
       4765
       +
               sha512 = "jJydJoA67wop43AVcH+E+5Q2DU7epll1J6krs6Oz3Rrs7x2RB5fc79nWJMm8bHpKPB0xnA3zsLiJjERB7Ud9dw==";

     

       4757
       4766
        
             };

     

       4758
       4767
        
           };

     

       4759
       4759
       -
           "@ot-builder/rectify-1.0.7" = {

     

       4768
       4768
       +
           "@ot-builder/rectify-1.0.8" = {

     

       4760
       4769
        
             name = "_at_ot-builder_slash_rectify";

     

       4761
       4770
        
             packageName = "@ot-builder/rectify";

     

       4762
       4762
       -
             version = "1.0.7";

     

       4771
       4771
       +
             version = "1.0.8";

     

       4763
       4772
        
             src = fetchurl {

     

       4764
       4764
       -
               url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.7.tgz";

     

       4765
       4765
       -
               sha512 = "RNQxUMGkcqeoYirAjJjVfUIofZzR9ZPmwD1BnQPznabCgC1cuIXCgDdYzjANh72hJeOhhN9ewVA3WM013llZRA==";

     

       4773
       4773
       +
               url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.8.tgz";

     

       4774
       4774
       +
               sha512 = "RFD/oA3kTviuj7WHRynyMT4zBFNB8tSifrMjQxyY28BEWckieX27RM9+QynfuHg07s1pZ/mZC5g3wLwjdeE5+w==";

     

       4766
       4775
        
             };

     

       4767
       4776
        
           };

     

       4768
       4768
       -
           "@ot-builder/stat-glyphs-1.0.7" = {

     

       4777
       4777
       +
           "@ot-builder/stat-glyphs-1.0.8" = {

     

       4769
       4778
        
             name = "_at_ot-builder_slash_stat-glyphs";

     

       4770
       4779
        
             packageName = "@ot-builder/stat-glyphs";

     

       4771
       4771
       -
             version = "1.0.7";

     

       4780
       4780
       +
             version = "1.0.8";

     

       4772
       4781
        
             src = fetchurl {

     

       4773
       4773
       -
               url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.7.tgz";

     

       4774
       4774
       -
               sha512 = "KVW+RS5DJwWvrrbe2zO+p60kaYeDMlf+zN2D8JrpCr5pbVumOWtgBHMInD9HU4Qnng2DW5X1IPy4dEMyGLla6w==";

     

       4782
       4782
       +
               url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.8.tgz";

     

       4783
       4783
       +
               sha512 = "rSQPs0laN2H+jBTKFA/q9+rcOJO9bJVHvCxHu74hfwjvlpysWbaN/+9PwMb5mFIP/GzToYfYhgZ6e7qBNRSM+g==";

     

       4775
       4784
        
             };

     

       4776
       4785
        
           };

     

       4777
       4777
       -
           "@ot-builder/trace-1.0.7" = {

     

       4786
       4786
       +
           "@ot-builder/trace-1.0.8" = {

     

       4778
       4787
        
             name = "_at_ot-builder_slash_trace";

     

       4779
       4788
        
             packageName = "@ot-builder/trace";

     

       4780
       4780
       -
             version = "1.0.7";

     

       4789
       4789
       +
             version = "1.0.8";

     

       4781
       4790
        
             src = fetchurl {

     

       4782
       4782
       -
               url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.7.tgz";

     

       4783
       4783
       -
               sha512 = "jO5Op3OHs18erCA3jv2/fmfht9jyiXYqbGtfssWC5vZuwtC4h998nj07PRh+MT4L+tsIbJfgj6WuG2K9rwSy9Q==";

     

       4791
       4791
       +
               url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.8.tgz";

     

       4792
       4792
       +
               sha512 = "VGPt+1UT+yDzouUDugMW2z7tFED+sHJKT5mOwl6N2t/+Er6gaxrRlfYKvdHqdgFKIg8oKytoZS3wOauWiVF02w==";

     

       4784
       4793
        
             };

     

       4785
       4794
        
           };

     

       4786
       4786
       -
           "@ot-builder/var-store-1.0.7" = {

     

       4795
       4795
       +
           "@ot-builder/var-store-1.0.8" = {

     

       4787
       4796
        
             name = "_at_ot-builder_slash_var-store";

     

       4788
       4797
        
             packageName = "@ot-builder/var-store";

     

       4789
       4789
       -
             version = "1.0.7";

     

       4798
       4798
       +
             version = "1.0.8";

     

       4790
       4799
        
             src = fetchurl {

     

       4791
       4791
       -
               url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.7.tgz";

     

       4792
       4792
       -
               sha512 = "z47s+cbzRtI4coWgdVgjSX+lktYUenL0k+z+pIwKU6nI+ASpnJtgfczB7FpqvDhLw3fYV9U4K5bSAUC+z8KYmw==";

     

       4800
       4800
       +
               url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.8.tgz";

     

       4801
       4801
       +
               sha512 = "Wo3xfMDzmlqSNEn5YOO8hxW7X9YTw6fCUmfUmfaOAmNYRWsVHnLwTSnu92M6p0shMqVHzgqhCHDxG7KZAuSNwQ==";

     

       4793
       4802
        
             };

     

       4794
       4803
        
           };

     

       4795
       4795
       -
           "@ot-builder/variance-1.0.7" = {

     

       4804
       4804
       +
           "@ot-builder/variance-1.0.8" = {

     

       4796
       4805
        
             name = "_at_ot-builder_slash_variance";

     

       4797
       4806
        
             packageName = "@ot-builder/variance";

     

       4798
       4798
       -
             version = "1.0.7";

     

       4807
       4807
       +
             version = "1.0.8";

     

       4799
       4808
        
             src = fetchurl {

     

       4800
       4800
       -
               url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.7.tgz";

     

       4801
       4801
       -
               sha512 = "7yHCMLolNIlR4QsXYvNNoSAagSg8niSoXWo/43YSWlsdU6O1/osJhGOPBMA+LcDj1Gl2SLSaQfDr92e3Wk7dRQ==";

     

       4809
       4809
       +
               url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.8.tgz";

     

       4810
       4810
       +
               sha512 = "GaWs/PMrzkAJJmf5Wm0qr09AHYP9ydNk6J9KEs7GXH7gBm6X5pl/V6D105u+6Tx+QSGotRvc8einQm/vazug7A==";

     

       4802
       4811
        
             };

     

       4803
       4812
        
           };

     

       4804
       4813
        
           "@parcel/fs-1.11.0" = {

     
···

       5044
       5053
        
               sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A==";

     

       5045
       5054
        
             };

     

       5046
       5055
        
           };

     

       5047
       5047
       -
           "@redocly/openapi-core-1.0.0-beta.48" = {

     

       5056
       5056
       +
           "@redocly/openapi-core-1.0.0-beta.49" = {

     

       5048
       5057
        
             name = "_at_redocly_slash_openapi-core";

     

       5049
       5058
        
             packageName = "@redocly/openapi-core";

     

       5050
       5050
       -
             version = "1.0.0-beta.48";

     

       5059
       5059
       +
             version = "1.0.0-beta.49";

     

       5051
       5060
        
             src = fetchurl {

     

       5052
       5052
       -
               url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.48.tgz";

     

       5053
       5053
       -
               sha512 = "rlus9qQC4Pkzz2Ljcv+jQjFdKOYSWnsYXWN6zNik9iiiQtMmGEdszsERCbSAYw/CZ5DRCAHMeKrh8f4LBCpx1A==";

     

       5061
       5061
       +
               url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.49.tgz";

     

       5062
       5062
       +
               sha512 = "SwCtQeyovcV7cS6YQoe5GWX3hWXAZrnrZQtQv0YW91CtrZMBdk5qA5eQ9Mkkbk6YOKKCWkc8yD+KdkRATlyPNw==";

     

       5054
       5063
        
             };

     

       5055
       5064
        
           };

     

       5056
       5065
        
           "@redocly/react-dropdown-aria-2.0.11" = {

     
···

       6619
       6628
        
               sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";

     

       6620
       6629
        
             };

     

       6621
       6630
        
           };

     

       6622
       6622
       -
           "@types/koa-2.13.2" = {

     

       6631
       6631
       +
           "@types/koa-2.13.3" = {

     

       6623
       6632
        
             name = "_at_types_slash_koa";

     

       6624
       6633
        
             packageName = "@types/koa";

     

       6625
       6625
       -
             version = "2.13.2";

     

       6634
       6634
       +
             version = "2.13.3";

     

       6626
       6635
        
             src = fetchurl {

     

       6627
       6627
       -
               url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.2.tgz";

     

       6628
       6628
       -
               sha512 = "MHKUNSaw940A8h4tRo+ccDR5SxCkT+OKq1QS5ZmvgB64hO2wsUhb5yvFa464uqTH+R/A/SzxneIfOjiQ6EpBGA==";

     

       6636
       6636
       +
               url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.3.tgz";

     

       6637
       6637
       +
               sha512 = "TaujBV+Dhe/FvmSMZJtCFBms+bqQacgUebk/M2C2tq8iGmHE/DDf4DcW2Hc7NqusVZmy5xzrWOjtdPKNP+fTfw==";

     

       6629
       6638
        
             };

     

       6630
       6639
        
           };

     

       6631
       6640
        
           "@types/koa-compose-3.2.5" = {

     
···

       7015
       7024
        
               sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==";

     

       7016
       7025
        
             };

     

       7017
       7026
        
           };

     

       7027
       7027
       +
           "@types/raf-3.4.0" = {

     

       7028
       7028
       +
             name = "_at_types_slash_raf";

     

       7029
       7029
       +
             packageName = "@types/raf";

     

       7030
       7030
       +
             version = "3.4.0";

     

       7031
       7031
       +
             src = fetchurl {

     

       7032
       7032
       +
               url = "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz";

     

       7033
       7033
       +
               sha512 = "taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==";

     

       7034
       7034
       +
             };

     

       7035
       7035
       +
           };

     

       7018
       7036
        
           "@types/range-parser-1.2.3" = {

     

       7019
       7037
        
             name = "_at_types_slash_range-parser";

     

       7020
       7038
        
             packageName = "@types/range-parser";

     
···

       7402
       7420
        
               sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";

     

       7403
       7421
        
             };

     

       7404
       7422
        
           };

     

       7405
       7405
       -
           "@typescript-eslint/eslint-plugin-4.25.0" = {

     

       7423
       7423
       +
           "@typescript-eslint/eslint-plugin-4.26.0" = {

     

       7406
       7424
        
             name = "_at_typescript-eslint_slash_eslint-plugin";

     

       7407
       7425
        
             packageName = "@typescript-eslint/eslint-plugin";

     

       7408
       7408
       -
             version = "4.25.0";

     

       7426
       7426
       +
             version = "4.26.0";

     

       7409
       7427
        
             src = fetchurl {

     

       7410
       7410
       -
               url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.25.0.tgz";

     

       7411
       7411
       -
               sha512 = "Qfs3dWkTMKkKwt78xp2O/KZQB8MPS1UQ5D3YW2s6LQWBE1074BE+Rym+b1pXZIX3M3fSvPUDaCvZLKV2ylVYYQ==";

     

       7428
       7428
       +
               url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.26.0.tgz";

     

       7429
       7429
       +
               sha512 = "yA7IWp+5Qqf+TLbd8b35ySFOFzUfL7i+4If50EqvjT6w35X8Lv0eBHb6rATeWmucks37w+zV+tWnOXI9JlG6Eg==";

     

       7412
       7430
        
             };

     

       7413
       7431
        
           };

     

       7414
       7432
        
           "@typescript-eslint/experimental-utils-3.10.1" = {

     
···

       7420
       7438
        
               sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";

     

       7421
       7439
        
             };

     

       7422
       7440
        
           };

     

       7423
       7423
       -
           "@typescript-eslint/experimental-utils-4.25.0" = {

     

       7441
       7441
       +
           "@typescript-eslint/experimental-utils-4.26.0" = {

     

       7424
       7442
        
             name = "_at_typescript-eslint_slash_experimental-utils";

     

       7425
       7443
        
             packageName = "@typescript-eslint/experimental-utils";

     

       7426
       7426
       -
             version = "4.25.0";

     

       7444
       7444
       +
             version = "4.26.0";

     

       7427
       7445
        
             src = fetchurl {

     

       7428
       7428
       -
               url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.25.0.tgz";

     

       7429
       7429
       -
               sha512 = "f0doRE76vq7NEEU0tw+ajv6CrmPelw5wLoaghEHkA2dNLFb3T/zJQqGPQ0OYt5XlZaS13MtnN+GTPCuUVg338w==";

     

       7446
       7446
       +
               url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.26.0.tgz";

     

       7447
       7447
       +
               sha512 = "TH2FO2rdDm7AWfAVRB5RSlbUhWxGVuxPNzGT7W65zVfl8H/WeXTk1e69IrcEVsBslrQSTDKQSaJD89hwKrhdkw==";

     

       7430
       7448
        
             };

     

       7431
       7449
        
           };

     

       7432
       7450
        
           "@typescript-eslint/parser-3.10.1" = {

     
···

       7438
       7456
        
               sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";

     

       7439
       7457
        
             };

     

       7440
       7458
        
           };

     

       7441
       7441
       -
           "@typescript-eslint/parser-4.25.0" = {

     

       7459
       7459
       +
           "@typescript-eslint/parser-4.26.0" = {

     

       7442
       7460
        
             name = "_at_typescript-eslint_slash_parser";

     

       7443
       7461
        
             packageName = "@typescript-eslint/parser";

     

       7444
       7444
       -
             version = "4.25.0";

     

       7462
       7462
       +
             version = "4.26.0";

     

       7445
       7463
        
             src = fetchurl {

     

       7446
       7446
       -
               url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.25.0.tgz";

     

       7447
       7447
       -
               sha512 = "OZFa1SKyEJpAhDx8FcbWyX+vLwh7OEtzoo2iQaeWwxucyfbi0mT4DijbOSsTgPKzGHr6GrF2V5p/CEpUH/VBxg==";

     

       7464
       7464
       +
               url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.26.0.tgz";

     

       7465
       7465
       +
               sha512 = "b4jekVJG9FfmjUfmM4VoOItQhPlnt6MPOBUL0AQbiTmm+SSpSdhHYlwayOm4IW9KLI/4/cRKtQCmDl1oE2OlPg==";

     

       7448
       7466
        
             };

     

       7449
       7467
        
           };

     

       7450
       7450
       -
           "@typescript-eslint/scope-manager-4.25.0" = {

     

       7468
       7468
       +
           "@typescript-eslint/scope-manager-4.26.0" = {

     

       7451
       7469
        
             name = "_at_typescript-eslint_slash_scope-manager";

     

       7452
       7470
        
             packageName = "@typescript-eslint/scope-manager";

     

       7453
       7453
       -
             version = "4.25.0";

     

       7471
       7471
       +
             version = "4.26.0";

     

       7454
       7472
        
             src = fetchurl {

     

       7455
       7455
       -
               url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.25.0.tgz";

     

       7456
       7456
       -
               sha512 = "2NElKxMb/0rya+NJG1U71BuNnp1TBd1JgzYsldsdA83h/20Tvnf/HrwhiSlNmuq6Vqa0EzidsvkTArwoq+tH6w==";

     

       7473
       7473
       +
               url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.26.0.tgz";

     

       7474
       7474
       +
               sha512 = "G6xB6mMo4xVxwMt5lEsNTz3x4qGDt0NSGmTBNBPJxNsrTXJSm21c6raeYroS2OwQsOyIXqKZv266L/Gln1BWqg==";

     

       7457
       7475
        
             };

     

       7458
       7476
        
           };

     

       7459
       7477
        
           "@typescript-eslint/types-3.10.1" = {

     
···

       7465
       7483
        
               sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";

     

       7466
       7484
        
             };

     

       7467
       7485
        
           };

     

       7468
       7468
       -
           "@typescript-eslint/types-4.25.0" = {

     

       7486
       7486
       +
           "@typescript-eslint/types-4.26.0" = {

     

       7469
       7487
        
             name = "_at_typescript-eslint_slash_types";

     

       7470
       7488
        
             packageName = "@typescript-eslint/types";

     

       7471
       7471
       -
             version = "4.25.0";

     

       7472
       7472
       -
             src = fetchurl {

     

       7473
       7473
       -
               url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.25.0.tgz";

     

       7474
       7474
       -
               sha512 = "+CNINNvl00OkW6wEsi32wU5MhHti2J25TJsJJqgQmJu3B3dYDBcmOxcE5w9cgoM13TrdE/5ND2HoEnBohasxRQ==";

     

       7475
       7475
       -
             };

     

       7476
       7476
       -
           };

     

       7477
       7477
       -
           "@typescript-eslint/typescript-estree-2.34.0" = {

     

       7478
       7478
       -
             name = "_at_typescript-eslint_slash_typescript-estree";

     

       7479
       7479
       -
             packageName = "@typescript-eslint/typescript-estree";

     

       7480
       7480
       -
             version = "2.34.0";

     

       7489
       7489
       +
             version = "4.26.0";

     

       7481
       7490
        
             src = fetchurl {

     

       7482
       7482
       -
               url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz";

     

       7483
       7483
       -
               sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==";

     

       7491
       7491
       +
               url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.26.0.tgz";

     

       7492
       7492
       +
               sha512 = "rADNgXl1kS/EKnDr3G+m7fB9yeJNnR9kF7xMiXL6mSIWpr3Wg5MhxyfEXy/IlYthsqwBqHOr22boFbf/u6O88A==";

     

       7484
       7493
        
             };

     

       7485
       7494
        
           };

     

       7486
       7495
        
           "@typescript-eslint/typescript-estree-3.10.1" = {

     
···

       7492
       7501
        
               sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";

     

       7493
       7502
        
             };

     

       7494
       7503
        
           };

     

       7495
       7495
       -
           "@typescript-eslint/typescript-estree-4.25.0" = {

     

       7504
       7504
       +
           "@typescript-eslint/typescript-estree-4.26.0" = {

     

       7496
       7505
        
             name = "_at_typescript-eslint_slash_typescript-estree";

     

       7497
       7506
        
             packageName = "@typescript-eslint/typescript-estree";

     

       7498
       7498
       -
             version = "4.25.0";

     

       7507
       7507
       +
             version = "4.26.0";

     

       7499
       7508
        
             src = fetchurl {

     

       7500
       7500
       -
               url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.25.0.tgz";

     

       7501
       7501
       -
               sha512 = "1B8U07TGNAFMxZbSpF6jqiDs1cVGO0izVkf18Q/SPcUAc9LhHxzvSowXDTvkHMWUVuPpagupaW63gB6ahTXVlg==";

     

       7509
       7509
       +
               url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.26.0.tgz";

     

       7510
       7510
       +
               sha512 = "GHUgahPcm9GfBuy3TzdsizCcPjKOAauG9xkz9TR8kOdssz2Iz9jRCSQm6+aVFa23d5NcSpo1GdHGSQKe0tlcbg==";

     

       7502
       7511
        
             };

     

       7503
       7512
        
           };

     

       7504
       7513
        
           "@typescript-eslint/visitor-keys-3.10.1" = {

     
···

       7510
       7519
        
               sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";

     

       7511
       7520
        
             };

     

       7512
       7521
        
           };

     

       7513
       7513
       -
           "@typescript-eslint/visitor-keys-4.25.0" = {

     

       7522
       7522
       +
           "@typescript-eslint/visitor-keys-4.26.0" = {

     

       7514
       7523
        
             name = "_at_typescript-eslint_slash_visitor-keys";

     

       7515
       7524
        
             packageName = "@typescript-eslint/visitor-keys";

     

       7516
       7516
       -
             version = "4.25.0";

     

       7525
       7525
       +
             version = "4.26.0";

     

       7517
       7526
        
             src = fetchurl {

     

       7518
       7518
       -
               url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.25.0.tgz";

     

       7519
       7519
       -
               sha512 = "AmkqV9dDJVKP/TcZrbf6s6i1zYXt5Hl8qOLrRDTFfRNae4+LB8A4N3i+FLZPW85zIxRy39BgeWOfMS3HoH5ngg==";

     

       7527
       7527
       +
               url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.26.0.tgz";

     

       7528
       7528
       +
               sha512 = "cw4j8lH38V1ycGBbF+aFiLUls9Z0Bw8QschP3mkth50BbWzgFS33ISIgBzUMuQ2IdahoEv/rXstr8Zhlz4B1Zg==";

     

       7520
       7529
        
             };

     

       7521
       7530
        
           };

     

       7522
       7531
        
           "@uifabric/foundation-7.9.26" = {

     
···

       8536
       8545
        
               sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";

     

       8537
       8546
        
             };

     

       8538
       8547
        
           };

     

       8539
       8539
       -
           "acorn-8.2.4" = {

     

       8548
       8548
       +
           "acorn-8.3.0" = {

     

       8540
       8549
        
             name = "acorn";

     

       8541
       8550
        
             packageName = "acorn";

     

       8542
       8542
       -
             version = "8.2.4";

     

       8551
       8551
       +
             version = "8.3.0";

     

       8543
       8552
        
             src = fetchurl {

     

       8544
       8544
       -
               url = "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz";

     

       8545
       8545
       -
               sha512 = "Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==";

     

       8553
       8553
       +
               url = "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz";

     

       8554
       8554
       +
               sha512 = "tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==";

     

       8546
       8555
        
             };

     

       8547
       8556
        
           };

     

       8548
       8557
        
           "acorn-globals-1.0.9" = {

     
···

       12352
       12361
        
               sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw==";

     

       12353
       12362
        
             };

     

       12354
       12363
        
           };

     

       12364
       12364
       +
           "bit-field-1.3.6" = {

     

       12365
       12365
       +
             name = "bit-field";

     

       12366
       12366
       +
             packageName = "bit-field";

     

       12367
       12367
       +
             version = "1.3.6";

     

       12368
       12368
       +
             src = fetchurl {

     

       12369
       12369
       +
               url = "https://registry.npmjs.org/bit-field/-/bit-field-1.3.6.tgz";

     

       12370
       12370
       +
               sha512 = "gu+wXJ+saekzja7tSRygoR+M+C88U0IoVTdp0SmZj5tyDwSkWmZNhSUkBmHx2NNZcSAB0gu9g8yBd1Kn7ECVmw==";

     

       12371
       12371
       +
             };

     

       12372
       12372
       +
           };

     

       12355
       12373
        
           "bitcoin-core-2.3.0" = {

     

       12356
       12374
        
             name = "bitcoin-core";

     

       12357
       12375
        
             packageName = "bitcoin-core";

     
···

       12883
       12901
        
               sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";

     

       12884
       12902
        
             };

     

       12885
       12903
        
           };

     

       12886
       12886
       -
           "boolean-3.0.4" = {

     

       12904
       12904
       +
           "boolean-3.1.0" = {

     

       12887
       12905
        
             name = "boolean";

     

       12888
       12906
        
             packageName = "boolean";

     

       12889
       12889
       -
             version = "3.0.4";

     

       12907
       12907
       +
             version = "3.1.0";

     

       12890
       12908
        
             src = fetchurl {

     

       12891
       12891
       -
               url = "https://registry.npmjs.org/boolean/-/boolean-3.0.4.tgz";

     

       12892
       12892
       -
               sha512 = "5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA==";

     

       12909
       12909
       +
               url = "https://registry.npmjs.org/boolean/-/boolean-3.1.0.tgz";

     

       12910
       12910
       +
               sha512 = "K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g==";

     

       12893
       12911
        
             };

     

       12894
       12912
        
           };

     

       12895
       12913
        
           "boom-2.10.1" = {

     
···

       13423
       13441
        
               sha512 = "tkrtMDxeJorn5p0KxaLXELneT8AbfZMpOFeoKYZ5qCCMMSluNuwut7pGccLC5YOJqmuk0DR774vNVQLC9sNq/A==";

     

       13424
       13442
        
             };

     

       13425
       13443
        
           };

     

       13444
       13444
       +
           "btoa-1.2.1" = {

     

       13445
       13445
       +
             name = "btoa";

     

       13446
       13446
       +
             packageName = "btoa";

     

       13447
       13447
       +
             version = "1.2.1";

     

       13448
       13448
       +
             src = fetchurl {

     

       13449
       13449
       +
               url = "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz";

     

       13450
       13450
       +
               sha512 = "SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==";

     

       13451
       13451
       +
             };

     

       13452
       13452
       +
           };

     

       13426
       13453
        
           "btoa-lite-1.0.0" = {

     

       13427
       13454
        
             name = "btoa-lite";

     

       13428
       13455
        
             packageName = "btoa-lite";

     
···

       14287
       14314
        
               sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";

     

       14288
       14315
        
             };

     

       14289
       14316
        
           };

     

       14290
       14290
       -
           "caniuse-lite-1.0.30001230" = {

     

       14317
       14317
       +
           "caniuse-lite-1.0.30001232" = {

     

       14291
       14318
        
             name = "caniuse-lite";

     

       14292
       14319
        
             packageName = "caniuse-lite";

     

       14293
       14293
       -
             version = "1.0.30001230";

     

       14320
       14320
       +
             version = "1.0.30001232";

     

       14294
       14321
        
             src = fetchurl {

     

       14295
       14295
       -
               url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz";

     

       14296
       14296
       -
               sha512 = "5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==";

     

       14322
       14322
       +
               url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001232.tgz";

     

       14323
       14323
       +
               sha512 = "e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==";

     

       14297
       14324
        
             };

     

       14298
       14325
        
           };

     

       14299
       14326
        
           "canvas-2.8.0" = {

     
···

       14303
       14330
        
             src = fetchurl {

     

       14304
       14331
        
               url = "https://registry.npmjs.org/canvas/-/canvas-2.8.0.tgz";

     

       14305
       14332
        
               sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q==";

     

       14333
       14333
       +
             };

     

       14334
       14334
       +
           };

     

       14335
       14335
       +
           "canvg-3.0.7" = {

     

       14336
       14336
       +
             name = "canvg";

     

       14337
       14337
       +
             packageName = "canvg";

     

       14338
       14338
       +
             version = "3.0.7";

     

       14339
       14339
       +
             src = fetchurl {

     

       14340
       14340
       +
               url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz";

     

       14341
       14341
       +
               sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA==";

     

       14306
       14342
        
             };

     

       14307
       14343
        
           };

     

       14308
       14344
        
           "caporal-1.4.0" = {

     
···

       14440
       14476
        
               sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==";

     

       14441
       14477
        
             };

     

       14442
       14478
        
           };

     

       14443
       14443
       -
           "cdk8s-1.0.0-beta.11" = {

     

       14479
       14479
       +
           "cdk8s-1.0.0-beta.14" = {

     

       14444
       14480
        
             name = "cdk8s";

     

       14445
       14481
        
             packageName = "cdk8s";

     

       14446
       14446
       -
             version = "1.0.0-beta.11";

     

       14482
       14482
       +
             version = "1.0.0-beta.14";

     

       14447
       14483
        
             src = fetchurl {

     

       14448
       14448
       -
               url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.11.tgz";

     

       14449
       14449
       -
               sha512 = "G6SIJSg6mxeEzWEWNY8NAn/jqysTPegV79mOQ6eYj1uyKYggyzP5MzuWt8fKmYShM5BTDadnCRajwDnku9LZeQ==";

     

       14484
       14484
       +
               url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.14.tgz";

     

       14485
       14485
       +
               sha512 = "NU5mZbOE3RgRX7a9zHf4AgiNcI/clqQ9vw/YixSgVe2AOiAsUXuSH2BCc3eFAZSlPSQYLxWG6mSCGY/06cy5Hw==";

     

       14450
       14486
        
             };

     

       14451
       14487
        
           };

     

       14452
       14488
        
           "cdktf-0.4.0" = {

     
···

       16681
       16717
        
               sha512 = "eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==";

     

       16682
       16718
        
             };

     

       16683
       16719
        
           };

     

       16684
       16684
       -
           "compress-commons-4.1.0" = {

     

       16720
       16720
       +
           "compress-commons-4.1.1" = {

     

       16685
       16721
        
             name = "compress-commons";

     

       16686
       16722
        
             packageName = "compress-commons";

     

       16687
       16687
       -
             version = "4.1.0";

     

       16723
       16723
       +
             version = "4.1.1";

     

       16688
       16724
        
             src = fetchurl {

     

       16689
       16689
       -
               url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.0.tgz";

     

       16690
       16690
       -
               sha512 = "ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA==";

     

       16725
       16725
       +
               url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.1.tgz";

     

       16726
       16726
       +
               sha512 = "QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==";

     

       16691
       16727
        
             };

     

       16692
       16728
        
           };

     

       16693
       16729
        
           "compressible-2.0.18" = {

     
···

       17003
       17039
        
             src = fetchurl {

     

       17004
       17040
        
               url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";

     

       17005
       17041
        
               sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";

     

       17006
       17006
       -
             };

     

       17007
       17007
       -
           };

     

       17008
       17008
       -
           "constructs-3.3.71" = {

     

       17009
       17009
       -
             name = "constructs";

     

       17010
       17010
       -
             packageName = "constructs";

     

       17011
       17011
       -
             version = "3.3.71";

     

       17012
       17012
       -
             src = fetchurl {

     

       17013
       17013
       -
               url = "https://registry.npmjs.org/constructs/-/constructs-3.3.71.tgz";

     

       17014
       17014
       -
               sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA==";

     

       17015
       17042
        
             };

     

       17016
       17043
        
           };

     

       17017
       17044
        
           "constructs-3.3.75" = {

     
···

       17519
       17546
        
               sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";

     

       17520
       17547
        
             };

     

       17521
       17548
        
           };

     

       17522
       17522
       -
           "core-js-3.13.0" = {

     

       17549
       17549
       +
           "core-js-3.13.1" = {

     

       17523
       17550
        
             name = "core-js";

     

       17524
       17551
        
             packageName = "core-js";

     

       17525
       17525
       -
             version = "3.13.0";

     

       17552
       17552
       +
             version = "3.13.1";

     

       17526
       17553
        
             src = fetchurl {

     

       17527
       17527
       -
               url = "https://registry.npmjs.org/core-js/-/core-js-3.13.0.tgz";

     

       17528
       17528
       -
               sha512 = "iWDbiyha1M5vFwPFmQnvRv+tJzGbFAm6XimJUT0NgHYW3xZEs1SkCAcasWSVFxpI2Xb/V1DDJckq3v90+bQnog==";

     

       17554
       17554
       +
               url = "https://registry.npmjs.org/core-js/-/core-js-3.13.1.tgz";

     

       17555
       17555
       +
               sha512 = "JqveUc4igkqwStL2RTRn/EPFGBOfEZHxJl/8ej1mXJR75V3go2mFF4bmUYkEIT1rveHKnkUlcJX/c+f1TyIovQ==";

     

       17529
       17556
        
             };

     

       17530
       17557
        
           };

     

       17531
       17558
        
           "core-js-3.8.3" = {

     
···

       17537
       17564
        
               sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==";

     

       17538
       17565
        
             };

     

       17539
       17566
        
           };

     

       17540
       17540
       -
           "core-js-compat-3.13.0" = {

     

       17567
       17567
       +
           "core-js-compat-3.13.1" = {

     

       17541
       17568
        
             name = "core-js-compat";

     

       17542
       17569
        
             packageName = "core-js-compat";

     

       17543
       17543
       -
             version = "3.13.0";

     

       17570
       17570
       +
             version = "3.13.1";

     

       17544
       17571
        
             src = fetchurl {

     

       17545
       17545
       -
               url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.0.tgz";

     

       17546
       17546
       -
               sha512 = "jhbI2zpVskgfDC9mGRaDo1gagd0E0i/kYW0+WvibL/rafEHKAHO653hEXIxJHqRlRLITluXtRH3AGTL5qJmifQ==";

     

       17572
       17572
       +
               url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.13.1.tgz";

     

       17573
       17573
       +
               sha512 = "mdrcxc0WznfRd8ZicEZh1qVeJ2mu6bwQFh8YVUK48friy/FOwFV5EJj9/dlh+nMQ74YusdVfBFDuomKgUspxWQ==";

     

       17547
       17574
        
             };

     

       17548
       17575
        
           };

     

       17549
       17549
       -
           "core-js-pure-3.13.0" = {

     

       17576
       17576
       +
           "core-js-pure-3.13.1" = {

     

       17550
       17577
        
             name = "core-js-pure";

     

       17551
       17578
        
             packageName = "core-js-pure";

     

       17552
       17552
       -
             version = "3.13.0";

     

       17579
       17579
       +
             version = "3.13.1";

     

       17553
       17580
        
             src = fetchurl {

     

       17554
       17554
       -
               url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.0.tgz";

     

       17555
       17555
       -
               sha512 = "7VTvXbsMxROvzPAVczLgfizR8CyYnvWPrb1eGrtlZAJfjQWEHLofVfCKljLHdpazTfpaziRORwUH/kfGDKvpdA==";

     

       17581
       17581
       +
               url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.13.1.tgz";

     

       17582
       17582
       +
               sha512 = "wVlh0IAi2t1iOEh16y4u1TRk6ubd4KvLE8dlMi+3QUI6SfKphQUh7tAwihGGSQ8affxEXpVIPpOdf9kjR4v4Pw==";

     

       17556
       17583
        
             };

     

       17557
       17584
        
           };

     

       17558
       17585
        
           "core-util-is-1.0.2" = {

     
···

       17670
       17697
        
             src = fetchurl {

     

       17671
       17698
        
               url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz";

     

       17672
       17699
        
               sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==";

     

       17700
       17700
       +
             };

     

       17701
       17701
       +
           };

     

       17702
       17702
       +
           "cp-file-9.0.0" = {

     

       17703
       17703
       +
             name = "cp-file";

     

       17704
       17704
       +
             packageName = "cp-file";

     

       17705
       17705
       +
             version = "9.0.0";

     

       17706
       17706
       +
             src = fetchurl {

     

       17707
       17707
       +
               url = "https://registry.npmjs.org/cp-file/-/cp-file-9.0.0.tgz";

     

       17708
       17708
       +
               sha512 = "hNEM3AuZz84zOPgL8ozJ057+DjuD6LpwyYNiyTsLDU71Ke2E3KV909xhGYLK7WQ0srJRwzs/1+bSE1pk/HRC6w==";

     

       17673
       17709
        
             };

     

       17674
       17710
        
           };

     

       17675
       17711
        
           "cpu-percentage-1.0.3" = {

     
···

       20390
       20426
        
               sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA==";

     

       20391
       20427
        
             };

     

       20392
       20428
        
           };

     

       20393
       20393
       -
           "detective-postcss-3.0.1" = {

     

       20429
       20429
       +
           "detective-postcss-4.0.0" = {

     

       20394
       20430
        
             name = "detective-postcss";

     

       20395
       20431
        
             packageName = "detective-postcss";

     

       20396
       20396
       -
             version = "3.0.1";

     

       20432
       20432
       +
             version = "4.0.0";

     

       20397
       20433
        
             src = fetchurl {

     

       20398
       20398
       -
               url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz";

     

       20399
       20399
       -
               sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw==";

     

       20434
       20434
       +
               url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-4.0.0.tgz";

     

       20435
       20435
       +
               sha512 = "Fwc/g9VcrowODIAeKRWZfVA/EufxYL7XfuqJQFroBKGikKX83d2G7NFw6kDlSYGG3LNQIyVa+eWv1mqre+v4+A==";

     

       20400
       20436
        
             };

     

       20401
       20437
        
           };

     

       20402
       20438
        
           "detective-sass-3.0.1" = {

     
···

       20426
       20462
        
               sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd";

     

       20427
       20463
        
             };

     

       20428
       20464
        
           };

     

       20429
       20429
       -
           "detective-typescript-5.8.0" = {

     

       20465
       20465
       +
           "detective-typescript-7.0.0" = {

     

       20430
       20466
        
             name = "detective-typescript";

     

       20431
       20467
        
             packageName = "detective-typescript";

     

       20432
       20432
       -
             version = "5.8.0";

     

       20468
       20468
       +
             version = "7.0.0";

     

       20433
       20469
        
             src = fetchurl {

     

       20434
       20434
       -
               url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.8.0.tgz";

     

       20435
       20435
       -
               sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg==";

     

       20470
       20470
       +
               url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-7.0.0.tgz";

     

       20471
       20471
       +
               sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA==";

     

       20436
       20472
        
             };

     

       20437
       20473
        
           };

     

       20438
       20474
        
           "devtools-protocol-0.0.854822" = {

     
···

       21119
       21155
        
               sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";

     

       21120
       21156
        
             };

     

       21121
       21157
        
           };

     

       21122
       21122
       -
           "dompurify-2.2.8" = {

     

       21158
       21158
       +
           "dompurify-2.2.9" = {

     

       21123
       21159
        
             name = "dompurify";

     

       21124
       21160
        
             packageName = "dompurify";

     

       21125
       21125
       -
             version = "2.2.8";

     

       21161
       21161
       +
             version = "2.2.9";

     

       21126
       21162
        
             src = fetchurl {

     

       21127
       21127
       -
               url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.8.tgz";

     

       21128
       21128
       -
               sha512 = "9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww==";

     

       21163
       21163
       +
               url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.9.tgz";

     

       21164
       21164
       +
               sha512 = "+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w==";

     

       21129
       21165
        
             };

     

       21130
       21166
        
           };

     

       21131
       21167
        
           "domutils-1.4.3" = {

     
···

       21641
       21677
        
               sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";

     

       21642
       21678
        
             };

     

       21643
       21679
        
           };

     

       21644
       21644
       -
           "electron-to-chromium-1.3.741" = {

     

       21680
       21680
       +
           "electron-to-chromium-1.3.743" = {

     

       21645
       21681
        
             name = "electron-to-chromium";

     

       21646
       21682
        
             packageName = "electron-to-chromium";

     

       21647
       21647
       -
             version = "1.3.741";

     

       21683
       21683
       +
             version = "1.3.743";

     

       21648
       21684
        
             src = fetchurl {

     

       21649
       21649
       -
               url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz";

     

       21650
       21650
       -
               sha512 = "4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA==";

     

       21685
       21685
       +
               url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.743.tgz";

     

       21686
       21686
       +
               sha512 = "K2wXfo9iZQzNJNx67+Pld0DRF+9bYinj62gXCdgPhcu1vidwVuLPHQPPFnCdO55njWigXXpfBiT90jGUPbw8Zg==";

     

       21651
       21687
        
             };

     

       21652
       21688
        
           };

     

       21653
       21689
        
           "electrum-client-git://github.com/janoside/electrum-client" = {

     
···

       22732
       22768
        
               sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";

     

       22733
       22769
        
             };

     

       22734
       22770
        
           };

     

       22735
       22735
       -
           "eslint-plugin-vue-7.9.0" = {

     

       22771
       22771
       +
           "eslint-plugin-vue-7.10.0" = {

     

       22736
       22772
        
             name = "eslint-plugin-vue";

     

       22737
       22773
        
             packageName = "eslint-plugin-vue";

     

       22738
       22738
       -
             version = "7.9.0";

     

       22774
       22774
       +
             version = "7.10.0";

     

       22739
       22775
        
             src = fetchurl {

     

       22740
       22740
       -
               url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz";

     

       22741
       22741
       -
               sha512 = "2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==";

     

       22776
       22776
       +
               url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz";

     

       22777
       22777
       +
               sha512 = "xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A==";

     

       22742
       22778
        
             };

     

       22743
       22779
        
           };

     

       22744
       22780
        
           "eslint-scope-3.7.3" = {

     
···

       22786
       22822
        
               sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";

     

       22787
       22823
        
             };

     

       22788
       22824
        
           };

     

       22825
       22825
       +
           "eslint-utils-3.0.0" = {

     

       22826
       22826
       +
             name = "eslint-utils";

     

       22827
       22827
       +
             packageName = "eslint-utils";

     

       22828
       22828
       +
             version = "3.0.0";

     

       22829
       22829
       +
             src = fetchurl {

     

       22830
       22830
       +
               url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz";

     

       22831
       22831
       +
               sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==";

     

       22832
       22832
       +
             };

     

       22833
       22833
       +
           };

     

       22789
       22834
        
           "eslint-visitor-keys-1.3.0" = {

     

       22790
       22835
        
             name = "eslint-visitor-keys";

     

       22791
       22836
        
             packageName = "eslint-visitor-keys";

     
···

       23461
       23506
        
               sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";

     

       23462
       23507
        
             };

     

       23463
       23508
        
           };

     

       23464
       23464
       -
           "execa-5.0.0" = {

     

       23509
       23509
       +
           "execa-5.0.1" = {

     

       23465
       23510
        
             name = "execa";

     

       23466
       23511
        
             packageName = "execa";

     

       23467
       23467
       -
             version = "5.0.0";

     

       23512
       23512
       +
             version = "5.0.1";

     

       23468
       23513
        
             src = fetchurl {

     

       23469
       23469
       -
               url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz";

     

       23470
       23470
       -
               sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==";

     

       23514
       23514
       +
               url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz";

     

       23515
       23515
       +
               sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw==";

     

       23471
       23516
        
             };

     

       23472
       23517
        
           };

     

       23473
       23518
        
           "execall-1.0.0" = {

     
···

       23614
       23659
        
               sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";

     

       23615
       23660
        
             };

     

       23616
       23661
        
           };

     

       23617
       23617
       -
           "expo-pwa-0.0.80" = {

     

       23662
       23662
       +
           "expo-pwa-0.0.82" = {

     

       23618
       23663
        
             name = "expo-pwa";

     

       23619
       23664
        
             packageName = "expo-pwa";

     

       23620
       23620
       -
             version = "0.0.80";

     

       23665
       23665
       +
             version = "0.0.82";

     

       23621
       23666
        
             src = fetchurl {

     

       23622
       23622
       -
               url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.80.tgz";

     

       23623
       23623
       -
               sha512 = "AZefVqcB3OFS7yOhfOtkHANhFRTG34fAMrlDx69ERbxh0sEPI/Gv+wwYycUdmq/aYh7u8zuaoOlY9BUgMd6U6w==";

     

       23667
       23667
       +
               url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.82.tgz";

     

       23668
       23668
       +
               sha512 = "4TSJRmVl3/gOQbE56Xe7P+A+zIqNF2asqMtC8Au/YQF0o4emmEAICEwCCRMg2jdtgq7qVDwWjBfMNLDdGS4HrQ==";

     

       23624
       23669
        
             };

     

       23625
       23670
        
           };

     

       23626
       23671
        
           "express-2.5.11" = {

     
···

       25594
       25639
        
               sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";

     

       25595
       25640
        
             };

     

       25596
       25641
        
           };

     

       25642
       25642
       +
           "forwarded-0.2.0" = {

     

       25643
       25643
       +
             name = "forwarded";

     

       25644
       25644
       +
             packageName = "forwarded";

     

       25645
       25645
       +
             version = "0.2.0";

     

       25646
       25646
       +
             src = fetchurl {

     

       25647
       25647
       +
               url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";

     

       25648
       25648
       +
               sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";

     

       25649
       25649
       +
             };

     

       25650
       25650
       +
           };

     

       25597
       25651
        
           "fp-and-or-0.1.3" = {

     

       25598
       25652
        
             name = "fp-and-or";

     

       25599
       25653
        
             packageName = "fp-and-or";

     
···

       26429
       26483
        
             src = fetchurl {

     

       26430
       26484
        
               url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz";

     

       26431
       26485
        
               sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==";

     

       26432
       26432
       -
             };

     

       26433
       26433
       -
           };

     

       26434
       26434
       -
           "get-stdin-7.0.0" = {

     

       26435
       26435
       -
             name = "get-stdin";

     

       26436
       26436
       -
             packageName = "get-stdin";

     

       26437
       26437
       -
             version = "7.0.0";

     

       26438
       26438
       -
             src = fetchurl {

     

       26439
       26439
       -
               url = "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz";

     

       26440
       26440
       -
               sha512 = "zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==";

     

       26441
       26486
        
             };

     

       26442
       26487
        
           };

     

       26443
       26488
        
           "get-stdin-8.0.0" = {

     
···

       27620
       27665
        
               sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==";

     

       27621
       27666
        
             };

     

       27622
       27667
        
           };

     

       27623
       27623
       -
           "graphql-ws-4.5.2" = {

     

       27668
       27668
       +
           "graphql-ws-4.7.0" = {

     

       27624
       27669
        
             name = "graphql-ws";

     

       27625
       27670
        
             packageName = "graphql-ws";

     

       27626
       27626
       -
             version = "4.5.2";

     

       27671
       27671
       +
             version = "4.7.0";

     

       27627
       27672
        
             src = fetchurl {

     

       27628
       27628
       -
               url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.5.2.tgz";

     

       27629
       27629
       -
               sha512 = "kowYwIq2SEJGaHMoKlgR5fgIAyFJbEdVpwjlct22eg6uuDkJK9Irv/b1XHdrFWny8KFssTd/+dUkDpT2vX9Log==";

     

       27673
       27673
       +
               url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.7.0.tgz";

     

       27674
       27674
       +
               sha512 = "Md8SsmC9ZlsogFPd3Ot8HbIAAqsHh8Xoq7j4AmcIat1Bh6k91tjVyQvA0Au1/BolXSYq+RDvib6rATU2Hcf1Xw==";

     

       27630
       27675
        
             };

     

       27631
       27676
        
           };

     

       27632
       27677
        
           "gray-matter-2.1.1" = {

     
···

       32346
       32391
        
               sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";

     

       32347
       32392
        
             };

     

       32348
       32393
        
           };

     

       32394
       32394
       +
           "jest-worker-27.0.2" = {

     

       32395
       32395
       +
             name = "jest-worker";

     

       32396
       32396
       +
             packageName = "jest-worker";

     

       32397
       32397
       +
             version = "27.0.2";

     

       32398
       32398
       +
             src = fetchurl {

     

       32399
       32399
       +
               url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz";

     

       32400
       32400
       +
               sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==";

     

       32401
       32401
       +
             };

     

       32402
       32402
       +
           };

     

       32349
       32403
        
           "jimp-0.12.1" = {

     

       32350
       32404
        
             name = "jimp";

     

       32351
       32405
        
             packageName = "jimp";

     
···

       32481
       32535
        
               sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";

     

       32482
       32536
        
             };

     

       32483
       32537
        
           };

     

       32484
       32484
       -
           "jquery.terminal-2.24.0" = {

     

       32538
       32538
       +
           "jquery.terminal-2.25.1" = {

     

       32485
       32539
        
             name = "jquery.terminal";

     

       32486
       32540
        
             packageName = "jquery.terminal";

     

       32487
       32487
       -
             version = "2.24.0";

     

       32541
       32541
       +
             version = "2.25.1";

     

       32488
       32542
        
             src = fetchurl {

     

       32489
       32489
       -
               url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.24.0.tgz";

     

       32490
       32490
       -
               sha512 = "rtjTBj7/FYoBiWawiNTYNXIRqVI4n39WF/x1h/bEKFb48Rzgr4/dpkKGd1dgZau714ewzczAi7CEBTKvhM6RjA==";

     

       32543
       32543
       +
               url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.25.1.tgz";

     

       32544
       32544
       +
               sha512 = "I3PlUluRswKZb3UPBtH1UFdyBLLwPwdAJPVheV6xUJdS+0buguXCjn6aqmENWtZiobGGA2wkxCXR2hVQqtMCrw==";

     

       32491
       32545
        
             };

     

       32492
       32546
        
           };

     

       32493
       32547
        
           "js-base64-2.6.4" = {

     
···

       36352
       36406
        
               sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==";

     

       36353
       36407
        
             };

     

       36354
       36408
        
           };

     

       36409
       36409
       +
           "logidrom-0.3.1" = {

     

       36410
       36410
       +
             name = "logidrom";

     

       36411
       36411
       +
             packageName = "logidrom";

     

       36412
       36412
       +
             version = "0.3.1";

     

       36413
       36413
       +
             src = fetchurl {

     

       36414
       36414
       +
               url = "https://registry.npmjs.org/logidrom/-/logidrom-0.3.1.tgz";

     

       36415
       36415
       +
               sha512 = "B1Rjay3Ye/JcythUjMt+KLiLIwOjnMJN1M5BRbDgNMsJhmn7yApbx6n1rw7cT3Fi/NA77HDM+y3y1nXvKQVB9Q==";

     

       36416
       36416
       +
             };

     

       36417
       36417
       +
           };

     

       36355
       36418
        
           "loglevel-1.7.1" = {

     

       36356
       36419
        
             name = "loglevel";

     

       36357
       36420
        
             packageName = "loglevel";

     
···

       38593
       38656
        
               sha512 = "QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==";

     

       38594
       38657
        
             };

     

       38595
       38658
        
           };

     

       38659
       38659
       +
           "mime-db-1.48.0" = {

     

       38660
       38660
       +
             name = "mime-db";

     

       38661
       38661
       +
             packageName = "mime-db";

     

       38662
       38662
       +
             version = "1.48.0";

     

       38663
       38663
       +
             src = fetchurl {

     

       38664
       38664
       +
               url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz";

     

       38665
       38665
       +
               sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==";

     

       38666
       38666
       +
             };

     

       38667
       38667
       +
           };

     

       38596
       38668
        
           "mime-types-2.1.18" = {

     

       38597
       38669
        
             name = "mime-types";

     

       38598
       38670
        
             packageName = "mime-types";

     
···

       40944
       41016
        
               sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==";

     

       40945
       41017
        
             };

     

       40946
       41018
        
           };

     

       40947
       40947
       -
           "node-object-hash-2.3.2" = {

     

       41019
       41019
       +
           "node-object-hash-2.3.3" = {

     

       40948
       41020
        
             name = "node-object-hash";

     

       40949
       41021
        
             packageName = "node-object-hash";

     

       40950
       40950
       -
             version = "2.3.2";

     

       41022
       41022
       +
             version = "2.3.3";

     

       40951
       41023
        
             src = fetchurl {

     

       40952
       40952
       -
               url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.2.tgz";

     

       40953
       40953
       -
               sha512 = "QsV+vb6Kegh1V9eKeLJf2swNGkhH1sBtGWQz1fmwknGylbsyUt60iDIJWyGq2DeBRtuywdb+xXJydKa9BFNxTA==";

     

       41024
       41024
       +
               url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.3.tgz";

     

       41025
       41025
       +
               sha512 = "KdQsVgu0QoU3ycGidQLcULQdJudW2dizlxJvb2ntV4zxn1oBe7FYBcOO//qIza6oPM1xNwj7Y+rsWxiGPWekOw==";

     

       40954
       41026
        
             };

     

       40955
       41027
        
           };

     

       40956
       41028
        
           "node-persist-2.1.0" = {

     
···

       41781
       41853
        
               sha512 = "pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==";

     

       41782
       41854
        
             };

     

       41783
       41855
        
           };

     

       41784
       41784
       -
           "oas-linter-3.2.1" = {

     

       41856
       41856
       +
           "oas-linter-3.2.2" = {

     

       41785
       41857
        
             name = "oas-linter";

     

       41786
       41858
        
             packageName = "oas-linter";

     

       41787
       41787
       -
             version = "3.2.1";

     

       41859
       41859
       +
             version = "3.2.2";

     

       41788
       41860
        
             src = fetchurl {

     

       41789
       41789
       -
               url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.1.tgz";

     

       41790
       41790
       -
               sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA==";

     

       41861
       41861
       +
               url = "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.2.tgz";

     

       41862
       41862
       +
               sha512 = "KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==";

     

       41791
       41863
        
             };

     

       41792
       41864
        
           };

     

       41793
       41793
       -
           "oas-resolver-2.5.4" = {

     

       41865
       41865
       +
           "oas-resolver-2.5.5" = {

     

       41794
       41866
        
             name = "oas-resolver";

     

       41795
       41867
        
             packageName = "oas-resolver";

     

       41796
       41796
       -
             version = "2.5.4";

     

       41868
       41868
       +
             version = "2.5.5";

     

       41797
       41869
        
             src = fetchurl {

     

       41798
       41798
       -
               url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.4.tgz";

     

       41799
       41799
       -
               sha512 = "1vIj5Wkjmi+kZj5sFamt95LkuXoalmoKUohtaUQoCQZjLfPFaY8uZ7nw6IZaWuE6eLON2b6xrXhxD4hiTdYl0g==";

     

       41870
       41870
       +
               url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.5.tgz";

     

       41871
       41871
       +
               sha512 = "1po1gzIlTXQqyVNtLFWJuzDm4xxhMCJ8QcP3OarKDO8aJ8AmCtQ67XZ1X+nBbHH4CjTcEsIab1qX5+GIU4f2Gg==";

     

       41800
       41872
        
             };

     

       41801
       41873
        
           };

     

       41802
       41874
        
           "oas-schema-walker-1.1.5" = {

     
···

       41817
       41889
        
               sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw==";

     

       41818
       41890
        
             };

     

       41819
       41891
        
           };

     

       41820
       41820
       -
           "oas-validator-5.0.5" = {

     

       41892
       41892
       +
           "oas-validator-5.0.6" = {

     

       41821
       41893
        
             name = "oas-validator";

     

       41822
       41894
        
             packageName = "oas-validator";

     

       41823
       41823
       -
             version = "5.0.5";

     

       41895
       41895
       +
             version = "5.0.6";

     

       41824
       41896
        
             src = fetchurl {

     

       41825
       41825
       -
               url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.5.tgz";

     

       41826
       41826
       -
               sha512 = "d10yy6xlhRTh6np44k2U0gm5M66pioYTllH8J1ZTj+WSY3cpTvU+Dt51iWOT85HJqyGHo0RZKXF3u/NGQWDFgg==";

     

       41897
       41897
       +
               url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.6.tgz";

     

       41898
       41898
       +
               sha512 = "bI+gyr3MiG/4Q5Ibvg0R77skVWS882gFMkxwB1p6qY7Rc4p7EoDezFVfondjYhJDPDnB1ZD7Aqj7AWROAsMBZg==";

     

       41827
       41899
        
             };

     

       41828
       41900
        
           };

     

       41829
       41901
        
           "oauth-0.9.15" = {

     
···

       42376
       42448
        
               sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";

     

       42377
       42449
        
             };

     

       42378
       42450
        
           };

     

       42451
       42451
       +
           "onml-1.3.0" = {

     

       42452
       42452
       +
             name = "onml";

     

       42453
       42453
       +
             packageName = "onml";

     

       42454
       42454
       +
             version = "1.3.0";

     

       42455
       42455
       +
             src = fetchurl {

     

       42456
       42456
       +
               url = "https://registry.npmjs.org/onml/-/onml-1.3.0.tgz";

     

       42457
       42457
       +
               sha512 = "RhGUsC6Im2A5vAdIvxE3auRKTqrqUZQl/AYLn8+9lM3SO4da5bwhcI5TcM+hfQxNCSLLOVErsl9p0ZPjKKmz+g==";

     

       42458
       42458
       +
             };

     

       42459
       42459
       +
           };

     

       42460
       42460
       +
           "onml-2.1.0" = {

     

       42461
       42461
       +
             name = "onml";

     

       42462
       42462
       +
             packageName = "onml";

     

       42463
       42463
       +
             version = "2.1.0";

     

       42464
       42464
       +
             src = fetchurl {

     

       42465
       42465
       +
               url = "https://registry.npmjs.org/onml/-/onml-2.1.0.tgz";

     

       42466
       42466
       +
               sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA==";

     

       42467
       42467
       +
             };

     

       42468
       42468
       +
           };

     

       42379
       42469
        
           "oo-ascii-tree-1.30.0" = {

     

       42380
       42470
        
             name = "oo-ascii-tree";

     

       42381
       42471
        
             packageName = "oo-ascii-tree";

     
···

       42583
       42673
        
               sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q==";

     

       42584
       42674
        
             };

     

       42585
       42675
        
           };

     

       42586
       42586
       -
           "openapi-sampler-1.0.0" = {

     

       42676
       42676
       +
           "openapi-sampler-1.0.1" = {

     

       42587
       42677
        
             name = "openapi-sampler";

     

       42588
       42678
        
             packageName = "openapi-sampler";

     

       42589
       42589
       -
             version = "1.0.0";

     

       42679
       42679
       +
             version = "1.0.1";

     

       42590
       42680
        
             src = fetchurl {

     

       42591
       42591
       -
               url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0.tgz";

     

       42592
       42592
       -
               sha512 = "HysKj4ZuLk0RpZkopao5SIupUX8LMOTsEDTw9dSzcRv6BBW6Ep1IdbKwYsCrYM9tnw4VZtebR/N5sJHY6qqRew==";

     

       42681
       42681
       +
               url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.1.tgz";

     

       42682
       42682
       +
               sha512 = "qBjxkSLJV183zTTs4fgxtU/iWSLUUu2aH2+5ddWkNhV7p8CSe/mnAgoLkEbMfHtel6yr9NF+vjUWqfM+iiwORQ==";

     

       42593
       42683
        
             };

     

       42594
       42684
        
           };

     

       42595
       42685
        
           "openapi-schema-validator-3.0.3" = {

     
···

       43060
       43150
        
               sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";

     

       43061
       43151
        
             };

     

       43062
       43152
        
           };

     

       43063
       43063
       -
           "ot-builder-1.0.7" = {

     

       43153
       43153
       +
           "ot-builder-1.0.8" = {

     

       43064
       43154
        
             name = "ot-builder";

     

       43065
       43155
        
             packageName = "ot-builder";

     

       43066
       43066
       -
             version = "1.0.7";

     

       43156
       43156
       +
             version = "1.0.8";

     

       43067
       43157
        
             src = fetchurl {

     

       43068
       43068
       -
               url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.7.tgz";

     

       43069
       43069
       -
               sha512 = "VhBztvKbf4PfsWIePHVzRhcstXWNv4StU7AqYpypzG/vxXbuRxamROSgHxklY2iDivLUbZWXIgxP5yeThQO4UQ==";

     

       43158
       43158
       +
               url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.8.tgz";

     

       43159
       43159
       +
               sha512 = "e9PkE4wr4mskFMNuV5IvCujBVp9Nc+yl5ltu7qad/BNcHIFh4nn9iWFE+Klva6h8prDefgE2FOuG+sYLU0IOrQ==";

     

       43070
       43160
        
             };

     

       43071
       43161
        
           };

     

       43072
       43072
       -
           "otb-ttc-bundle-1.0.7" = {

     

       43162
       43162
       +
           "otb-ttc-bundle-1.0.8" = {

     

       43073
       43163
        
             name = "otb-ttc-bundle";

     

       43074
       43164
        
             packageName = "otb-ttc-bundle";

     

       43075
       43075
       -
             version = "1.0.7";

     

       43165
       43165
       +
             version = "1.0.8";

     

       43076
       43166
        
             src = fetchurl {

     

       43077
       43077
       -
               url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.7.tgz";

     

       43078
       43078
       -
               sha512 = "j6HyPSsOuDFLSupDEyXcg8XcaVTlO6L9RDyeq1pSDuMUhF0zqJIMLvNC0CyXmjYuzq43VALjMgT18y7A//O34g==";

     

       43167
       43167
       +
               url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.8.tgz";

     

       43168
       43168
       +
               sha512 = "VqlzOefegjHk0OTM7XIay7M+v0PSKYznKTmBPCds6X+NfaumDInoBrF7OTrhq5IN1LXlu4TwW29u0wzDCgc2+A==";

     

       43079
       43169
        
             };

     

       43080
       43170
        
           };

     

       43081
       43171
        
           "ow-0.21.0" = {

     
···

       43994
       44084
        
             src = fetchurl {

     

       43995
       44085
        
               url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz";

     

       43996
       44086
        
               sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww==";

     

       43997
       43997
       -
             };

     

       43998
       43998
       -
           };

     

       43999
       43999
       -
           "parse-torrent-7.1.3" = {

     

       44000
       44000
       -
             name = "parse-torrent";

     

       44001
       44001
       -
             packageName = "parse-torrent";

     

       44002
       44002
       -
             version = "7.1.3";

     

       44003
       44003
       -
             src = fetchurl {

     

       44004
       44004
       -
               url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-7.1.3.tgz";

     

       44005
       44005
       -
               sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA==";

     

       44006
       44087
        
             };

     

       44007
       44088
        
           };

     

       44008
       44089
        
           "parse-torrent-9.1.3" = {

     
···

       45256
       45337
        
               sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==";

     

       45257
       45338
        
             };

     

       45258
       45339
        
           };

     

       45259
       45259
       -
           "polished-3.7.1" = {

     

       45340
       45340
       +
           "polished-3.7.2" = {

     

       45260
       45341
        
             name = "polished";

     

       45261
       45342
        
             packageName = "polished";

     

       45262
       45262
       -
             version = "3.7.1";

     

       45343
       45343
       +
             version = "3.7.2";

     

       45263
       45344
        
             src = fetchurl {

     

       45264
       45264
       -
               url = "https://registry.npmjs.org/polished/-/polished-3.7.1.tgz";

     

       45265
       45265
       -
               sha512 = "/QgHrNGYwIA4mwxJ/7FSvalUJsm7KNfnXiScVSEG2Xa5qxDeBn4nmdjN2pW00mkM2Tts64ktc47U8F7Ed1BRAA==";

     

       45345
       45345
       +
               url = "https://registry.npmjs.org/polished/-/polished-3.7.2.tgz";

     

       45346
       45346
       +
               sha512 = "pQKtpZGmsZrW8UUpQMAnR7s3ppHeMQVNyMDKtUyKwuvDmklzcEyM5Kllb3JyE/sE/x7arDmyd35i+4vp99H6sQ==";

     

       45266
       45347
        
             };

     

       45267
       45348
        
           };

     

       45268
       45349
        
           "polyraf-1.1.0" = {

     
···

       45365
       45446
        
               sha512 = "b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==";

     

       45366
       45447
        
             };

     

       45367
       45448
        
           };

     

       45449
       45449
       +
           "postcss-8.3.0" = {

     

       45450
       45450
       +
             name = "postcss";

     

       45451
       45451
       +
             packageName = "postcss";

     

       45452
       45452
       +
             version = "8.3.0";

     

       45453
       45453
       +
             src = fetchurl {

     

       45454
       45454
       +
               url = "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz";

     

       45455
       45455
       +
               sha512 = "+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==";

     

       45456
       45456
       +
             };

     

       45457
       45457
       +
           };

     

       45368
       45458
        
           "postcss-calc-7.0.5" = {

     

       45369
       45459
        
             name = "postcss-calc";

     

       45370
       45460
        
             packageName = "postcss-calc";

     
···

       45914
       46004
        
               sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==";

     

       45915
       46005
        
             };

     

       45916
       46006
        
           };

     

       45917
       45917
       -
           "postcss-values-parser-1.5.0" = {

     

       46007
       46007
       +
           "postcss-values-parser-2.0.1" = {

     

       45918
       46008
        
             name = "postcss-values-parser";

     

       45919
       46009
        
             packageName = "postcss-values-parser";

     

       45920
       45920
       -
             version = "1.5.0";

     

       46010
       46010
       +
             version = "2.0.1";

     

       45921
       46011
        
             src = fetchurl {

     

       45922
       45922
       -
               url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz";

     

       45923
       45923
       -
               sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==";

     

       46012
       46012
       +
               url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz";

     

       46013
       46013
       +
               sha512 = "2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==";

     

       45924
       46014
        
             };

     

       45925
       46015
        
           };

     

       45926
       46016
        
           "postgres-array-2.0.0" = {

     
···

       46031
       46121
        
               sha512 = "PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==";

     

       46032
       46122
        
             };

     

       46033
       46123
        
           };

     

       46034
       46034
       -
           "precinct-6.3.1" = {

     

       46124
       46124
       +
           "precinct-8.1.0" = {

     

       46035
       46125
        
             name = "precinct";

     

       46036
       46126
        
             packageName = "precinct";

     

       46037
       46037
       -
             version = "6.3.1";

     

       46127
       46127
       +
             version = "8.1.0";

     

       46038
       46128
        
             src = fetchurl {

     

       46039
       46039
       -
               url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz";

     

       46040
       46040
       -
               sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ==";

     

       46129
       46129
       +
               url = "https://registry.npmjs.org/precinct/-/precinct-8.1.0.tgz";

     

       46130
       46130
       +
               sha512 = "oeZBR9IdER42Ef6Rz11z1oOUqicsI5J1Qffj6tYghKLhxN2UnHy7uE1axxNr0VZRevPK2HWkROk36uXrbJwHFA==";

     

       46041
       46131
        
             };

     

       46042
       46132
        
           };

     

       46043
       46133
        
           "precond-0.2.3" = {

     
···

       46850
       46940
        
               sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";

     

       46851
       46941
        
             };

     

       46852
       46942
        
           };

     

       46853
       46853
       -
           "proxy-addr-2.0.6" = {

     

       46943
       46943
       +
           "proxy-addr-2.0.7" = {

     

       46854
       46944
        
             name = "proxy-addr";

     

       46855
       46945
        
             packageName = "proxy-addr";

     

       46856
       46856
       -
             version = "2.0.6";

     

       46946
       46946
       +
             version = "2.0.7";

     

       46857
       46947
        
             src = fetchurl {

     

       46858
       46858
       -
               url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";

     

       46859
       46859
       -
               sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";

     

       46948
       46948
       +
               url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";

     

       46949
       46949
       +
               sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";

     

       46860
       46950
        
             };

     

       46861
       46951
        
           };

     

       46862
       46952
        
           "proxy-agent-4.0.1" = {

     
···

       47903
       47993
        
               sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";

     

       47904
       47994
        
             };

     

       47905
       47995
        
           };

     

       47906
       47906
       -
           "pyright-1.1.144" = {

     

       47996
       47996
       +
           "pyright-1.1.145" = {

     

       47907
       47997
        
             name = "pyright";

     

       47908
       47998
        
             packageName = "pyright";

     

       47909
       47909
       -
             version = "1.1.144";

     

       47999
       47999
       +
             version = "1.1.145";

     

       47910
       48000
        
             src = fetchurl {

     

       47911
       47911
       -
               url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz";

     

       47912
       47912
       -
               sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg==";

     

       48001
       48001
       +
               url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz";

     

       48002
       48002
       +
               sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA==";

     

       47913
       48003
        
             };

     

       47914
       48004
        
           };

     

       47915
       48005
        
           "q-0.9.7" = {

     
···

       50612
       50702
        
               sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3";

     

       50613
       50703
        
             };

     

       50614
       50704
        
           };

     

       50705
       50705
       +
           "rgbcolor-1.0.1" = {

     

       50706
       50706
       +
             name = "rgbcolor";

     

       50707
       50707
       +
             packageName = "rgbcolor";

     

       50708
       50708
       +
             version = "1.0.1";

     

       50709
       50709
       +
             src = fetchurl {

     

       50710
       50710
       +
               url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz";

     

       50711
       50711
       +
               sha1 = "d6505ecdb304a6595da26fa4b43307306775945d";

     

       50712
       50712
       +
             };

     

       50713
       50713
       +
           };

     

       50615
       50714
        
           "right-align-0.1.3" = {

     

       50616
       50715
        
             name = "right-align";

     

       50617
       50716
        
             packageName = "right-align";

     
···

       50738
       50837
        
               sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";

     

       50739
       50838
        
             };

     

       50740
       50839
        
           };

     

       50741
       50741
       -
           "rollup-2.50.3" = {

     

       50840
       50840
       +
           "rollup-2.50.5" = {

     

       50742
       50841
        
             name = "rollup";

     

       50743
       50842
        
             packageName = "rollup";

     

       50744
       50744
       -
             version = "2.50.3";

     

       50843
       50843
       +
             version = "2.50.5";

     

       50745
       50844
        
             src = fetchurl {

     

       50746
       50746
       -
               url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz";

     

       50747
       50747
       -
               sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ==";

     

       50845
       50845
       +
               url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz";

     

       50846
       50846
       +
               sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ==";

     

       50748
       50847
        
             };

     

       50749
       50848
        
           };

     

       50750
       50849
        
           "rollup-plugin-babel-4.4.0" = {

     
···

       53418
       53517
        
             src = fetchurl {

     

       53419
       53518
        
               url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";

     

       53420
       53519
        
               sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";

     

       53520
       53520
       +
             };

     

       53521
       53521
       +
           };

     

       53522
       53522
       +
           "source-map-js-0.6.2" = {

     

       53523
       53523
       +
             name = "source-map-js";

     

       53524
       53524
       +
             packageName = "source-map-js";

     

       53525
       53525
       +
             version = "0.6.2";

     

       53526
       53526
       +
             src = fetchurl {

     

       53527
       53527
       +
               url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz";

     

       53528
       53528
       +
               sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==";

     

       53421
       53529
        
             };

     

       53422
       53530
        
           };

     

       53423
       53531
        
           "source-map-resolve-0.5.3" = {

     
···

       54374
       54482
        
               sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==";

     

       54375
       54483
        
             };

     

       54376
       54484
        
           };

     

       54485
       54485
       +
           "stackblur-canvas-2.5.0" = {

     

       54486
       54486
       +
             name = "stackblur-canvas";

     

       54487
       54487
       +
             packageName = "stackblur-canvas";

     

       54488
       54488
       +
             version = "2.5.0";

     

       54489
       54489
       +
             src = fetchurl {

     

       54490
       54490
       +
               url = "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz";

     

       54491
       54491
       +
               sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==";

     

       54492
       54492
       +
             };

     

       54493
       54493
       +
           };

     

       54377
       54494
        
           "stackframe-1.2.0" = {

     

       54378
       54495
        
             name = "stackframe";

     

       54379
       54496
        
             packageName = "stackframe";

     
···

       55877
       55994
        
               sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8";

     

       55878
       55995
        
             };

     

       55879
       55996
        
           };

     

       55997
       55997
       +
           "svg-pathdata-5.0.5" = {

     

       55998
       55998
       +
             name = "svg-pathdata";

     

       55999
       55999
       +
             packageName = "svg-pathdata";

     

       56000
       56000
       +
             version = "5.0.5";

     

       56001
       56001
       +
             src = fetchurl {

     

       56002
       56002
       +
               url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz";

     

       56003
       56003
       +
               sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow==";

     

       56004
       56004
       +
             };

     

       56005
       56005
       +
           };

     

       55880
       56006
        
           "svg-tags-1.0.0" = {

     

       55881
       56007
        
             name = "svg-tags";

     

       55882
       56008
        
             packageName = "svg-tags";

     
···

       55884
       56010
        
             src = fetchurl {

     

       55885
       56011
        
               url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz";

     

       55886
       56012
        
               sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764";

     

       56013
       56013
       +
             };

     

       56014
       56014
       +
           };

     

       56015
       56015
       +
           "svg2img-0.9.2" = {

     

       56016
       56016
       +
             name = "svg2img";

     

       56017
       56017
       +
             packageName = "svg2img";

     

       56018
       56018
       +
             version = "0.9.2";

     

       56019
       56019
       +
             src = fetchurl {

     

       56020
       56020
       +
               url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.2.tgz";

     

       56021
       56021
       +
               sha512 = "sjyUgQhfEPJpBRTGxqI9bRzE+3k41Nzc7OtcHSSko96i/EQJZAisdxyhk12Ho/mDVCsb1QsVHLbevbxrFC6onQ==";

     

       55887
       56022
        
             };

     

       55888
       56023
        
           };

     

       55889
       56024
        
           "svgo-0.6.6" = {

     
···

       56012
       56147
        
               sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ==";

     

       56013
       56148
        
             };

     

       56014
       56149
        
           };

     

       56015
       56015
       -
           "swagger2openapi-7.0.5" = {

     

       56150
       56150
       +
           "swagger2openapi-7.0.6" = {

     

       56016
       56151
        
             name = "swagger2openapi";

     

       56017
       56152
        
             packageName = "swagger2openapi";

     

       56018
       56018
       -
             version = "7.0.5";

     

       56153
       56153
       +
             version = "7.0.6";

     

       56019
       56154
        
             src = fetchurl {

     

       56020
       56020
       -
               url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.5.tgz";

     

       56021
       56021
       -
               sha512 = "Hzxse+VTX0u8xBgYJ665EjO6BfvW2PN9Yv+yIjBDm6ga9jl83+4CEdCCpznH+ILr5MS8bIIXB+XcQUM3u25w4g==";

     

       56155
       56155
       +
               url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.6.tgz";

     

       56156
       56156
       +
               sha512 = "VIT414koe0eJqre0KrhNMUB7QEUfPjGAKesPZZosIKr2rxZ6vpUoersHUFNOsN/OZ5u2zsniCslBOwVcmQZwlg==";

     

       56022
       56157
        
             };

     

       56023
       56158
        
           };

     

       56024
       56159
        
           "sway-1.0.0" = {

     
···

       56724
       56859
        
               sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==";

     

       56725
       56860
        
             };

     

       56726
       56861
        
           };

     

       56727
       56727
       -
           "terser-webpack-plugin-5.1.2" = {

     

       56862
       56862
       +
           "terser-webpack-plugin-5.1.3" = {

     

       56728
       56863
        
             name = "terser-webpack-plugin";

     

       56729
       56864
        
             packageName = "terser-webpack-plugin";

     

       56730
       56730
       -
             version = "5.1.2";

     

       56865
       56865
       +
             version = "5.1.3";

     

       56731
       56866
        
             src = fetchurl {

     

       56732
       56732
       -
               url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz";

     

       56733
       56733
       -
               sha512 = "6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q==";

     

       56867
       56867
       +
               url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz";

     

       56868
       56868
       +
               sha512 = "cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A==";

     

       56734
       56869
        
             };

     

       56735
       56870
        
           };

     

       56736
       56871
        
           "test-exclude-6.0.0" = {

     
···

       58164
       58299
        
               sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==";

     

       58165
       58300
        
             };

     

       58166
       58301
        
           };

     

       58302
       58302
       +
           "tspan-0.4.0" = {

     

       58303
       58303
       +
             name = "tspan";

     

       58304
       58304
       +
             packageName = "tspan";

     

       58305
       58305
       +
             version = "0.4.0";

     

       58306
       58306
       +
             src = fetchurl {

     

       58307
       58307
       +
               url = "https://registry.npmjs.org/tspan/-/tspan-0.4.0.tgz";

     

       58308
       58308
       +
               sha512 = "0ELL9tpLpTqLliFyQySaxgCO43buCML+j3TI4E1LuSI8wkzITGEVhZCyMvv/A+3ek9KpgALhhgnZESRLTbN+iw==";

     

       58309
       58309
       +
             };

     

       58310
       58310
       +
           };

     

       58167
       58311
        
           "tsscmp-1.0.6" = {

     

       58168
       58312
        
             name = "tsscmp";

     

       58169
       58313
        
             packageName = "tsscmp";

     
···

       58515
       58659
        
               sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==";

     

       58516
       58660
        
             };

     

       58517
       58661
        
           };

     

       58518
       58518
       -
           "type-fest-1.1.3" = {

     

       58662
       58662
       +
           "type-fest-1.2.0" = {

     

       58519
       58663
        
             name = "type-fest";

     

       58520
       58664
        
             packageName = "type-fest";

     

       58521
       58521
       -
             version = "1.1.3";

     

       58665
       58665
       +
             version = "1.2.0";

     

       58522
       58666
        
             src = fetchurl {

     

       58523
       58523
       -
               url = "https://registry.npmjs.org/type-fest/-/type-fest-1.1.3.tgz";

     

       58524
       58524
       -
               sha512 = "CsiQeFMR1jZEq8R+H59qe+bBevnjoV5N2WZTTdlyqxeoODQOOepN2+msQOywcieDq5sBjabKzTn3U+sfHZlMdw==";

     

       58667
       58667
       +
               url = "https://registry.npmjs.org/type-fest/-/type-fest-1.2.0.tgz";

     

       58668
       58668
       +
               sha512 = "++0N6KyAj0t2webXst0PE0xuXb4Dv3z1Z+4SGzK+j/epeWBZCfkQbkW/ezscZwpinmBQ5wu/l4TqagKSVcAGCA==";

     

       58525
       58669
        
             };

     

       58526
       58670
        
           };

     

       58527
       58671
        
           "type-is-1.6.18" = {

     
···

       61261
       61405
        
               sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09";

     

       61262
       61406
        
             };

     

       61263
       61407
        
           };

     

       61264
       61264
       -
           "vsce-1.88.0" = {

     

       61408
       61408
       +
           "vsce-1.91.0" = {

     

       61265
       61409
        
             name = "vsce";

     

       61266
       61410
        
             packageName = "vsce";

     

       61267
       61267
       -
             version = "1.88.0";

     

       61411
       61411
       +
             version = "1.91.0";

     

       61268
       61412
        
             src = fetchurl {

     

       61269
       61269
       -
               url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz";

     

       61270
       61270
       -
               sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw==";

     

       61413
       61413
       +
               url = "https://registry.npmjs.org/vsce/-/vsce-1.91.0.tgz";

     

       61414
       61414
       +
               sha512 = "y75QryWKzAw5KIR4NFEXc6XAy/Er1BHXdNwAESgKKFw8Yc8cA/+dP4Gj7VYhNPOJlV0v5j1in/cPkLFZAqC7cQ==";

     

       61271
       61415
        
             };

     

       61272
       61416
        
           };

     

       61273
       61417
        
           "vscode-css-languageservice-3.0.13" = {

     
···

       61979
       62123
        
             src = fetchurl {

     

       61980
       62124
        
               url = "https://registry.npmjs.org/watershed/-/watershed-0.3.4.tgz";

     

       61981
       62125
        
               sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c";

     

       62126
       62126
       +
             };

     

       62127
       62127
       +
           };

     

       62128
       62128
       +
           "wavedrom-2.6.9" = {

     

       62129
       62129
       +
             name = "wavedrom";

     

       62130
       62130
       +
             packageName = "wavedrom";

     

       62131
       62131
       +
             version = "2.6.9";

     

       62132
       62132
       +
             src = fetchurl {

     

       62133
       62133
       +
               url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.6.9.tgz";

     

       62134
       62134
       +
               sha512 = "EXBubejy7GrzibGLJ6OXH5HAP7KbA62gXMm8FvqJH0W5S05D6pgqdnRG20KP1w/WSY+zqdVIkiHNxwgquPbs2w==";

     

       61982
       62135
        
             };

     

       61983
       62136
        
           };

     

       61984
       62137
        
           "wawoff2-1.0.2" = {

     
···

       63349
       63502
        
               sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ==";

     

       63350
       63503
        
             };

     

       63351
       63504
        
           };

     

       63352
       63352
       -
           "xdl-59.0.40" = {

     

       63505
       63505
       +
           "xdl-59.0.42" = {

     

       63353
       63506
        
             name = "xdl";

     

       63354
       63507
        
             packageName = "xdl";

     

       63355
       63355
       -
             version = "59.0.40";

     

       63508
       63508
       +
             version = "59.0.42";

     

       63356
       63509
        
             src = fetchurl {

     

       63357
       63357
       -
               url = "https://registry.npmjs.org/xdl/-/xdl-59.0.40.tgz";

     

       63358
       63358
       -
               sha512 = "TRSCBA2bRGiMATsf0dpyKtTo80WHYRWL+Rbo6OOLh1ODR032dvdrh0v1eaUcmnEnjUxF2uXgUQaoi5qiVhxB3A==";

     

       63510
       63510
       +
               url = "https://registry.npmjs.org/xdl/-/xdl-59.0.42.tgz";

     

       63511
       63511
       +
               sha512 = "/Er1hvi8AB5YbAL/JulvFkNHKd1B+9Sl8PttHZmu8kaqApkDZWPNvWhN3hBEnJIIzEODTejYII3IoAQmf7PveA==";

     

       63359
       63512
        
             };

     

       63360
       63513
        
           };

     

       63361
       63514
        
           "xenvar-0.5.1" = {

     
···

       63764
       63917
        
               sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ==";

     

       63765
       63918
        
             };

     

       63766
       63919
        
           };

     

       63767
       63767
       -
           "xstate-4.19.2" = {

     

       63920
       63920
       +
           "xstate-4.20.0" = {

     

       63768
       63921
        
             name = "xstate";

     

       63769
       63922
        
             packageName = "xstate";

     

       63770
       63770
       -
             version = "4.19.2";

     

       63923
       63923
       +
             version = "4.20.0";

     

       63771
       63924
        
             src = fetchurl {

     

       63772
       63772
       -
               url = "https://registry.npmjs.org/xstate/-/xstate-4.19.2.tgz";

     

       63773
       63773
       -
               sha512 = "eWI6kOHavcqhu1ACCmRowYGaQnH0KGvBoGg3lqmle9ZYyVWa2ZcVTgZlsK7o419/jw9gWX2LYmYGkm9w/VoXMA==";

     

       63925
       63925
       +
               url = "https://registry.npmjs.org/xstate/-/xstate-4.20.0.tgz";

     

       63926
       63926
       +
               sha512 = "u5Ou1CMo/oWApasmv1TYTHgj38k69DJdTqQdBBwt+/ooNhPJQiSIKTB3Y3HvX0h5tulwfSo6xAwZgBgjRsK3LA==";

     

       63774
       63927
        
             };

     

       63775
       63928
        
           };

     

       63776
       63929
        
           "xstream-11.14.0" = {

     
···

       65286
       65439
        
             sources."@webassemblyjs/wast-printer-1.11.0"

     

       65287
       65440
        
             sources."@xtuc/ieee754-1.2.0"

     

       65288
       65441
        
             sources."@xtuc/long-4.2.2"

     

       65289
       65289
       -
             sources."acorn-8.2.4"

     

       65442
       65442
       +
             sources."acorn-8.3.0"

     

       65290
       65443
        
             sources."ajv-6.12.6"

     

       65291
       65444
        
             sources."ajv-keywords-3.5.2"

     

       65292
       65445
        
             sources."ansi-colors-4.1.1"

     
···

       65305
       65458
        
             sources."buffer-5.7.1"

     

       65306
       65459
        
             sources."buffer-from-1.1.1"

     

       65307
       65460
        
             sources."callsites-3.1.0"

     

       65308
       65308
       -
             sources."caniuse-lite-1.0.30001230"

     

       65461
       65461
       +
             sources."caniuse-lite-1.0.30001232"

     

       65309
       65462
        
             sources."chalk-3.0.0"

     

       65310
       65463
        
             sources."chardet-0.7.0"

     

       65311
       65464
        
             sources."chokidar-3.5.1"

     
···

       65325
       65478
        
             sources."cross-spawn-7.0.3"

     

       65326
       65479
        
             sources."deepmerge-4.2.2"

     

       65327
       65480
        
             sources."defaults-1.0.3"

     

       65328
       65328
       -
             sources."electron-to-chromium-1.3.741"

     

       65481
       65481
       +
             sources."electron-to-chromium-1.3.743"

     

       65329
       65482
        
             sources."emoji-regex-8.0.0"

     

       65330
       65483
        
             sources."end-of-stream-1.4.4"

     

       65331
       65484
        
             (sources."enhanced-resolve-5.8.2" // {

     
···

       65393
       65546
        
             sources."is-stream-2.0.0"

     

       65394
       65547
        
             sources."is-unicode-supported-0.1.0"

     

       65395
       65548
        
             sources."isexe-2.0.0"

     

       65396
       65396
       -
             sources."jest-worker-26.6.2"

     

       65549
       65549
       +
             (sources."jest-worker-27.0.2" // {

     

       65550
       65550
       +
               dependencies = [

     

       65551
       65551
       +
                 sources."supports-color-8.1.1"

     

       65552
       65552
       +
               ];

     

       65553
       65553
       +
             })

     

       65397
       65554
        
             sources."js-tokens-4.0.0"

     

       65398
       65555
        
             sources."json-parse-better-errors-1.0.2"

     

       65399
       65556
        
             sources."json-parse-even-better-errors-2.3.1"

     
···

       65492
       65649
        
                 sources."commander-2.20.3"

     

       65493
       65650
        
               ];

     

       65494
       65651
        
             })

     

       65495
       65495
       -
             (sources."terser-webpack-plugin-5.1.2" // {

     

       65652
       65652
       +
             (sources."terser-webpack-plugin-5.1.3" // {

     

       65496
       65653
        
               dependencies = [

     

       65497
       65654
        
                 sources."schema-utils-3.0.0"

     

       65498
       65655
        
                 sources."source-map-0.6.1"

     
···

       65721
       65878
        
               ];

     

       65722
       65879
        
             })

     

       65723
       65880
        
             sources."@types/keygrip-1.0.2"

     

       65724
       65724
       -
             sources."@types/koa-2.13.2"

     

       65881
       65881
       +
             sources."@types/koa-2.13.3"

     

       65725
       65882
        
             sources."@types/koa-compose-3.2.5"

     

       65726
       65883
        
             sources."@types/long-4.0.1"

     

       65727
       65884
        
             sources."@types/mime-1.3.2"

     
···

       65870
       66027
        
             sources."call-bind-1.0.2"

     

       65871
       66028
        
             sources."call-me-maybe-1.0.1"

     

       65872
       66029
        
             sources."camelcase-5.3.1"

     

       65873
       65873
       -
             sources."caniuse-lite-1.0.30001230"

     

       66030
       66030
       +
             sources."caniuse-lite-1.0.30001232"

     

       65874
       66031
        
             sources."caseless-0.12.0"

     

       65875
       66032
        
             sources."caw-2.0.1"

     

       65876
       66033
        
             sources."chalk-2.4.2"

     
···

       65928
       66085
        
             sources."cookie-0.4.0"

     

       65929
       66086
        
             sources."cookie-signature-1.0.6"

     

       65930
       66087
        
             sources."copy-descriptor-0.1.1"

     

       65931
       65931
       -
             (sources."core-js-compat-3.13.0" // {

     

       66088
       66088
       +
             (sources."core-js-compat-3.13.1" // {

     

       65932
       66089
        
               dependencies = [

     

       65933
       66090
        
                 sources."semver-7.0.0"

     

       65934
       66091
        
               ];

     

       65935
       66092
        
             })

     

       65936
       65936
       -
             sources."core-js-pure-3.13.0"

     

       66093
       66093
       +
             sources."core-js-pure-3.13.1"

     

       65937
       66094
        
             sources."core-util-is-1.0.2"

     

       65938
       66095
        
             sources."cors-2.8.5"

     

       65939
       66096
        
             (sources."cross-spawn-6.0.5" // {

     
···

       66000
       66157
        
             sources."ecc-jsbn-0.1.2"

     

       66001
       66158
        
             sources."ee-first-1.1.1"

     

       66002
       66159
        
             sources."ejs-2.7.4"

     

       66003
       66003
       -
             sources."electron-to-chromium-1.3.741"

     

       66160
       66160
       +
             sources."electron-to-chromium-1.3.743"

     

       66004
       66161
        
             sources."emoji-regex-7.0.3"

     

       66005
       66162
        
             sources."encodeurl-1.0.2"

     

       66006
       66163
        
             sources."end-of-stream-1.4.4"

     
···

       66088
       66245
        
             sources."for-in-1.0.2"

     

       66089
       66246
        
             sources."forever-agent-0.6.1"

     

       66090
       66247
        
             sources."form-data-2.3.3"

     

       66091
       66091
       -
             sources."forwarded-0.1.2"

     

       66248
       66248
       +
             sources."forwarded-0.2.0"

     

       66092
       66249
        
             sources."fragment-cache-0.2.1"

     

       66093
       66250
        
             sources."fresh-0.5.2"

     

       66094
       66251
        
             sources."from2-2.3.0"

     
···

       66430
       66587
        
             sources."process-exists-3.1.0"

     

       66431
       66588
        
             sources."process-nextick-args-2.0.1"

     

       66432
       66589
        
             sources."proto-list-1.2.4"

     

       66433
       66433
       -
             sources."proxy-addr-2.0.6"

     

       66590
       66590
       +
             sources."proxy-addr-2.0.7"

     

       66434
       66591
        
             sources."ps-list-4.1.0"

     

       66435
       66592
        
             sources."pseudomap-1.0.2"

     

       66436
       66593
        
             sources."psl-1.8.0"

     
···

       67016
       67173
        
             sources."balanced-match-1.0.2"

     

       67017
       67174
        
             sources."brace-expansion-1.1.11"

     

       67018
       67175
        
             sources."browserslist-4.16.6"

     

       67019
       67019
       -
             sources."caniuse-lite-1.0.30001230"

     

       67176
       67176
       +
             sources."caniuse-lite-1.0.30001232"

     

       67020
       67177
        
             sources."chalk-2.4.2"

     

       67021
       67178
        
             sources."color-convert-1.9.3"

     

       67022
       67179
        
             sources."color-name-1.1.3"

     
···

       67027
       67184
        
             sources."convert-source-map-1.7.0"

     

       67028
       67185
        
             sources."debug-4.3.2"

     

       67029
       67186
        
             sources."ejs-3.1.6"

     

       67030
       67030
       -
             sources."electron-to-chromium-1.3.741"

     

       67187
       67187
       +
             sources."electron-to-chromium-1.3.743"

     

       67031
       67188
        
             sources."ensure-posix-path-1.1.1"

     

       67032
       67189
        
             sources."escalade-3.1.1"

     

       67033
       67190
        
             sources."escape-string-regexp-1.0.5"

     
···

       67616
       67773
        
             sources."finalhandler-1.1.2"

     

       67617
       67774
        
             sources."forever-agent-0.6.1"

     

       67618
       67775
        
             sources."form-data-3.0.0"

     

       67619
       67619
       -
             sources."forwarded-0.1.2"

     

       67776
       67776
       +
             sources."forwarded-0.2.0"

     

       67620
       67777
        
             sources."fresh-0.5.2"

     

       67621
       67778
        
             sources."gauge-1.2.7"

     

       67622
       67779
        
             sources."gaxios-4.3.0"

     
···

       67921
       68078
        
                 sources."@types/node-15.6.1"

     

       67922
       68079
        
               ];

     

       67923
       68080
        
             })

     

       67924
       67924
       -
             sources."proxy-addr-2.0.6"

     

       68081
       68081
       +
             sources."proxy-addr-2.0.7"

     

       67925
       68082
        
             (sources."psbt-1.1.9" // {

     

       67926
       68083
        
               dependencies = [

     

       67927
       68084
        
                 sources."bn.js-5.2.0"

     
···

       68328
       68485
        
             sources."loud-rejection-1.6.0"

     

       68329
       68486
        
             sources."map-obj-1.0.1"

     

       68330
       68487
        
             sources."meow-3.7.0"

     

       68331
       68331
       -
             sources."mime-db-1.47.0"

     

       68488
       68488
       +
             sources."mime-db-1.48.0"

     

       68332
       68489
        
             sources."minimatch-3.0.4"

     

       68333
       68490
        
             sources."minimist-1.2.5"

     

       68334
       68491
        
             sources."mkdirp-0.5.5"

     
···

       68800
       68957
        
             sources."follow-redirects-1.14.1"

     

       68801
       68958
        
             sources."forever-agent-0.6.1"

     

       68802
       68959
        
             sources."form-data-2.3.3"

     

       68803
       68803
       -
             sources."forwarded-0.1.2"

     

       68960
       68960
       +
             sources."forwarded-0.2.0"

     

       68804
       68961
        
             sources."fresh-0.5.2"

     

       68805
       68962
        
             sources."function-bind-1.1.1"

     

       68806
       68963
        
             sources."get-caller-file-2.0.5"

     
···

       68927
       69084
        
             })

     

       68928
       69085
        
             sources."pngjs-3.4.0"

     

       68929
       69086
        
             sources."promise-7.3.1"

     

       68930
       68930
       -
             sources."proxy-addr-2.0.6"

     

       69087
       69087
       +
             sources."proxy-addr-2.0.7"

     

       68931
       69088
        
             sources."psl-1.8.0"

     

       68932
       69089
        
             sources."pug-3.0.2"

     

       68933
       69090
        
             sources."pug-attrs-3.0.0"

     
···

       69500
       69657
        
         cdk8s-cli = nodeEnv.buildNodePackage {

     

       69501
       69658
        
           name = "cdk8s-cli";

     

       69502
       69659
        
           packageName = "cdk8s-cli";

     

       69503
       69503
       -
           version = "1.0.0-beta.11";

     

       69660
       69660
       +
           version = "1.0.0-beta.18";

     

       69504
       69661
        
           src = fetchurl {

     

       69505
       69505
       -
             url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.11.tgz";

     

       69506
       69506
       -
             sha512 = "Oo/tO5aqmjsBORN93dSnidF7+2u77Q9zwUn9VbCQkZqCNfeZZcwIV9AG108hMYwtcXqtKQC7wevX6rmi9l8lng==";

     

       69662
       69662
       +
             url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.18.tgz";

     

       69663
       69663
       +
             sha512 = "eT0Z2u8yB8gMAIOMJ76TjeCQZ8nzxSbN/Y87cbzhT9I6vyLjgCw/w+48XXudOfW63kY2/TugWtZE+mwQlu3QXw==";

     

       69507
       69664
        
           };

     

       69508
       69665
        
           dependencies = [

     

       69509
       69666
        
             sources."@jsii/spec-1.30.0"

     
···

       69515
       69672
        
             sources."call-bind-1.0.2"

     

       69516
       69673
        
             sources."camelcase-6.2.0"

     

       69517
       69674
        
             sources."case-1.6.3"

     

       69518
       69518
       -
             sources."cdk8s-1.0.0-beta.11"

     

       69675
       69675
       +
             sources."cdk8s-1.0.0-beta.14"

     

       69519
       69676
        
             sources."cliui-7.0.4"

     

       69520
       69677
        
             sources."clone-2.1.2"

     

       69521
       69678
        
             (sources."codemaker-1.30.0" // {

     
···

       69527
       69684
        
             sources."color-name-1.1.4"

     

       69528
       69685
        
             sources."colors-1.4.0"

     

       69529
       69686
        
             sources."commonmark-0.29.3"

     

       69530
       69530
       -
             sources."constructs-3.3.71"

     

       69687
       69687
       +
             sources."constructs-3.3.75"

     

       69531
       69688
        
             sources."date-format-3.0.0"

     

       69532
       69689
        
             sources."debug-4.3.2"

     

       69533
       69690
        
             sources."decamelize-5.0.0"

     
···

       69682
       69839
        
           buildInputs = globalBuildInputs;

     

       69683
       69840
        
           meta = {

     

       69684
       69841
        
             description = "CDK for Kubernetes CLI";

     

       69685
       69685
       -
             homepage = "https://github.com/awslabs/cdk8s#readme";

     

       69686
       69842
        
             license = "Apache-2.0";

     

       69687
       69843
        
           };

     

       69688
       69844
        
           production = true;

     
···

       69756
       69912
        
             sources."colors-1.4.0"

     

       69757
       69913
        
             sources."combined-stream-1.0.8"

     

       69758
       69914
        
             sources."commonmark-0.29.3"

     

       69759
       69759
       -
             sources."compress-commons-4.1.0"

     

       69915
       69915
       +
             sources."compress-commons-4.1.1"

     

       69760
       69916
        
             sources."concat-map-0.0.1"

     

       69761
       69917
        
             sources."constructs-3.3.75"

     

       69762
       69918
        
             sources."convert-to-spaces-1.0.2"

     
···

       70539
       70695
        
         coc-metals = nodeEnv.buildNodePackage {

     

       70540
       70696
        
           name = "coc-metals";

     

       70541
       70697
        
           packageName = "coc-metals";

     

       70542
       70542
       -
           version = "1.0.5";

     

       70698
       70698
       +
           version = "1.0.6";

     

       70543
       70699
        
           src = fetchurl {

     

       70544
       70544
       -
             url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.5.tgz";

     

       70545
       70545
       -
             sha512 = "YWnhsa/SDrxdJwcRrvFUiNOYuhDE8STBo5t1Nvokk/OaFoKfTS/OrxE2xTrDPWgJAxytyfnIjxBduokB1+LT3g==";

     

       70700
       70700
       +
             url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.6.tgz";

     

       70701
       70701
       +
             sha512 = "MQuXdCblmy5Qnrlqmb7ntDjpgxtdXsbdAgxf23Ai2QFpf14bdc+gz4U/+9pOEpSswODtMvMqnjfTA1lY7p2AfQ==";

     

       70546
       70702
        
           };

     

       70547
       70703
        
           dependencies = [

     

       70548
       70704
        
             sources."@chemzqm/neovim-5.2.13"

     
···

       70833
       70989
        
             sources."callsites-3.1.0"

     

       70834
       70990
        
             sources."camelcase-2.1.1"

     

       70835
       70991
        
             sources."camelcase-keys-2.1.0"

     

       70836
       70836
       -
             sources."caniuse-lite-1.0.30001230"

     

       70992
       70992
       +
             sources."caniuse-lite-1.0.30001232"

     

       70837
       70993
        
             sources."capture-stack-trace-1.0.1"

     

       70838
       70994
        
             sources."ccount-1.1.0"

     

       70839
       70995
        
             (sources."chalk-4.1.1" // {

     
···

       70895
       71051
        
               ];

     

       70896
       71052
        
             })

     

       70897
       71053
        
             sources."copy-descriptor-0.1.1"

     

       70898
       70898
       -
             sources."core-js-3.13.0"

     

       71054
       71054
       +
             sources."core-js-3.13.1"

     

       70899
       71055
        
             sources."cosmiconfig-3.1.0"

     

       70900
       71056
        
             sources."create-error-class-3.0.2"

     

       70901
       71057
        
             sources."cross-spawn-7.0.3"

     
···

       70931
       71087
        
             sources."domutils-1.7.0"

     

       70932
       71088
        
             sources."dot-prop-5.3.0"

     

       70933
       71089
        
             sources."duplexer3-0.1.4"

     

       70934
       70934
       -
             sources."electron-to-chromium-1.3.741"

     

       71090
       71090
       +
             sources."electron-to-chromium-1.3.743"

     

       70935
       71091
        
             sources."emoji-regex-8.0.0"

     

       70936
       71092
        
             sources."end-of-stream-1.4.4"

     

       70937
       71093
        
             sources."enquirer-2.3.6"

     
···

       71740
       71896
        
             sha512 = "bUb/GuY0QjlDAws60UNDL8ZiRzp6sLmSqRkMyAAUEb9arsSphvok80P3i/NEsJhG2lgx2LaEz1mKUCnR+UjTlA==";

     

       71741
       71897
        
           };

     

       71742
       71898
        
           dependencies = [

     

       71743
       71743
       -
             sources."pyright-1.1.144"

     

       71899
       71899
       +
             sources."pyright-1.1.145"

     

       71744
       71900
        
           ];

     

       71745
       71901
        
           buildInputs = globalBuildInputs;

     

       71746
       71902
        
           meta = {

     
···

       71814
       71970
        
         coc-rust-analyzer = nodeEnv.buildNodePackage {

     

       71815
       71971
        
           name = "coc-rust-analyzer";

     

       71816
       71972
        
           packageName = "coc-rust-analyzer";

     

       71817
       71817
       -
           version = "0.45.1";

     

       71973
       71973
       +
           version = "0.46.0";

     

       71818
       71974
        
           src = fetchurl {

     

       71819
       71819
       -
             url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.45.1.tgz";

     

       71820
       71820
       -
             sha512 = "2BFV6NJDi2s8Z41xf0Zk49fAWkYioZH+D7bKVQTb2LrhhKlmgfw4HGLe/9AZrvUPOcCDEuE9CS+lSnZjeJuUPg==";

     

       71975
       71975
       +
             url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.0.tgz";

     

       71976
       71976
       +
             sha512 = "KwkFaDNBwZtqdahUPKYKoCb0nvLZ1wu5L2/8kpK94IMDgNPy3TUTxujtwDjLwjYo/z+W5reRfwIYNJZ3FZ2Onw==";

     

       71821
       71977
        
           };

     

       71822
       71978
        
           buildInputs = globalBuildInputs;

     

       71823
       71979
        
           meta = {

     
···

       71945
       72101
        
             sources."callsites-3.1.0"

     

       71946
       72102
        
             sources."camelcase-5.3.1"

     

       71947
       72103
        
             sources."camelcase-keys-6.2.2"

     

       71948
       71948
       -
             sources."caniuse-lite-1.0.30001230"

     

       72104
       72104
       +
             sources."caniuse-lite-1.0.30001232"

     

       71949
       72105
        
             (sources."chalk-4.1.1" // {

     

       71950
       72106
        
               dependencies = [

     

       71951
       72107
        
                 sources."ansi-styles-4.3.0"

     
···

       71983
       72139
        
             sources."domelementtype-1.3.1"

     

       71984
       72140
        
             sources."domhandler-2.4.2"

     

       71985
       72141
        
             sources."domutils-1.7.0"

     

       71986
       71986
       -
             sources."electron-to-chromium-1.3.741"

     

       72142
       72142
       +
             sources."electron-to-chromium-1.3.743"

     

       71987
       72143
        
             sources."emoji-regex-8.0.0"

     

       71988
       72144
        
             sources."entities-1.1.2"

     

       71989
       72145
        
             sources."error-ex-1.3.2"

     
···

       72245
       72401
        
         coc-texlab = nodeEnv.buildNodePackage {

     

       72246
       72402
        
           name = "coc-texlab";

     

       72247
       72403
        
           packageName = "coc-texlab";

     

       72248
       72248
       -
           version = "3.0.1";

     

       72404
       72404
       +
           version = "3.0.2";

     

       72249
       72405
        
           src = fetchurl {

     

       72250
       72250
       -
             url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.1.tgz";

     

       72251
       72251
       -
             sha512 = "0uom/t9g+4u1SgRDbfBIbnPRmlRS2odBCDcyP8+JQcEHYS2LXni0udDVZOG/4lbOFEZmMLbAcds0tTJpJ9SZhg==";

     

       72406
       72406
       +
             url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.0.2.tgz";

     

       72407
       72407
       +
             sha512 = "YiPB0gasof89HqAGz55BICHtt9gDyTjsNY1mwdKkJP0ZmgSxub5q+hOYYbay56X4+348Raxx0fp75JI8ax1nAw==";

     

       72252
       72408
        
           };

     

       72253
       72409
        
           buildInputs = globalBuildInputs;

     

       72254
       72410
        
           meta = {

     
···

       72431
       72587
        
             sources."enquirer-2.3.6"

     

       72432
       72588
        
             sources."escape-string-regexp-4.0.0"

     

       72433
       72589
        
             sources."eslint-7.27.0"

     

       72434
       72434
       -
             sources."eslint-plugin-vue-7.9.0"

     

       72590
       72590
       +
             sources."eslint-plugin-vue-7.10.0"

     

       72435
       72591
        
             sources."eslint-scope-5.1.1"

     

       72436
       72592
        
             (sources."eslint-utils-2.1.0" // {

     

       72437
       72593
        
               dependencies = [

     
···

       73040
       73196
        
             sources."find-up-2.1.0"

     

       73041
       73197
        
             sources."forever-agent-0.6.1"

     

       73042
       73198
        
             sources."form-data-2.3.3"

     

       73043
       73043
       -
             sources."forwarded-0.1.2"

     

       73199
       73199
       +
             sources."forwarded-0.2.0"

     

       73044
       73200
        
             sources."fresh-0.5.2"

     

       73045
       73201
        
             sources."fs-extra-9.1.0"

     

       73046
       73202
        
             sources."fs-minipass-2.1.0"

     
···

       73277
       73433
        
             sources."promise-inflight-1.0.1"

     

       73278
       73434
        
             sources."promise-retry-2.0.1"

     

       73279
       73435
        
             sources."promzard-0.3.0"

     

       73280
       73280
       -
             sources."proxy-addr-2.0.6"

     

       73436
       73436
       +
             sources."proxy-addr-2.0.7"

     

       73281
       73437
        
             sources."psl-1.8.0"

     

       73282
       73438
        
             sources."pump-3.0.0"

     

       73283
       73439
        
             sources."punycode-2.1.1"

     
···

       75175
       75331
        
             sources."bcrypt-pbkdf-1.0.2"

     

       75176
       75332
        
             sources."bl-4.1.0"

     

       75177
       75333
        
             sources."bluebird-3.7.2"

     

       75178
       75178
       -
             sources."boolean-3.0.4"

     

       75334
       75334
       +
             sources."boolean-3.1.0"

     

       75179
       75335
        
             sources."brace-expansion-1.1.11"

     

       75180
       75336
        
             sources."buffer-5.7.1"

     

       75181
       75337
        
             sources."buffer-alloc-1.2.0"

     
···

       75213
       75369
        
             sources."concat-map-0.0.1"

     

       75214
       75370
        
             sources."config-chain-1.1.12"

     

       75215
       75371
        
             sources."console-control-strings-1.1.0"

     

       75216
       75216
       -
             sources."core-js-3.13.0"

     

       75372
       75372
       +
             sources."core-js-3.13.1"

     

       75217
       75373
        
             sources."core-util-is-1.0.2"

     

       75218
       75374
        
             sources."cross-spawn-7.0.3"

     

       75219
       75375
        
             sources."currently-unhandled-0.4.1"

     
···

       75803
       75959
        
                 sources."quick-lru-4.0.1"

     

       75804
       75960
        
               ];

     

       75805
       75961
        
             })

     

       75806
       75806
       -
             sources."caniuse-lite-1.0.30001230"

     

       75962
       75962
       +
             sources."caniuse-lite-1.0.30001232"

     

       75807
       75963
        
             sources."chalk-2.4.2"

     

       75808
       75964
        
             sources."ci-info-2.0.0"

     

       75809
       75965
        
             sources."cli-boxes-2.2.1"

     
···

       75840
       75996
        
             })

     

       75841
       75997
        
             sources."defer-to-connect-2.0.1"

     

       75842
       75998
        
             sources."dot-prop-5.3.0"

     

       75843
       75843
       -
             sources."electron-to-chromium-1.3.741"

     

       75999
       75999
       +
             sources."electron-to-chromium-1.3.743"

     

       75844
       76000
        
             sources."emoji-regex-8.0.0"

     

       75845
       76001
        
             sources."emojilib-2.4.0"

     

       75846
       76002
        
             sources."end-of-stream-1.4.4"

     
···

       76115
       76271
        
                 sources."normalize-path-2.1.1"

     

       76116
       76272
        
               ];

     

       76117
       76273
        
             })

     

       76118
       76118
       -
             sources."@microsoft/load-themed-styles-1.10.173"

     

       76274
       76274
       +
             sources."@microsoft/load-themed-styles-1.10.174"

     

       76119
       76275
        
             sources."@nodelib/fs.scandir-2.1.4"

     

       76120
       76276
        
             sources."@nodelib/fs.stat-2.0.4"

     

       76121
       76277
        
             sources."@nodelib/fs.walk-1.2.6"

     
···

       76684
       76840
        
             sources."for-own-1.0.0"

     

       76685
       76841
        
             sources."forever-agent-0.6.1"

     

       76686
       76842
        
             sources."form-data-2.3.3"

     

       76687
       76687
       -
             sources."forwarded-0.1.2"

     

       76843
       76843
       +
             sources."forwarded-0.2.0"

     

       76688
       76844
        
             sources."fragment-cache-0.2.1"

     

       76689
       76845
        
             sources."fresh-0.5.2"

     

       76690
       76846
        
             (sources."from2-2.3.0" // {

     
···

       77284
       77440
        
             sources."promise-inflight-1.0.1"

     

       77285
       77441
        
             sources."promise-queue-2.2.5"

     

       77286
       77442
        
             sources."prop-types-15.7.2"

     

       77287
       77287
       -
             sources."proxy-addr-2.0.6"

     

       77443
       77443
       +
             sources."proxy-addr-2.0.7"

     

       77288
       77444
        
             sources."prr-1.0.1"

     

       77289
       77445
        
             sources."psl-1.8.0"

     

       77290
       77446
        
             (sources."public-encrypt-4.0.3" // {

     
···

       78140
       78296
        
         expo-cli = nodeEnv.buildNodePackage {

     

       78141
       78297
        
           name = "expo-cli";

     

       78142
       78298
        
           packageName = "expo-cli";

     

       78143
       78143
       -
           version = "4.5.0";

     

       78299
       78299
       +
           version = "4.5.2";

     

       78144
       78300
        
           src = fetchurl {

     

       78145
       78145
       -
             url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.0.tgz";

     

       78146
       78146
       -
             sha512 = "SY+ff6RtgviIV5p776TbeiG3qfI8lRGKBwUbrGQNVWnlgFhrRIY8H8Dixc3jcZmNV669Id5Ha0v+UqBF1duQzw==";

     

       78301
       78301
       +
             url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.5.2.tgz";

     

       78302
       78302
       +
             sha512 = "r6SeIMk2ZP1/rSKGcXquiQp/A7MGAmJvG0otmJhlO5ypdYXfAJ1fhEJIqt7ufSngc5RRJ0cjnKZ1WBSyJlJTNA==";

     

       78147
       78303
        
           };

     

       78148
       78304
        
           dependencies = [

     

       78149
       78305
        
             sources."@babel/code-frame-7.12.13"

     
···

       78279
       78435
        
             sources."@babel/types-7.14.4"

     

       78280
       78436
        
             sources."@expo/apple-utils-0.0.0-alpha.20"

     

       78281
       78437
        
             sources."@expo/bunyan-4.0.0"

     

       78282
       78282
       -
             sources."@expo/config-4.0.0"

     

       78283
       78283
       -
             sources."@expo/config-plugins-2.0.0"

     

       78284
       78284
       -
             sources."@expo/config-types-40.0.0-beta.2"

     

       78438
       78438
       +
             sources."@expo/config-4.0.2"

     

       78439
       78439
       +
             sources."@expo/config-plugins-2.0.2"

     

       78440
       78440
       +
             sources."@expo/config-types-41.0.0"

     

       78285
       78441
        
             (sources."@expo/configure-splash-screen-0.4.0" // {

     

       78286
       78442
        
               dependencies = [

     

       78287
       78443
        
                 sources."commander-5.1.0"

     

       78288
       78444
        
                 sources."pngjs-5.0.0"

     

       78289
       78445
        
               ];

     

       78290
       78446
        
             })

     

       78291
       78291
       -
             (sources."@expo/dev-server-0.1.70" // {

     

       78447
       78447
       +
             (sources."@expo/dev-server-0.1.72" // {

     

       78292
       78448
        
               dependencies = [

     

       78293
       78449
        
                 sources."body-parser-1.19.0"

     

       78294
       78450
        
                 sources."bytes-3.1.0"

     
···

       78297
       78453
        
                 sources."iconv-lite-0.4.24"

     

       78298
       78454
        
                 sources."inherits-2.0.3"

     

       78299
       78455
        
                 sources."ms-2.0.0"

     

       78456
       78456
       +
                 sources."open-8.2.0"

     

       78300
       78457
        
                 sources."qs-6.7.0"

     

       78301
       78458
        
                 sources."raw-body-2.4.0"

     

       78302
       78459
        
                 sources."setprototypeof-1.1.1"

     

       78303
       78460
        
                 sources."statuses-1.5.0"

     

       78461
       78461
       +
                 sources."temp-dir-2.0.0"

     

       78304
       78462
        
               ];

     

       78305
       78463
        
             })

     

       78306
       78306
       -
             sources."@expo/dev-tools-0.13.100"

     

       78464
       78464
       +
             sources."@expo/dev-tools-0.13.102"

     

       78307
       78465
        
             (sources."@expo/devcert-1.0.0" // {

     

       78308
       78466
        
               dependencies = [

     

       78309
       78467
        
                 sources."debug-3.2.7"

     
···

       78323
       78481
        
                 sources."json5-1.0.1"

     

       78324
       78482
        
               ];

     

       78325
       78483
        
             })

     

       78326
       78326
       -
             sources."@expo/metro-config-0.1.70"

     

       78484
       78484
       +
             sources."@expo/metro-config-0.1.72"

     

       78327
       78485
        
             sources."@expo/osascript-2.0.28"

     

       78328
       78486
        
             (sources."@expo/package-manager-0.0.43" // {

     

       78329
       78487
        
               dependencies = [

     
···

       78337
       78495
        
                 sources."xmlbuilder-14.0.0"

     

       78338
       78496
        
               ];

     

       78339
       78497
        
             })

     

       78340
       78340
       -
             sources."@expo/prebuild-config-1.0.1"

     

       78498
       78498
       +
             sources."@expo/prebuild-config-1.0.3"

     

       78341
       78499
        
             sources."@expo/results-1.0.0"

     

       78342
       78500
        
             (sources."@expo/schemer-1.3.29" // {

     

       78343
       78501
        
               dependencies = [

     
···

       78348
       78506
        
             })

     

       78349
       78507
        
             sources."@expo/simple-spinner-1.0.2"

     

       78350
       78508
        
             sources."@expo/spawn-async-1.5.0"

     

       78351
       78351
       -
             (sources."@expo/webpack-config-0.12.74" // {

     

       78509
       78509
       +
             (sources."@expo/webpack-config-0.12.76" // {

     

       78352
       78510
        
               dependencies = [

     

       78353
       78511
        
                 sources."@babel/runtime-7.9.0"

     

       78354
       78512
        
                 sources."react-refresh-0.8.3"

     
···

       78691
       78849
        
             })

     

       78692
       78850
        
             sources."camelcase-5.3.1"

     

       78693
       78851
        
             sources."caniuse-api-3.0.0"

     

       78694
       78694
       -
             sources."caniuse-lite-1.0.30001230"

     

       78852
       78852
       +
             sources."caniuse-lite-1.0.30001232"

     

       78695
       78853
        
             sources."caseless-0.12.0"

     

       78696
       78854
        
             (sources."chalk-4.1.1" // {

     

       78697
       78855
        
               dependencies = [

     
···

       78825
       78983
        
               ];

     

       78826
       78984
        
             })

     

       78827
       78985
        
             sources."core-js-2.6.12"

     

       78828
       78828
       -
             (sources."core-js-compat-3.13.0" // {

     

       78986
       78986
       +
             (sources."core-js-compat-3.13.1" // {

     

       78829
       78987
        
               dependencies = [

     

       78830
       78988
        
                 sources."semver-7.0.0"

     

       78831
       78989
        
               ];

     
···

       78908
       79066
        
             sources."default-gateway-4.2.0"

     

       78909
       79067
        
             sources."defaults-1.0.3"

     

       78910
       79068
        
             sources."defer-to-connect-2.0.1"

     

       79069
       79069
       +
             sources."define-lazy-prop-2.0.0"

     

       78911
       79070
        
             sources."define-properties-1.1.3"

     

       78912
       79071
        
             sources."define-property-2.0.2"

     

       78913
       79072
        
             (sources."del-6.0.0" // {

     
···

       78964
       79123
        
             sources."duplexify-3.7.1"

     

       78965
       79124
        
             sources."ecc-jsbn-0.1.2"

     

       78966
       79125
        
             sources."ee-first-1.1.1"

     

       78967
       78967
       -
             sources."electron-to-chromium-1.3.741"

     

       79126
       79126
       +
             sources."electron-to-chromium-1.3.743"

     

       78968
       79127
        
             (sources."elliptic-6.5.4" // {

     

       78969
       79128
        
               dependencies = [

     

       78970
       79129
        
                 sources."bn.js-4.12.0"

     
···

       79045
       79204
        
                 sources."ms-2.0.0"

     

       79046
       79205
        
               ];

     

       79047
       79206
        
             })

     

       79048
       79048
       -
             (sources."expo-pwa-0.0.80" // {

     

       79207
       79207
       +
             (sources."expo-pwa-0.0.82" // {

     

       79049
       79208
        
               dependencies = [

     

       79050
       79209
        
                 sources."commander-2.20.0"

     

       79051
       79210
        
               ];

     
···

       79118
       79277
        
               ];

     

       79119
       79278
        
             })

     

       79120
       79279
        
             sources."form-data-2.5.1"

     

       79121
       79121
       -
             sources."forwarded-0.1.2"

     

       79280
       79280
       +
             sources."forwarded-0.2.0"

     

       79122
       79281
        
             sources."fragment-cache-0.2.1"

     

       79123
       79282
        
             sources."freeport-async-2.0.0"

     

       79124
       79283
        
             sources."fresh-0.5.2"

     
···

       79908
       80067
        
             sources."promise-inflight-1.0.1"

     

       79909
       80068
        
             sources."promise-retry-2.0.1"

     

       79910
       80069
        
             sources."prompts-2.4.1"

     

       79911
       79911
       -
             sources."proxy-addr-2.0.6"

     

       80070
       80070
       +
             sources."proxy-addr-2.0.7"

     

       79912
       80071
        
             sources."prr-1.0.1"

     

       79913
       80072
        
             sources."psl-1.8.0"

     

       79914
       80073
        
             (sources."public-encrypt-4.0.3" // {

     
···

       80592
       80751
        
                 sources."uuid-7.0.3"

     

       80593
       80752
        
               ];

     

       80594
       80753
        
             })

     

       80595
       80595
       -
             (sources."xdl-59.0.40" // {

     

       80754
       80754
       +
             (sources."xdl-59.0.42" // {

     

       80596
       80755
        
               dependencies = [

     

       80597
       80756
        
                 sources."chownr-1.1.4"

     

       80598
       80757
        
                 sources."fs-minipass-1.2.7"

     
···

       81644
       81803
        
             sources."combined-stream-1.0.8"

     

       81645
       81804
        
             sources."commander-4.1.1"

     

       81646
       81805
        
             sources."compare-semver-1.1.0"

     

       81647
       81647
       -
             sources."compress-commons-4.1.0"

     

       81806
       81806
       +
             sources."compress-commons-4.1.1"

     

       81648
       81807
        
             sources."compressible-2.0.18"

     

       81649
       81808
        
             (sources."compression-1.7.4" // {

     

       81650
       81809
        
               dependencies = [

     
···

       81804
       81963
        
             sources."fn.name-1.1.0"

     

       81805
       81964
        
             sources."forever-agent-0.6.1"

     

       81806
       81965
        
             sources."form-data-2.3.3"

     

       81807
       81807
       -
             sources."forwarded-0.1.2"

     

       81966
       81966
       +
             sources."forwarded-0.2.0"

     

       81808
       81967
        
             sources."fresh-0.5.2"

     

       81809
       81968
        
             sources."fs-constants-1.0.0"

     

       81810
       81969
        
             sources."fs-extra-5.0.0"

     
···

       82111
       82270
        
             sources."promise-inflight-1.0.1"

     

       82112
       82271
        
             sources."promise-retry-2.0.1"

     

       82113
       82272
        
             sources."protobufjs-6.11.2"

     

       82114
       82114
       -
             sources."proxy-addr-2.0.6"

     

       82273
       82273
       +
             sources."proxy-addr-2.0.7"

     

       82115
       82274
        
             (sources."proxy-agent-4.0.1" // {

     

       82116
       82275
        
               dependencies = [

     

       82117
       82276
        
                 sources."lru-cache-5.1.1"

     
···

       82461
       82620
        
             sources."error-ex-1.3.2"

     

       82462
       82621
        
             sources."esc-exit-2.0.2"

     

       82463
       82622
        
             sources."escape-string-regexp-1.0.5"

     

       82464
       82464
       -
             sources."execa-5.0.0"

     

       82623
       82623
       +
             sources."execa-5.0.1"

     

       82465
       82624
        
             sources."external-editor-3.1.0"

     

       82466
       82625
        
             sources."figures-3.2.0"

     

       82467
       82626
        
             sources."find-up-4.1.0"

     
···

       82820
       82979
        
         forever = nodeEnv.buildNodePackage {

     

       82821
       82980
        
           name = "forever";

     

       82822
       82981
        
           packageName = "forever";

     

       82823
       82823
       -
           version = "3.0.4";

     

       82982
       82982
       +
           version = "4.0.0";

     

       82824
       82983
        
           src = fetchurl {

     

       82825
       82825
       -
             url = "https://registry.npmjs.org/forever/-/forever-3.0.4.tgz";

     

       82826
       82826
       -
             sha512 = "MZDQu9nxVavSOez+k0MGdoe9/0tGN/QfAj3Xn8OjJbRYlLghq/3isf5c2xt280x04EVKguU9/tmLE74259Xazw==";

     

       82984
       82984
       +
             url = "https://registry.npmjs.org/forever/-/forever-4.0.0.tgz";

     

       82985
       82985
       +
             sha512 = "8cFfO0lvIs4c0P5LvKbdvZvtOK/z79AF/vC9DQLH+niyOCPxqq1+12CyYrzHC+5hBILjPU9ClWLVrXvrK+2ZVw==";

     

       82827
       82986
        
           };

     

       82828
       82987
        
           dependencies = [

     

       82829
       82829
       -
             sources."ansi-regex-2.1.1"

     

       82830
       82988
        
             (sources."anymatch-2.0.0" // {

     

       82831
       82989
        
               dependencies = [

     

       82832
       82990
        
                 sources."normalize-path-2.1.1"

     
···

       82840
       82998
        
             sources."async-1.5.2"

     

       82841
       82999
        
             sources."async-each-1.0.3"

     

       82842
       83000
        
             sources."atob-2.1.2"

     

       83001
       83001
       +
             sources."available-typed-arrays-1.0.4"

     

       82843
       83002
        
             sources."balanced-match-1.0.2"

     

       82844
       83003
        
             (sources."base-0.11.2" // {

     

       82845
       83004
        
               dependencies = [

     
···

       82857
       83016
        
             })

     

       82858
       83017
        
             (sources."broadway-0.3.6" // {

     

       82859
       83018
        
               dependencies = [

     

       82860
       82860
       -
                 sources."async-0.2.9"

     

       83019
       83019
       +
                 sources."async-0.2.10"

     

       82861
       83020
        
                 sources."cliff-0.1.9"

     

       82862
       83021
        
                 sources."eventemitter2-0.4.14"

     

       82863
       82863
       -
                 sources."nconf-0.6.9"

     

       82864
       83022
        
                 sources."winston-0.8.0"

     

       82865
       83023
        
               ];

     

       82866
       83024
        
             })

     

       82867
       83025
        
             sources."cache-base-1.0.1"

     

       82868
       83026
        
             sources."call-bind-1.0.2"

     

       82869
       83027
        
             sources."caller-0.0.1"

     

       82870
       82870
       -
             sources."camelcase-2.1.1"

     

       82871
       83028
        
             sources."chokidar-2.1.8"

     

       82872
       83029
        
             (sources."class-utils-0.3.6" // {

     

       82873
       83030
        
               dependencies = [

     
···

       82891
       83048
        
                 sources."colors-1.0.3"

     

       82892
       83049
        
               ];

     

       82893
       83050
        
             })

     

       82894
       82894
       -
             sources."cliui-3.2.0"

     

       82895
       83051
        
             sources."clone-2.1.2"

     

       82896
       82896
       -
             sources."code-point-at-1.1.0"

     

       82897
       83052
        
             sources."collection-visit-1.0.0"

     

       82898
       83053
        
             sources."colors-0.6.2"

     

       82899
       83054
        
             sources."component-emitter-1.3.0"

     

       82900
       83055
        
             sources."concat-map-0.0.1"

     

       83056
       83056
       +
             sources."configstore-4.0.0"

     

       82901
       83057
        
             sources."copy-descriptor-0.1.1"

     

       82902
       83058
        
             sources."core-util-is-1.0.2"

     

       83059
       83059
       +
             sources."crypto-random-string-1.0.0"

     

       82903
       83060
        
             sources."cycle-1.0.3"

     

       82904
       83061
        
             sources."debug-2.6.9"

     

       82905
       82905
       -
             sources."decamelize-1.2.0"

     

       82906
       83062
        
             sources."decode-uri-component-0.2.0"

     

       82907
       82907
       -
             sources."deep-equal-1.1.1"

     

       83063
       83063
       +
             sources."deep-equal-2.0.5"

     

       82908
       83064
        
             sources."define-properties-1.1.3"

     

       82909
       83065
        
             sources."define-property-2.0.2"

     

       82910
       83066
        
             sources."defined-0.0.0"

     

       82911
       83067
        
             sources."director-1.2.7"

     

       83068
       83068
       +
             sources."dot-prop-4.2.1"

     

       82912
       83069
        
             sources."duplexer-0.1.2"

     

       83070
       83070
       +
             sources."es-abstract-1.18.3"

     

       83071
       83071
       +
             sources."es-get-iterator-1.1.2"

     

       83072
       83072
       +
             sources."es-to-primitive-1.2.1"

     

       82913
       83073
        
             sources."event-stream-3.3.4"

     

       82914
       83074
        
             sources."eventemitter2-6.4.3"

     

       82915
       83075
        
             (sources."expand-brackets-2.1.4" // {

     
···

       82949
       83109
        
             })

     

       82950
       83110
        
             sources."flatiron-0.4.3"

     

       82951
       83111
        
             sources."for-in-1.0.2"

     

       83112
       83112
       +
             sources."foreach-2.0.5"

     

       82952
       83113
        
             sources."forever-monitor-3.0.3"

     

       82953
       83114
        
             sources."fragment-cache-0.2.1"

     

       82954
       83115
        
             sources."from-0.1.7"

     
···

       82965
       83126
        
             })

     

       82966
       83127
        
             sources."graceful-fs-4.2.6"

     

       82967
       83128
        
             sources."has-1.0.3"

     

       83129
       83129
       +
             sources."has-bigints-1.0.1"

     

       82968
       83130
        
             sources."has-symbols-1.0.2"

     

       82969
       83131
        
             sources."has-value-1.0.0"

     

       82970
       83132
        
             (sources."has-values-1.0.0" // {

     
···

       82973
       83135
        
               ];

     

       82974
       83136
        
             })

     

       82975
       83137
        
             sources."i-0.3.6"

     

       83138
       83138
       +
             sources."imurmurhash-0.1.4"

     

       82976
       83139
        
             sources."inflight-1.0.6"

     

       82977
       83140
        
             sources."inherits-2.0.4"

     

       82978
       83141
        
             sources."ini-1.3.8"

     

       82979
       82979
       -
             sources."invert-kv-1.0.0"

     

       82980
       83142
        
             sources."is-accessor-descriptor-1.0.0"

     

       82981
       83143
        
             sources."is-arguments-1.1.0"

     

       83144
       83144
       +
             sources."is-bigint-1.0.2"

     

       82982
       83145
        
             sources."is-binary-path-1.0.1"

     

       83146
       83146
       +
             sources."is-boolean-object-1.1.1"

     

       82983
       83147
        
             sources."is-buffer-1.1.6"

     

       83148
       83148
       +
             sources."is-callable-1.2.3"

     

       82984
       83149
        
             sources."is-data-descriptor-1.0.0"

     

       82985
       83150
        
             sources."is-date-object-1.0.4"

     

       82986
       83151
        
             sources."is-descriptor-1.0.2"

     

       82987
       83152
        
             sources."is-extendable-1.0.1"

     

       82988
       83153
        
             sources."is-extglob-2.1.1"

     

       82989
       82989
       -
             sources."is-fullwidth-code-point-1.0.0"

     

       82990
       83154
        
             sources."is-glob-4.0.1"

     

       83155
       83155
       +
             sources."is-map-2.0.2"

     

       83156
       83156
       +
             sources."is-negative-zero-2.0.1"

     

       82991
       83157
        
             (sources."is-number-3.0.0" // {

     

       82992
       83158
        
               dependencies = [

     

       82993
       83159
        
                 sources."kind-of-3.2.2"

     

       82994
       83160
        
               ];

     

       82995
       83161
        
             })

     

       83162
       83162
       +
             sources."is-number-object-1.0.5"

     

       83163
       83163
       +
             sources."is-obj-1.0.1"

     

       82996
       83164
        
             sources."is-plain-object-2.0.4"

     

       82997
       83165
        
             sources."is-regex-1.1.3"

     

       83166
       83166
       +
             sources."is-set-2.0.2"

     

       83167
       83167
       +
             sources."is-string-1.0.6"

     

       83168
       83168
       +
             sources."is-symbol-1.0.4"

     

       83169
       83169
       +
             sources."is-typed-array-1.1.5"

     

       83170
       83170
       +
             sources."is-weakmap-2.0.1"

     

       83171
       83171
       +
             sources."is-weakset-2.0.1"

     

       82998
       83172
        
             sources."is-windows-1.0.2"

     

       82999
       82999
       -
             sources."isarray-1.0.0"

     

       83173
       83173
       +
             sources."isarray-2.0.5"

     

       83000
       83174
        
             sources."isobject-3.0.1"

     

       83001
       83175
        
             sources."isstream-0.1.2"

     

       83002
       83176
        
             sources."jsonify-0.0.0"

     

       83003
       83177
        
             sources."kind-of-6.0.3"

     

       83004
       83178
        
             sources."lazy-1.0.11"

     

       83005
       83005
       -
             sources."lcid-1.0.0"

     

       83179
       83179
       +
             sources."make-dir-1.3.0"

     

       83006
       83180
        
             sources."map-cache-0.2.2"

     

       83007
       83181
        
             sources."map-stream-0.1.0"

     

       83008
       83182
        
             sources."map-visit-1.0.0"

     
···

       83019
       83193
        
             sources."mute-stream-0.0.8"

     

       83020
       83194
        
             sources."nan-2.14.2"

     

       83021
       83195
        
             sources."nanomatch-1.2.13"

     

       83022
       83022
       -
             sources."nconf-0.10.0"

     

       83196
       83196
       +
             (sources."nconf-0.6.9" // {

     

       83197
       83197
       +
               dependencies = [

     

       83198
       83198
       +
                 sources."async-0.2.9"

     

       83199
       83199
       +
               ];

     

       83200
       83200
       +
             })

     

       83023
       83201
        
             sources."ncp-0.4.2"

     

       83024
       83202
        
             sources."normalize-path-3.0.0"

     

       83025
       83203
        
             (sources."nssocket-0.6.0" // {

     
···

       83027
       83205
        
                 sources."eventemitter2-0.4.14"

     

       83028
       83206
        
               ];

     

       83029
       83207
        
             })

     

       83030
       83030
       -
             sources."number-is-nan-1.0.1"

     

       83031
       83208
        
             sources."object-assign-4.1.1"

     

       83032
       83209
        
             (sources."object-copy-0.1.0" // {

     

       83033
       83210
        
               dependencies = [

     
···

       83042
       83219
        
                 sources."kind-of-3.2.2"

     

       83043
       83220
        
               ];

     

       83044
       83221
        
             })

     

       83222
       83222
       +
             sources."object-inspect-1.10.3"

     

       83045
       83223
        
             sources."object-is-1.1.5"

     

       83046
       83224
        
             sources."object-keys-1.1.1"

     

       83047
       83225
        
             sources."object-visit-1.0.1"

     

       83226
       83226
       +
             sources."object.assign-4.1.2"

     

       83048
       83227
        
             sources."object.pick-1.3.0"

     

       83049
       83228
        
             sources."once-1.4.0"

     

       83050
       83229
        
             sources."optimist-0.6.0"

     

       83051
       83051
       -
             sources."os-locale-1.4.0"

     

       83052
       83230
        
             sources."pascalcase-0.1.1"

     

       83053
       83231
        
             sources."path-dirname-1.0.2"

     

       83054
       83232
        
             sources."path-is-absolute-1.0.1"

     

       83055
       83233
        
             sources."pause-stream-0.0.11"

     

       83234
       83234
       +
             sources."pify-3.0.0"

     

       83056
       83235
        
             sources."pkginfo-0.3.1"

     

       83057
       83236
        
             sources."posix-character-classes-0.1.1"

     

       83058
       83237
        
             (sources."prettyjson-1.2.1" // {

     
···

       83065
       83244
        
             sources."prompt-0.2.14"

     

       83066
       83245
        
             sources."ps-tree-1.2.0"

     

       83067
       83246
        
             sources."read-1.0.7"

     

       83068
       83068
       -
             sources."readable-stream-2.3.7"

     

       83247
       83247
       +
             (sources."readable-stream-2.3.7" // {

     

       83248
       83248
       +
               dependencies = [

     

       83249
       83249
       +
                 sources."isarray-1.0.0"

     

       83250
       83250
       +
               ];

     

       83251
       83251
       +
             })

     

       83069
       83252
        
             sources."readdirp-2.2.1"

     

       83070
       83253
        
             sources."regex-not-1.0.2"

     

       83071
       83254
        
             sources."regexp.prototype.flags-1.3.1"

     
···

       83079
       83262
        
             sources."rimraf-2.7.1"

     

       83080
       83263
        
             sources."safe-buffer-5.1.2"

     

       83081
       83264
        
             sources."safe-regex-1.1.0"

     

       83082
       83082
       -
             sources."secure-keys-1.0.0"

     

       83083
       83265
        
             (sources."set-value-2.0.1" // {

     

       83084
       83266
        
               dependencies = [

     

       83085
       83267
        
                 sources."extend-shallow-2.0.1"

     
···

       83087
       83269
        
               ];

     

       83088
       83270
        
             })

     

       83089
       83271
        
             sources."shush-1.0.0"

     

       83272
       83272
       +
             sources."side-channel-1.0.4"

     

       83273
       83273
       +
             sources."signal-exit-3.0.3"

     

       83090
       83274
        
             (sources."snapdragon-0.8.2" // {

     

       83091
       83275
        
               dependencies = [

     

       83092
       83276
        
                 sources."define-property-0.2.5"

     
···

       83140
       83324
        
               ];

     

       83141
       83325
        
             })

     

       83142
       83326
        
             sources."stream-combiner-0.0.4"

     

       83143
       83143
       -
             sources."string-width-1.0.2"

     

       83327
       83327
       +
             sources."string.prototype.trimend-1.0.4"

     

       83328
       83328
       +
             sources."string.prototype.trimstart-1.0.4"

     

       83144
       83329
        
             sources."string_decoder-1.1.1"

     

       83145
       83145
       -
             sources."strip-ansi-3.0.1"

     

       83146
       83330
        
             sources."strip-json-comments-0.1.3"

     

       83147
       83331
        
             (sources."tape-2.3.3" // {

     

       83148
       83332
        
               dependencies = [

     
···

       83157
       83341
        
             })

     

       83158
       83342
        
             sources."to-regex-3.0.2"

     

       83159
       83343
        
             sources."to-regex-range-2.1.1"

     

       83344
       83344
       +
             sources."unbox-primitive-1.0.1"

     

       83160
       83345
        
             (sources."union-value-1.0.1" // {

     

       83161
       83346
        
               dependencies = [

     

       83162
       83347
        
                 sources."is-extendable-0.1.1"

     

       83163
       83348
        
               ];

     

       83164
       83349
        
             })

     

       83350
       83350
       +
             sources."unique-string-1.0.0"

     

       83165
       83351
        
             (sources."unset-value-1.0.0" // {

     

       83166
       83352
        
               dependencies = [

     

       83167
       83353
        
                 (sources."has-value-0.3.1" // {

     
···

       83170
       83356
        
                   ];

     

       83171
       83357
        
                 })

     

       83172
       83358
        
                 sources."has-values-0.1.4"

     

       83359
       83359
       +
                 sources."isarray-1.0.0"

     

       83173
       83360
        
               ];

     

       83174
       83361
        
             })

     

       83175
       83362
        
             sources."upath-1.2.0"

     
···

       83181
       83368
        
                 sources."async-0.2.10"

     

       83182
       83369
        
               ];

     

       83183
       83370
        
             })

     

       83184
       83184
       -
             sources."window-size-0.1.4"

     

       83371
       83371
       +
             sources."which-boxed-primitive-1.0.2"

     

       83372
       83372
       +
             sources."which-collection-1.0.1"

     

       83373
       83373
       +
             sources."which-typed-array-1.1.4"

     

       83185
       83374
        
             (sources."winston-0.8.3" // {

     

       83186
       83375
        
               dependencies = [

     

       83187
       83376
        
                 sources."async-0.2.10"

     

       83188
       83377
        
               ];

     

       83189
       83378
        
             })

     

       83190
       83379
        
             sources."wordwrap-0.0.3"

     

       83191
       83191
       -
             sources."wrap-ansi-2.1.0"

     

       83192
       83380
        
             sources."wrappy-1.0.2"

     

       83193
       83193
       -
             sources."y18n-3.2.2"

     

       83194
       83194
       -
             sources."yargs-3.32.0"

     

       83381
       83381
       +
             sources."write-file-atomic-2.4.3"

     

       83382
       83382
       +
             sources."xdg-basedir-3.0.0"

     

       83195
       83383
        
           ];

     

       83196
       83384
        
           buildInputs = globalBuildInputs;

     

       83197
       83385
        
           meta = {

     
···

       83364
       83552
        
             sources."@types/yargs-parser-20.2.0"

     

       83365
       83553
        
             sources."@types/yoga-layout-1.9.2"

     

       83366
       83554
        
             sources."accepts-1.3.7"

     

       83367
       83367
       -
             sources."acorn-8.2.4"

     

       83555
       83555
       +
             sources."acorn-8.3.0"

     

       83368
       83556
        
             sources."acorn-jsx-5.3.1"

     

       83369
       83557
        
             sources."address-1.1.2"

     

       83370
       83558
        
             (sources."ansi-align-3.0.0" // {

     
···

       83424
       83612
        
             sources."call-bind-1.0.2"

     

       83425
       83613
        
             sources."camel-case-4.1.2"

     

       83426
       83614
        
             sources."camelcase-5.3.1"

     

       83427
       83427
       -
             sources."caniuse-lite-1.0.30001230"

     

       83615
       83615
       +
             sources."caniuse-lite-1.0.30001232"

     

       83428
       83616
        
             sources."ccount-1.1.0"

     

       83429
       83617
        
             (sources."chalk-4.1.1" // {

     

       83430
       83618
        
               dependencies = [

     
···

       83524
       83712
        
             sources."dotenv-8.6.0"

     

       83525
       83713
        
             sources."duplexer3-0.1.4"

     

       83526
       83714
        
             sources."ee-first-1.1.1"

     

       83527
       83527
       -
             sources."electron-to-chromium-1.3.741"

     

       83715
       83715
       +
             sources."electron-to-chromium-1.3.743"

     

       83528
       83716
        
             sources."emoji-regex-7.0.3"

     

       83529
       83717
        
             sources."encodeurl-1.0.2"

     

       83530
       83718
        
             sources."end-of-stream-1.4.4"

     
···

       83589
       83777
        
             sources."find-up-4.1.0"

     

       83590
       83778
        
             sources."follow-redirects-1.14.1"

     

       83591
       83779
        
             sources."form-data-3.0.1"

     

       83592
       83592
       -
             sources."forwarded-0.1.2"

     

       83780
       83780
       +
             sources."forwarded-0.2.0"

     

       83593
       83781
        
             sources."fresh-0.5.2"

     

       83594
       83782
        
             sources."fs-exists-cached-1.0.0"

     

       83595
       83783
        
             sources."fs-extra-8.1.0"

     
···

       83774
       83962
        
             sources."no-case-3.0.4"

     

       83775
       83963
        
             sources."node-eta-0.9.0"

     

       83776
       83964
        
             sources."node-fetch-2.6.1"

     

       83777
       83777
       -
             sources."node-object-hash-2.3.2"

     

       83965
       83965
       +
             sources."node-object-hash-2.3.3"

     

       83778
       83966
        
             sources."node-releases-1.1.72"

     

       83779
       83967
        
             sources."normalize-path-3.0.0"

     

       83780
       83968
        
             sources."normalize-url-3.3.0"

     
···

       83827
       84015
        
             sources."prop-types-15.7.2"

     

       83828
       84016
        
             sources."proper-lockfile-4.1.2"

     

       83829
       84017
        
             sources."protocols-1.4.8"

     

       83830
       83830
       -
             sources."proxy-addr-2.0.6"

     

       84018
       84018
       +
             sources."proxy-addr-2.0.7"

     

       83831
       84019
        
             sources."pump-3.0.0"

     

       83832
       84020
        
             sources."pupa-2.1.1"

     

       83833
       84021
        
             sources."qs-6.10.1"

     
···

       84008
       84196
        
             sources."write-file-atomic-3.0.3"

     

       84009
       84197
        
             sources."ws-7.4.6"

     

       84010
       84198
        
             sources."xdg-basedir-4.0.0"

     

       84011
       84011
       -
             sources."xstate-4.19.2"

     

       84199
       84199
       +
             sources."xstate-4.20.0"

     

       84012
       84200
        
             sources."xtend-4.0.2"

     

       84013
       84201
        
             sources."y18n-4.0.3"

     

       84014
       84202
        
             sources."yallist-4.0.0"

     
···

       84408
       84596
        
             sources."esprima-4.0.1"

     

       84409
       84597
        
             sources."estraverse-4.3.0"

     

       84410
       84598
        
             sources."esutils-2.0.3"

     

       84411
       84411
       -
             sources."execa-5.0.0"

     

       84599
       84599
       +
             sources."execa-5.0.1"

     

       84412
       84600
        
             sources."external-editor-3.1.0"

     

       84413
       84601
        
             sources."fast-deep-equal-3.1.3"

     

       84414
       84602
        
             sources."fast-levenshtein-2.0.6"

     
···

       84907
       85095
        
             })

     

       84908
       85096
        
             sources."graphql-subscriptions-1.2.1"

     

       84909
       85097
        
             sources."graphql-type-json-0.3.2"

     

       84910
       84910
       -
             sources."graphql-ws-4.5.2"

     

       85098
       85098
       +
             sources."graphql-ws-4.7.0"

     

       84911
       85099
        
             sources."har-schema-2.0.0"

     

       84912
       85100
        
             sources."har-validator-5.1.5"

     

       84913
       85101
        
             sources."has-1.0.3"

     
···

       85043
       85231
        
             sources."normalize-url-4.5.1"

     

       85044
       85232
        
             sources."npm-run-path-2.0.2"

     

       85045
       85233
        
             sources."oas-kit-common-1.0.8"

     

       85046
       85046
       -
             sources."oas-linter-3.2.1"

     

       85047
       85047
       -
             (sources."oas-resolver-2.5.4" // {

     

       85234
       85234
       +
             sources."oas-linter-3.2.2"

     

       85235
       85235
       +
             (sources."oas-resolver-2.5.5" // {

     

       85048
       85236
        
               dependencies = [

     

       85049
       85049
       -
                 sources."yargs-16.2.0"

     

       85237
       85237
       +
                 sources."yargs-17.0.1"

     

       85050
       85238
        
               ];

     

       85051
       85239
        
             })

     

       85052
       85240
        
             sources."oas-schema-walker-1.1.5"

     

       85053
       85053
       -
             sources."oas-validator-5.0.5"

     

       85241
       85241
       +
             sources."oas-validator-5.0.6"

     

       85054
       85242
        
             sources."oauth-sign-0.9.0"

     

       85055
       85243
        
             sources."object-inspect-1.10.3"

     

       85056
       85244
        
             sources."object-is-1.1.5"

     
···

       85161
       85349
        
               ];

     

       85162
       85350
        
             })

     

       85163
       85351
        
             sources."supports-color-7.2.0"

     

       85164
       85164
       -
             (sources."swagger2openapi-7.0.5" // {

     

       85352
       85352
       +
             (sources."swagger2openapi-7.0.6" // {

     

       85165
       85353
        
               dependencies = [

     

       85166
       85166
       -
                 sources."yargs-16.2.0"

     

       85354
       85354
       +
                 sources."yargs-17.0.1"

     

       85167
       85355
        
               ];

     

       85168
       85356
        
             })

     

       85169
       85357
        
             sources."symbol-observable-1.2.0"

     
···

       85338
       85526
        
             sources."express-4.17.1"

     

       85339
       85527
        
             sources."express-ws-2.0.0"

     

       85340
       85528
        
             sources."finalhandler-1.1.2"

     

       85341
       85341
       -
             sources."forwarded-0.1.2"

     

       85529
       85529
       +
             sources."forwarded-0.2.0"

     

       85342
       85530
        
             sources."fresh-0.5.2"

     

       85343
       85531
        
             sources."http-errors-1.7.2"

     

       85344
       85532
        
             sources."iconv-lite-0.4.24"

     
···

       85357
       85545
        
             sources."options-0.0.6"

     

       85358
       85546
        
             sources."parseurl-1.3.3"

     

       85359
       85547
        
             sources."path-to-regexp-0.1.7"

     

       85360
       85360
       -
             sources."proxy-addr-2.0.6"

     

       85548
       85548
       +
             sources."proxy-addr-2.0.7"

     

       85361
       85549
        
             sources."qs-6.7.0"

     

       85362
       85550
        
             sources."range-parser-1.2.1"

     

       85363
       85551
        
             sources."raw-body-2.4.0"

     
···

       87090
       87278
        
             sources."is-wsl-2.2.0"

     

       87091
       87279
        
             sources."isexe-2.0.0"

     

       87092
       87280
        
             sources."jquery-3.6.0"

     

       87093
       87093
       -
             sources."jquery.terminal-2.24.0"

     

       87281
       87281
       +
             sources."jquery.terminal-2.25.1"

     

       87094
       87282
        
             sources."jsonfile-2.4.0"

     

       87095
       87283
        
             sources."keyboardevent-key-polyfill-1.1.0"

     

       87096
       87284
        
             sources."line-reader-0.4.0"

     
···

       87447
       87635
        
           };

     

       87448
       87636
        
           dependencies = [

     

       87449
       87637
        
             sources."@iarna/toml-2.2.5"

     

       87450
       87450
       -
             sources."@ot-builder/bin-composite-types-1.0.7"

     

       87451
       87451
       -
             sources."@ot-builder/bin-util-1.0.7"

     

       87452
       87452
       -
             (sources."@ot-builder/cli-help-shower-1.0.7" // {

     

       87638
       87638
       +
             sources."@ot-builder/bin-composite-types-1.0.8"

     

       87639
       87639
       +
             sources."@ot-builder/bin-util-1.0.8"

     

       87640
       87640
       +
             (sources."@ot-builder/cli-help-shower-1.0.8" // {

     

       87453
       87641
        
               dependencies = [

     

       87454
       87642
        
                 sources."ansi-styles-4.3.0"

     

       87455
       87643
        
                 sources."chalk-4.1.1"

     
···

       87459
       87647
        
                 sources."supports-color-7.2.0"

     

       87460
       87648
        
               ];

     

       87461
       87649
        
             })

     

       87462
       87462
       -
             (sources."@ot-builder/cli-proc-1.0.7" // {

     

       87650
       87650
       +
             (sources."@ot-builder/cli-proc-1.0.8" // {

     

       87463
       87651
        
               dependencies = [

     

       87464
       87652
        
                 sources."ansi-styles-4.3.0"

     

       87465
       87653
        
                 sources."chalk-4.1.1"

     
···

       87469
       87657
        
                 sources."supports-color-7.2.0"

     

       87470
       87658
        
               ];

     

       87471
       87659
        
             })

     

       87472
       87472
       -
             (sources."@ot-builder/cli-shared-1.0.7" // {

     

       87660
       87660
       +
             (sources."@ot-builder/cli-shared-1.0.8" // {

     

       87473
       87661
        
               dependencies = [

     

       87474
       87662
        
                 sources."ansi-styles-4.3.0"

     

       87475
       87663
        
                 sources."chalk-4.1.1"

     
···

       87479
       87667
        
                 sources."supports-color-7.2.0"

     

       87480
       87668
        
               ];

     

       87481
       87669
        
             })

     

       87482
       87482
       -
             sources."@ot-builder/common-impl-1.0.7"

     

       87483
       87483
       -
             sources."@ot-builder/errors-1.0.7"

     

       87484
       87484
       -
             sources."@ot-builder/io-bin-cff-1.0.7"

     

       87485
       87485
       -
             sources."@ot-builder/io-bin-encoding-1.0.7"

     

       87486
       87486
       -
             sources."@ot-builder/io-bin-ext-private-1.0.7"

     

       87487
       87487
       -
             sources."@ot-builder/io-bin-font-1.0.7"

     

       87488
       87488
       -
             sources."@ot-builder/io-bin-glyph-store-1.0.7"

     

       87489
       87489
       -
             sources."@ot-builder/io-bin-layout-1.0.7"

     

       87490
       87490
       -
             sources."@ot-builder/io-bin-metadata-1.0.7"

     

       87491
       87491
       -
             sources."@ot-builder/io-bin-metric-1.0.7"

     

       87492
       87492
       -
             sources."@ot-builder/io-bin-name-1.0.7"

     

       87493
       87493
       -
             sources."@ot-builder/io-bin-sfnt-1.0.7"

     

       87494
       87494
       -
             sources."@ot-builder/io-bin-ttf-1.0.7"

     

       87495
       87495
       -
             sources."@ot-builder/ot-1.0.7"

     

       87496
       87496
       -
             sources."@ot-builder/ot-encoding-1.0.7"

     

       87497
       87497
       -
             sources."@ot-builder/ot-ext-private-1.0.7"

     

       87498
       87498
       -
             sources."@ot-builder/ot-glyphs-1.0.7"

     

       87499
       87499
       -
             sources."@ot-builder/ot-layout-1.0.7"

     

       87500
       87500
       -
             sources."@ot-builder/ot-metadata-1.0.7"

     

       87501
       87501
       -
             sources."@ot-builder/ot-name-1.0.7"

     

       87502
       87502
       -
             sources."@ot-builder/ot-sfnt-1.0.7"

     

       87503
       87503
       -
             sources."@ot-builder/ot-standard-glyph-namer-1.0.7"

     

       87504
       87504
       -
             sources."@ot-builder/prelude-1.0.7"

     

       87505
       87505
       -
             sources."@ot-builder/primitive-1.0.7"

     

       87506
       87506
       -
             sources."@ot-builder/rectify-1.0.7"

     

       87507
       87507
       -
             sources."@ot-builder/stat-glyphs-1.0.7"

     

       87508
       87508
       -
             sources."@ot-builder/trace-1.0.7"

     

       87509
       87509
       -
             sources."@ot-builder/var-store-1.0.7"

     

       87510
       87510
       -
             sources."@ot-builder/variance-1.0.7"

     

       87670
       87670
       +
             sources."@ot-builder/common-impl-1.0.8"

     

       87671
       87671
       +
             sources."@ot-builder/errors-1.0.8"

     

       87672
       87672
       +
             sources."@ot-builder/io-bin-cff-1.0.8"

     

       87673
       87673
       +
             sources."@ot-builder/io-bin-encoding-1.0.8"

     

       87674
       87674
       +
             sources."@ot-builder/io-bin-ext-private-1.0.8"

     

       87675
       87675
       +
             sources."@ot-builder/io-bin-font-1.0.8"

     

       87676
       87676
       +
             sources."@ot-builder/io-bin-glyph-store-1.0.8"

     

       87677
       87677
       +
             sources."@ot-builder/io-bin-layout-1.0.8"

     

       87678
       87678
       +
             sources."@ot-builder/io-bin-metadata-1.0.8"

     

       87679
       87679
       +
             sources."@ot-builder/io-bin-metric-1.0.8"

     

       87680
       87680
       +
             sources."@ot-builder/io-bin-name-1.0.8"

     

       87681
       87681
       +
             sources."@ot-builder/io-bin-sfnt-1.0.8"

     

       87682
       87682
       +
             sources."@ot-builder/io-bin-ttf-1.0.8"

     

       87683
       87683
       +
             sources."@ot-builder/ot-1.0.8"

     

       87684
       87684
       +
             sources."@ot-builder/ot-encoding-1.0.8"

     

       87685
       87685
       +
             sources."@ot-builder/ot-ext-private-1.0.8"

     

       87686
       87686
       +
             sources."@ot-builder/ot-glyphs-1.0.8"

     

       87687
       87687
       +
             sources."@ot-builder/ot-layout-1.0.8"

     

       87688
       87688
       +
             sources."@ot-builder/ot-metadata-1.0.8"

     

       87689
       87689
       +
             sources."@ot-builder/ot-name-1.0.8"

     

       87690
       87690
       +
             sources."@ot-builder/ot-sfnt-1.0.8"

     

       87691
       87691
       +
             sources."@ot-builder/ot-standard-glyph-namer-1.0.8"

     

       87692
       87692
       +
             sources."@ot-builder/prelude-1.0.8"

     

       87693
       87693
       +
             sources."@ot-builder/primitive-1.0.8"

     

       87694
       87694
       +
             sources."@ot-builder/rectify-1.0.8"

     

       87695
       87695
       +
             sources."@ot-builder/stat-glyphs-1.0.8"

     

       87696
       87696
       +
             sources."@ot-builder/trace-1.0.8"

     

       87697
       87697
       +
             sources."@ot-builder/var-store-1.0.8"

     

       87698
       87698
       +
             sources."@ot-builder/variance-1.0.8"

     

       87511
       87699
        
             sources."@unicode/unicode-13.0.0-1.0.6"

     

       87512
       87700
        
             sources."aglfn-1.0.2"

     

       87513
       87701
        
             sources."amdefine-1.0.1"

     
···

       87594
       87782
        
             sources."once-1.4.0"

     

       87595
       87783
        
             sources."onetime-5.1.2"

     

       87596
       87784
        
             sources."optionator-0.8.3"

     

       87597
       87597
       -
             sources."ot-builder-1.0.7"

     

       87598
       87598
       -
             (sources."otb-ttc-bundle-1.0.7" // {

     

       87785
       87785
       +
             sources."ot-builder-1.0.8"

     

       87786
       87786
       +
             (sources."otb-ttc-bundle-1.0.8" // {

     

       87599
       87787
        
               dependencies = [

     

       87600
       87788
        
                 sources."ansi-styles-4.3.0"

     

       87601
       87789
        
                 sources."chalk-4.1.1"

     
···

       87831
       88019
        
           dependencies = [

     

       87832
       88020
        
             sources."@braintree/sanitize-url-3.1.0"

     

       87833
       88021
        
             sources."@cronvel/get-pixels-3.4.0"

     

       87834
       87834
       -
             sources."@joplin/fork-htmlparser2-4.1.24"

     

       87835
       87835
       -
             sources."@joplin/fork-sax-1.2.28"

     

       88022
       88022
       +
             sources."@joplin/fork-htmlparser2-4.1.26"

     

       88023
       88023
       +
             sources."@joplin/fork-sax-1.2.30"

     

       87836
       88024
        
             sources."@joplin/lib-1.8.2"

     

       87837
       88025
        
             (sources."@joplin/renderer-1.8.2" // {

     

       87838
       88026
        
               dependencies = [

     
···

       87841
       88029
        
                 sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support"

     

       87842
       88030
        
               ];

     

       87843
       88031
        
             })

     

       87844
       87844
       -
             (sources."@joplin/turndown-4.0.46" // {

     

       88032
       88032
       +
             (sources."@joplin/turndown-4.0.48" // {

     

       87845
       88033
        
               dependencies = [

     

       87846
       88034
        
                 sources."css-2.2.4"

     

       87847
       88035
        
               ];

     

       87848
       88036
        
             })

     

       87849
       87849
       -
             sources."@joplin/turndown-plugin-gfm-1.0.28"

     

       88037
       88037
       +
             sources."@joplin/turndown-plugin-gfm-1.0.30"

     

       87850
       88038
        
             sources."abab-2.0.5"

     

       87851
       88039
        
             sources."abbrev-1.1.1"

     

       87852
       88040
        
             sources."acorn-7.4.1"

     
···

       88672
       88860
        
         jshint = nodeEnv.buildNodePackage {

     

       88673
       88861
        
           name = "jshint";

     

       88674
       88862
        
           packageName = "jshint";

     

       88675
       88675
       -
           version = "2.12.0";

     

       88863
       88863
       +
           version = "2.13.0";

     

       88676
       88864
        
           src = fetchurl {

     

       88677
       88677
       -
             url = "https://registry.npmjs.org/jshint/-/jshint-2.12.0.tgz";

     

       88678
       88678
       -
             sha512 = "TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA==";

     

       88865
       88865
       +
             url = "https://registry.npmjs.org/jshint/-/jshint-2.13.0.tgz";

     

       88866
       88866
       +
             sha512 = "Nd+md9wIeyfDK+RGrbOBzwLONSTdihGMtyGYU/t7zYcN2EgUa4iuY3VK2oxtPYrW5ycTj18iC+UbhNTxe4C66g==";

     

       88679
       88867
        
           };

     

       88680
       88868
        
           dependencies = [

     

       88681
       88869
        
             sources."balanced-match-1.0.2"

     
···

       88908
       89096
        
               ];

     

       88909
       89097
        
             })

     

       88910
       89098
        
             sources."finalhandler-1.1.2"

     

       88911
       88911
       -
             sources."forwarded-0.1.2"

     

       89099
       89099
       +
             sources."forwarded-0.2.0"

     

       88912
       89100
        
             sources."fresh-0.5.2"

     

       88913
       89101
        
             sources."get-caller-file-2.0.5"

     

       88914
       89102
        
             sources."get-stream-4.1.0"

     
···

       88988
       89176
        
             sources."please-upgrade-node-3.2.0"

     

       88989
       89177
        
             sources."pluralize-8.0.0"

     

       88990
       89178
        
             sources."prepend-http-2.0.0"

     

       88991
       88991
       -
             sources."proxy-addr-2.0.6"

     

       89179
       89179
       +
             sources."proxy-addr-2.0.7"

     

       88992
       89180
        
             sources."pump-3.0.0"

     

       88993
       89181
        
             sources."pupa-2.1.1"

     

       88994
       89182
        
             sources."qs-6.7.0"

     
···

       90403
       90591
        
             sources."escalade-3.1.1"

     

       90404
       90592
        
             sources."escape-string-regexp-1.0.5"

     

       90405
       90593
        
             sources."eventemitter3-4.0.7"

     

       90406
       90406
       -
             sources."execa-5.0.0"

     

       90594
       90594
       +
             sources."execa-5.0.1"

     

       90407
       90595
        
             sources."extend-3.0.2"

     

       90408
       90596
        
             (sources."external-editor-3.1.0" // {

     

       90409
       90597
        
               dependencies = [

     
···

       91438
       91626
        
             sources."for-own-0.1.5"

     

       91439
       91627
        
             sources."forever-agent-0.6.1"

     

       91440
       91628
        
             sources."form-data-2.3.3"

     

       91441
       91441
       -
             sources."forwarded-0.1.2"

     

       91629
       91629
       +
             sources."forwarded-0.2.0"

     

       91442
       91630
        
             sources."fragment-cache-0.2.1"

     

       91443
       91631
        
             sources."fresh-0.5.2"

     

       91444
       91632
        
             sources."fsevents-1.2.13"

     
···

       91591
       91779
        
             sources."posix-character-classes-0.1.1"

     

       91592
       91780
        
             sources."preserve-0.2.0"

     

       91593
       91781
        
             sources."process-nextick-args-2.0.1"

     

       91594
       91594
       -
             sources."proxy-addr-2.0.6"

     

       91782
       91782
       +
             sources."proxy-addr-2.0.7"

     

       91595
       91783
        
             sources."psl-1.8.0"

     

       91596
       91784
        
             sources."punycode-2.1.1"

     

       91597
       91785
        
             sources."qs-6.7.0"

     
···

       92109
       92297
        
             sources."cached-path-relative-1.0.2"

     

       92110
       92298
        
             sources."call-bind-1.0.2"

     

       92111
       92299
        
             sources."camelcase-5.3.1"

     

       92112
       92112
       -
             sources."caniuse-lite-1.0.30001230"

     

       92300
       92300
       +
             sources."caniuse-lite-1.0.30001232"

     

       92113
       92301
        
             sources."capture-exit-2.0.0"

     

       92114
       92302
        
             sources."caseless-0.12.0"

     

       92115
       92303
        
             (sources."chalk-3.0.0" // {

     
···

       92181
       92369
        
             })

     

       92182
       92370
        
             sources."copy-descriptor-0.1.1"

     

       92183
       92371
        
             sources."core-js-2.6.12"

     

       92184
       92184
       -
             (sources."core-js-compat-3.13.0" // {

     

       92372
       92372
       +
             (sources."core-js-compat-3.13.1" // {

     

       92185
       92373
        
               dependencies = [

     

       92186
       92374
        
                 sources."semver-7.0.0"

     

       92187
       92375
        
               ];

     
···

       92233
       92421
        
             sources."duplexer2-0.1.4"

     

       92234
       92422
        
             sources."duplexify-3.7.1"

     

       92235
       92423
        
             sources."ecc-jsbn-0.1.2"

     

       92236
       92236
       -
             sources."electron-to-chromium-1.3.741"

     

       92424
       92424
       +
             sources."electron-to-chromium-1.3.743"

     

       92237
       92425
        
             (sources."elliptic-6.5.4" // {

     

       92238
       92426
        
               dependencies = [

     

       92239
       92427
        
                 sources."bn.js-4.12.0"

     
···

       93642
       93830
        
             sources."@fluentui/react-focus-7.17.6"

     

       93643
       93831
        
             sources."@fluentui/react-window-provider-1.0.2"

     

       93644
       93832
        
             sources."@fluentui/theme-1.7.4"

     

       93645
       93645
       -
             sources."@microsoft/load-themed-styles-1.10.173"

     

       93833
       93833
       +
             sources."@microsoft/load-themed-styles-1.10.174"

     

       93646
       93834
        
             sources."@sindresorhus/is-0.14.0"

     

       93647
       93835
        
             sources."@szmarczak/http-timer-1.1.2"

     

       93648
       93836
        
             sources."@uifabric/foundation-7.9.26"

     
···

       93724
       93912
        
             sources."fast-json-stable-stringify-2.1.0"

     

       93725
       93913
        
             sources."figures-2.0.0"

     

       93726
       93914
        
             sources."finalhandler-1.1.2"

     

       93727
       93727
       -
             sources."forwarded-0.1.2"

     

       93915
       93915
       +
             sources."forwarded-0.2.0"

     

       93728
       93916
        
             sources."fresh-0.5.2"

     

       93729
       93917
        
             sources."fs-routes-7.0.1"

     

       93730
       93918
        
             sources."fs.realpath-1.0.0"

     
···

       93814
       94002
        
             sources."prepend-http-2.0.0"

     

       93815
       94003
        
             sources."promise-queue-2.2.5"

     

       93816
       94004
        
             sources."prop-types-15.7.2"

     

       93817
       93817
       -
             sources."proxy-addr-2.0.6"

     

       94005
       94005
       +
             sources."proxy-addr-2.0.7"

     

       93818
       94006
        
             sources."pump-3.0.0"

     

       93819
       94007
        
             sources."punycode-2.1.1"

     

       93820
       94008
        
             sources."qs-6.7.0"

     
···

       94154
       94342
        
         netlify-cli = nodeEnv.buildNodePackage {

     

       94155
       94343
        
           name = "netlify-cli";

     

       94156
       94344
        
           packageName = "netlify-cli";

     

       94157
       94157
       -
           version = "3.31.16";

     

       94345
       94345
       +
           version = "3.32.6";

     

       94158
       94346
        
           src = fetchurl {

     

       94159
       94159
       -
             url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.31.16.tgz";

     

       94160
       94160
       -
             sha512 = "zUjRjBkXVRFO4M5pvffRXjYs+E+4guB927kRN1HbU1+pwQoqbyxj5qemCbnNBglpWlU4DPW2Quvch7IVevWzCg==";

     

       94347
       94347
       +
             url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.32.6.tgz";

     

       94348
       94348
       +
             sha512 = "VG2b3SJHbAIVErZvaeD0cU496GnuHpBqUYJiMrtEJ3eaPSQGc6HHZz9/P0Zbl7S67jaOk/wANOfcSxtbmPEORQ==";

     

       94161
       94349
        
           };

     

       94162
       94350
        
           dependencies = [

     

       94163
       94351
        
             sources."@babel/code-frame-7.12.13"

     
···

       94291
       94479
        
             sources."@dabh/diagnostics-2.0.2"

     

       94292
       94480
        
             sources."@jest/types-24.9.0"

     

       94293
       94481
        
             sources."@mrmlnc/readdir-enhanced-2.2.1"

     

       94294
       94294
       -
             (sources."@netlify/build-11.29.0" // {

     

       94482
       94482
       +
             (sources."@netlify/build-11.29.2" // {

     

       94295
       94483
        
               dependencies = [

     

       94296
       94484
        
                 sources."ansi-styles-4.3.0"

     

       94297
       94485
        
                 sources."chalk-3.0.0"

     
···

       94301
       94489
        
                 sources."resolve-2.0.0-next.3"

     

       94302
       94490
        
                 sources."semver-6.3.0"

     

       94303
       94491
        
                 sources."update-notifier-4.1.3"

     

       94304
       94304
       -
                 sources."uuid-7.0.3"

     

       94305
       94492
        
               ];

     

       94306
       94493
        
             })

     

       94307
       94494
        
             (sources."@netlify/cache-utils-1.0.7" // {

     
···

       94319
       94506
        
                 sources."locate-path-5.0.0"

     

       94320
       94507
        
               ];

     

       94321
       94508
        
             })

     

       94322
       94322
       -
             (sources."@netlify/framework-info-5.0.0" // {

     

       94509
       94509
       +
             (sources."@netlify/framework-info-5.1.2" // {

     

       94323
       94510
        
               dependencies = [

     

       94324
       94324
       -
                 sources."is-plain-obj-2.1.0"

     

       94325
       94325
       -
                 sources."locate-path-5.0.0"

     

       94511
       94511
       +
                 sources."p-limit-3.1.0"

     

       94512
       94512
       +
                 sources."p-locate-5.0.0"

     

       94326
       94513
        
               ];

     

       94327
       94514
        
             })

     

       94328
       94328
       -
             sources."@netlify/functions-utils-1.3.35"

     

       94515
       94515
       +
             sources."@netlify/functions-utils-1.3.37"

     

       94329
       94516
        
             (sources."@netlify/git-utils-1.0.11" // {

     

       94330
       94517
        
               dependencies = [

     

       94331
       94518
        
                 sources."braces-3.0.2"

     
···

       94337
       94524
        
               ];

     

       94338
       94525
        
             })

     

       94339
       94526
        
             sources."@netlify/open-api-2.4.0"

     

       94340
       94340
       -
             (sources."@netlify/plugin-edge-handlers-1.11.12" // {

     

       94527
       94527
       +
             (sources."@netlify/plugin-edge-handlers-1.11.13" // {

     

       94341
       94528
        
               dependencies = [

     

       94342
       94529
        
                 sources."@nodelib/fs.stat-2.0.4"

     

       94343
       94530
        
                 sources."@types/node-14.17.1"

     
···

       94366
       94553
        
             sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10"

     

       94367
       94554
        
             sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10"

     

       94368
       94555
        
             sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10"

     

       94369
       94369
       -
             (sources."@netlify/zip-it-and-ship-it-4.2.1" // {

     

       94556
       94556
       +
             (sources."@netlify/zip-it-and-ship-it-4.2.5" // {

     

       94370
       94557
        
               dependencies = [

     

       94371
       94371
       -
                 sources."p-map-3.0.0"

     

       94558
       94558
       +
                 sources."@nodelib/fs.stat-2.0.4"

     

       94559
       94559
       +
                 sources."array-union-2.1.0"

     

       94560
       94560
       +
                 sources."braces-3.0.2"

     

       94561
       94561
       +
                 sources."cliui-7.0.4"

     

       94562
       94562
       +
                 sources."cp-file-9.0.0"

     

       94563
       94563
       +
                 sources."del-6.0.0"

     

       94564
       94564
       +
                 sources."dir-glob-3.0.1"

     

       94565
       94565
       +
                 sources."fast-glob-3.2.5"

     

       94566
       94566
       +
                 sources."fill-range-7.0.1"

     

       94567
       94567
       +
                 sources."glob-parent-5.1.2"

     

       94568
       94568
       +
                 sources."globby-11.0.3"

     

       94569
       94569
       +
                 sources."ignore-5.1.8"

     

       94570
       94570
       +
                 sources."is-number-7.0.0"

     

       94571
       94571
       +
                 sources."micromatch-4.0.4"

     

       94572
       94572
       +
                 sources."pkg-dir-5.0.0"

     

       94372
       94573
        
                 sources."resolve-2.0.0-next.3"

     

       94373
       94373
       -
                 sources."semver-6.3.0"

     

       94574
       94574
       +
                 sources."slash-3.0.0"

     

       94575
       94575
       +
                 sources."to-regex-range-5.0.1"

     

       94576
       94576
       +
                 sources."y18n-5.0.8"

     

       94577
       94577
       +
                 sources."yargs-16.2.0"

     

       94578
       94578
       +
                 sources."yargs-parser-20.2.7"

     

       94374
       94579
        
               ];

     

       94375
       94580
        
             })

     

       94376
       94581
        
             (sources."@nodelib/fs.scandir-2.1.4" // {

     
···

       94542
       94747
        
             sources."@types/semver-5.5.0"

     

       94543
       94748
        
             sources."@types/yargs-13.0.11"

     

       94544
       94749
        
             sources."@types/yargs-parser-20.2.0"

     

       94545
       94545
       -
             sources."@typescript-eslint/typescript-estree-2.34.0"

     

       94750
       94750
       +
             sources."@typescript-eslint/types-4.26.0"

     

       94751
       94751
       +
             (sources."@typescript-eslint/typescript-estree-4.26.0" // {

     

       94752
       94752
       +
               dependencies = [

     

       94753
       94753
       +
                 sources."@nodelib/fs.stat-2.0.4"

     

       94754
       94754
       +
                 sources."array-union-2.1.0"

     

       94755
       94755
       +
                 sources."braces-3.0.2"

     

       94756
       94756
       +
                 sources."dir-glob-3.0.1"

     

       94757
       94757
       +
                 sources."fast-glob-3.2.5"

     

       94758
       94758
       +
                 sources."fill-range-7.0.1"

     

       94759
       94759
       +
                 sources."glob-parent-5.1.2"

     

       94760
       94760
       +
                 sources."globby-11.0.3"

     

       94761
       94761
       +
                 sources."ignore-5.1.8"

     

       94762
       94762
       +
                 sources."is-number-7.0.0"

     

       94763
       94763
       +
                 sources."micromatch-4.0.4"

     

       94764
       94764
       +
                 sources."slash-3.0.0"

     

       94765
       94765
       +
                 sources."to-regex-range-5.0.1"

     

       94766
       94766
       +
               ];

     

       94767
       94767
       +
             })

     

       94768
       94768
       +
             sources."@typescript-eslint/visitor-keys-4.26.0"

     

       94546
       94769
        
             sources."@ungap/from-entries-0.2.1"

     

       94547
       94770
        
             sources."accepts-1.3.7"

     

       94548
       94771
        
             sources."agent-base-6.0.2"

     
···

       94679
       94902
        
             sources."call-bind-1.0.2"

     

       94680
       94903
        
             sources."call-me-maybe-1.0.1"

     

       94681
       94904
        
             sources."camelcase-5.3.1"

     

       94682
       94682
       -
             sources."caniuse-lite-1.0.30001230"

     

       94905
       94905
       +
             sources."caniuse-lite-1.0.30001232"

     

       94683
       94906
        
             sources."cardinal-2.1.1"

     

       94684
       94907
        
             sources."caw-2.0.1"

     

       94685
       94908
        
             (sources."chalk-4.1.1" // {

     
···

       94771
       94994
        
             sources."common-path-prefix-2.0.0"

     

       94772
       94995
        
             sources."commondir-1.0.1"

     

       94773
       94996
        
             sources."component-emitter-1.3.0"

     

       94774
       94774
       -
             sources."compress-commons-4.1.0"

     

       94997
       94997
       +
             sources."compress-commons-4.1.1"

     

       94775
       94998
        
             sources."concat-map-0.0.1"

     

       94776
       94999
        
             sources."concordance-5.0.4"

     

       94777
       95000
        
             sources."config-chain-1.1.12"

     
···

       94798
       95021
        
                 sources."safe-buffer-5.1.2"

     

       94799
       95022
        
               ];

     

       94800
       95023
        
             })

     

       94801
       94801
       -
             (sources."core-js-compat-3.13.0" // {

     

       95024
       95024
       +
             (sources."core-js-compat-3.13.1" // {

     

       94802
       95025
        
               dependencies = [

     

       94803
       95026
        
                 sources."semver-7.0.0"

     

       94804
       95027
        
               ];

     
···

       94886
       95109
        
             sources."detective-cjs-3.1.1"

     

       94887
       95110
        
             sources."detective-es6-2.2.0"

     

       94888
       95111
        
             sources."detective-less-1.0.2"

     

       94889
       94889
       -
             sources."detective-postcss-3.0.1"

     

       95112
       95112
       +
             sources."detective-postcss-4.0.0"

     

       94890
       95113
        
             sources."detective-sass-3.0.1"

     

       94891
       95114
        
             sources."detective-scss-2.0.1"

     

       94892
       95115
        
             sources."detective-stylus-1.0.0"

     

       94893
       94893
       -
             (sources."detective-typescript-5.8.0" // {

     

       95116
       95116
       +
             (sources."detective-typescript-7.0.0" // {

     

       94894
       95117
        
               dependencies = [

     

       94895
       95118
        
                 sources."typescript-3.9.9"

     

       94896
       95119
        
               ];

     
···

       94923
       95146
        
             })

     

       94924
       95147
        
             sources."duplexer3-0.1.4"

     

       94925
       95148
        
             sources."ee-first-1.1.1"

     

       94926
       94926
       -
             sources."electron-to-chromium-1.3.741"

     

       95149
       95149
       +
             sources."electron-to-chromium-1.3.743"

     

       94927
       95150
        
             sources."elegant-spinner-1.0.1"

     

       94928
       95151
        
             sources."elf-cam-0.1.1"

     

       94929
       95152
        
             sources."emoji-regex-8.0.0"

     
···

       94944
       95167
        
                 sources."source-map-0.6.1"

     

       94945
       95168
        
               ];

     

       94946
       95169
        
             })

     

       94947
       94947
       -
             sources."eslint-visitor-keys-1.3.0"

     

       95170
       95170
       +
             sources."eslint-visitor-keys-2.1.0"

     

       94948
       95171
        
             sources."esprima-4.0.1"

     

       94949
       95172
        
             sources."estraverse-5.2.0"

     

       94950
       95173
        
             sources."estree-walker-1.0.1"

     
···

       94952
       95175
        
             sources."etag-1.8.1"

     

       94953
       95176
        
             sources."eventemitter3-4.0.7"

     

       94954
       95177
        
             sources."events-1.1.1"

     

       94955
       94955
       -
             (sources."execa-5.0.0" // {

     

       95178
       95178
       +
             (sources."execa-5.0.1" // {

     

       94956
       95179
        
               dependencies = [

     

       94957
       95180
        
                 sources."get-stream-6.0.1"

     

       94958
       95181
        
                 sources."human-signals-2.1.0"

     
···

       95071
       95294
        
             sources."follow-redirects-1.14.1"

     

       95072
       95295
        
             sources."for-in-1.0.2"

     

       95073
       95296
        
             sources."form-data-3.0.1"

     

       95074
       95074
       -
             sources."forwarded-0.1.2"

     

       95297
       95297
       +
             sources."forwarded-0.2.0"

     

       95075
       95298
        
             sources."fragment-cache-0.2.1"

     

       95076
       95299
        
             sources."fresh-0.5.2"

     

       95077
       95300
        
             (sources."from2-2.3.0" // {

     
···

       95473
       95696
        
               ];

     

       95474
       95697
        
             })

     

       95475
       95698
        
             sources."mute-stream-0.0.7"

     

       95699
       95699
       +
             sources."nanoid-3.1.23"

     

       95476
       95700
        
             sources."nanomatch-1.2.13"

     

       95477
       95701
        
             sources."natural-orderby-2.0.3"

     

       95478
       95702
        
             sources."negotiator-0.6.2"

     
···

       95661
       95885
        
               ];

     

       95662
       95886
        
             })

     

       95663
       95887
        
             sources."posix-character-classes-0.1.1"

     

       95664
       95664
       -
             (sources."postcss-7.0.35" // {

     

       95665
       95665
       -
               dependencies = [

     

       95666
       95666
       -
                 sources."ansi-styles-3.2.1"

     

       95667
       95667
       -
                 (sources."chalk-2.4.2" // {

     

       95668
       95668
       -
                   dependencies = [

     

       95669
       95669
       -
                     sources."supports-color-5.5.0"

     

       95670
       95670
       -
                   ];

     

       95671
       95671
       -
                 })

     

       95672
       95672
       -
                 sources."color-convert-1.9.3"

     

       95673
       95673
       -
                 sources."color-name-1.1.3"

     

       95674
       95674
       -
                 sources."source-map-0.6.1"

     

       95675
       95675
       -
                 sources."supports-color-6.1.0"

     

       95676
       95676
       -
               ];

     

       95677
       95677
       -
             })

     

       95678
       95678
       -
             sources."postcss-values-parser-1.5.0"

     

       95679
       95679
       -
             sources."precinct-6.3.1"

     

       95888
       95888
       +
             sources."postcss-8.3.0"

     

       95889
       95889
       +
             sources."postcss-values-parser-2.0.1"

     

       95890
       95890
       +
             sources."precinct-8.1.0"

     

       95680
       95891
        
             sources."precond-0.2.3"

     

       95681
       95892
        
             sources."prelude-ls-1.1.2"

     

       95682
       95893
        
             sources."prepend-http-2.0.0"

     
···

       95693
       95904
        
             sources."process-es6-0.11.6"

     

       95694
       95905
        
             sources."process-nextick-args-2.0.1"

     

       95695
       95906
        
             sources."proto-list-1.2.4"

     

       95696
       95696
       -
             sources."proxy-addr-2.0.6"

     

       95907
       95907
       +
             sources."proxy-addr-2.0.7"

     

       95697
       95908
        
             sources."ps-list-6.3.0"

     

       95698
       95909
        
             sources."pump-3.0.0"

     

       95699
       95910
        
             sources."punycode-2.1.1"

     
···

       95764
       95975
        
             sources."ret-0.1.15"

     

       95765
       95976
        
             sources."reusify-1.0.4"

     

       95766
       95977
        
             sources."rimraf-3.0.2"

     

       95767
       95767
       -
             sources."rollup-2.50.3"

     

       95978
       95978
       +
             sources."rollup-2.50.5"

     

       95768
       95979
        
             (sources."rollup-plugin-inject-3.0.2" // {

     

       95769
       95980
        
               dependencies = [

     

       95770
       95981
        
                 sources."estree-walker-0.6.1"

     
···

       95859
       96070
        
             })

     

       95860
       96071
        
             sources."sort-keys-length-1.0.1"

     

       95861
       96072
        
             sources."source-map-0.5.7"

     

       96073
       96073
       +
             sources."source-map-js-0.6.2"

     

       95862
       96074
        
             sources."source-map-resolve-0.5.3"

     

       95863
       96075
        
             (sources."source-map-support-0.5.19" // {

     

       95864
       96076
        
               dependencies = [

     
···

       96362
       96574
        
             sources."find-up-1.1.2"

     

       96363
       96575
        
             sources."forever-agent-0.6.1"

     

       96364
       96576
        
             sources."form-data-2.1.4"

     

       96365
       96365
       -
             sources."forwarded-0.1.2"

     

       96577
       96577
       +
             sources."forwarded-0.2.0"

     

       96366
       96578
        
             sources."fresh-0.5.2"

     

       96367
       96579
        
             sources."fs.realpath-1.0.0"

     

       96368
       96580
        
             sources."fstream-1.0.12"

     
···

       96464
       96676
        
             sources."pinkie-promise-2.0.1"

     

       96465
       96677
        
             sources."plist-1.2.0"

     

       96466
       96678
        
             sources."process-nextick-args-2.0.1"

     

       96467
       96467
       -
             sources."proxy-addr-2.0.6"

     

       96679
       96679
       +
             sources."proxy-addr-2.0.7"

     

       96468
       96680
        
             sources."punycode-1.4.1"

     

       96469
       96681
        
             sources."qs-6.7.0"

     

       96470
       96682
        
             sources."range-parser-1.2.1"

     
···

       96845
       97057
        
             sources."follow-redirects-1.14.1"

     

       96846
       97058
        
             sources."forever-agent-0.6.1"

     

       96847
       97059
        
             sources."form-data-2.3.3"

     

       96848
       96848
       -
             sources."forwarded-0.1.2"

     

       97060
       97060
       +
             sources."forwarded-0.2.0"

     

       96849
       97061
        
             sources."fresh-0.5.2"

     

       96850
       97062
        
             sources."fs-extra-8.1.0"

     

       96851
       97063
        
             sources."fs-minipass-2.1.0"

     
···

       97036
       97248
        
             sources."pause-0.0.1"

     

       97037
       97249
        
             sources."performance-now-2.1.0"

     

       97038
       97250
        
             sources."process-nextick-args-2.0.1"

     

       97039
       97039
       -
             sources."proxy-addr-2.0.6"

     

       97251
       97251
       +
             sources."proxy-addr-2.0.7"

     

       97040
       97252
        
             sources."pseudomap-1.0.2"

     

       97041
       97253
        
             sources."psl-1.8.0"

     

       97042
       97254
        
             sources."pump-3.0.0"

     
···

       97637
       97849
        
             sources."error-ex-1.3.2"

     

       97638
       97850
        
             sources."escape-goat-3.0.0"

     

       97639
       97851
        
             sources."escape-string-regexp-4.0.0"

     

       97640
       97640
       -
             sources."execa-5.0.0"

     

       97852
       97852
       +
             sources."execa-5.0.1"

     

       97641
       97853
        
             sources."external-editor-3.1.0"

     

       97642
       97854
        
             sources."fast-glob-3.2.5"

     

       97643
       97855
        
             sources."fastq-1.11.0"

     
···

       98047
       98259
        
         npm = nodeEnv.buildNodePackage {

     

       98048
       98260
        
           name = "npm";

     

       98049
       98261
        
           packageName = "npm";

     

       98050
       98050
       -
           version = "7.15.0";

     

       98262
       98262
       +
           version = "7.15.1";

     

       98051
       98263
        
           src = fetchurl {

     

       98052
       98052
       -
             url = "https://registry.npmjs.org/npm/-/npm-7.15.0.tgz";

     

       98053
       98053
       -
             sha512 = "GIXNqy3obii54oPF0gbcBNq4aYuB/Ovuu/uYp1eS4nij2PEDMnoOh6RoSv2MDvAaB4a+JbpX/tjDxLO7JAADgQ==";

     

       98264
       98264
       +
             url = "https://registry.npmjs.org/npm/-/npm-7.15.1.tgz";

     

       98265
       98265
       +
             sha512 = "sPk+GrqawshbG3T81r2QvvSxSQXBFWyn5NGLacf87l+/odi2ZRHkWdLrg304Lw0DrwwIIaGxUjp0FJXaMtIErQ==";

     

       98054
       98266
        
           };

     

       98055
       98267
        
           buildInputs = globalBuildInputs;

     

       98056
       98268
        
           meta = {

     
···

       98065
       98277
        
         npm-check-updates = nodeEnv.buildNodePackage {

     

       98066
       98278
        
           name = "npm-check-updates";

     

       98067
       98279
        
           packageName = "npm-check-updates";

     

       98068
       98068
       -
           version = "11.5.13";

     

       98280
       98280
       +
           version = "11.6.0";

     

       98069
       98281
        
           src = fetchurl {

     

       98070
       98070
       -
             url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.5.13.tgz";

     

       98071
       98071
       -
             sha512 = "4R9MOr101RdTWYKZSbIbCFIXYegxt0Z7CYMNSYUzkLuusMcueMoH3E/dgfL3h4S9W/z4XboDNbP6jV9FJP/73A==";

     

       98282
       98282
       +
             url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.6.0.tgz";

     

       98283
       98283
       +
             sha512 = "/l4S7Gh+8+Rg5itWsqFya5RRSHtPzw5neyAlbWNJfBfEeRX6lYVxKgs85QFBOKrZj3eL5MGBaUW8228TmjMhrw==";

     

       98072
       98284
        
           };

     

       98073
       98285
        
           dependencies = [

     

       98074
       98286
        
             sources."@nodelib/fs.scandir-2.1.4"

     
···

       98893
       99105
        
             sources."caller-path-2.0.0"

     

       98894
       99106
        
             sources."callsites-2.0.0"

     

       98895
       99107
        
             sources."caniuse-api-3.0.0"

     

       98896
       98896
       -
             sources."caniuse-lite-1.0.30001230"

     

       99108
       99108
       +
             sources."caniuse-lite-1.0.30001232"

     

       98897
       99109
        
             sources."caseless-0.12.0"

     

       98898
       99110
        
             sources."chalk-2.4.2"

     

       98899
       99111
        
             sources."chokidar-2.1.8"

     
···

       98920
       99132
        
             sources."convert-source-map-1.7.0"

     

       98921
       99133
        
             sources."copy-descriptor-0.1.1"

     

       98922
       99134
        
             sources."core-js-2.6.12"

     

       98923
       98923
       -
             (sources."core-js-compat-3.13.0" // {

     

       99135
       99135
       +
             (sources."core-js-compat-3.13.1" // {

     

       98924
       99136
        
               dependencies = [

     

       98925
       99137
        
                 sources."semver-7.0.0"

     

       98926
       99138
        
               ];

     
···

       99031
       99243
        
             sources."duplexer2-0.1.4"

     

       99032
       99244
        
             sources."ecc-jsbn-0.1.2"

     

       99033
       99245
        
             sources."ee-first-1.1.1"

     

       99034
       99034
       -
             sources."electron-to-chromium-1.3.741"

     

       99246
       99246
       +
             sources."electron-to-chromium-1.3.743"

     

       99035
       99247
        
             (sources."elliptic-6.5.4" // {

     

       99036
       99248
        
               dependencies = [

     

       99037
       99249
        
                 sources."bn.js-4.12.0"

     
···

       99751
       99963
        
             sources."find-up-3.0.0"

     

       99752
       99964
        
             sources."forever-agent-0.6.1"

     

       99753
       99965
        
             sources."form-data-2.3.3"

     

       99754
       99754
       -
             sources."forwarded-0.1.2"

     

       99966
       99966
       +
             sources."forwarded-0.2.0"

     

       99755
       99967
        
             sources."fresh-0.5.2"

     

       99756
       99968
        
             sources."fs.realpath-1.0.0"

     

       99757
       99969
        
             sources."function-bind-1.1.1"

     
···

       99839
       100051
        
             sources."process-nextick-args-2.0.1"

     

       99840
       100052
        
             sources."prom-client-11.5.3"

     

       99841
       100053
        
             sources."promise-8.1.0"

     

       99842
       99842
       -
             sources."proxy-addr-2.0.6"

     

       100054
       100054
       +
             sources."proxy-addr-2.0.7"

     

       99843
       100055
        
             sources."prr-1.0.1"

     

       99844
       100056
        
             sources."psl-1.8.0"

     

       99845
       100057
        
             sources."punycode-2.1.1"

     
···

       100445
       100657
        
             sources."fluent-ffmpeg-2.1.2"

     

       100446
       100658
        
             sources."forever-agent-0.6.1"

     

       100447
       100659
        
             sources."form-data-2.3.3"

     

       100448
       100448
       -
             sources."forwarded-0.1.2"

     

       100660
       100660
       +
             sources."forwarded-0.2.0"

     

       100449
       100661
        
             sources."fresh-0.5.2"

     

       100450
       100662
        
             sources."fs-chunk-store-1.7.0"

     

       100451
       100663
        
             sources."fs-constants-1.0.0"

     
···

       100564
       100776
        
             sources."peer-wire-swarm-0.12.2"

     

       100565
       100777
        
             sources."performance-now-2.1.0"

     

       100566
       100778
        
             sources."process-nextick-args-2.0.1"

     

       100567
       100567
       -
             sources."proxy-addr-2.0.6"

     

       100779
       100779
       +
             sources."proxy-addr-2.0.7"

     

       100568
       100780
        
             sources."psl-1.8.0"

     

       100569
       100781
        
             sources."pump-3.0.0"

     

       100570
       100782
        
             sources."punycode-2.1.1"

     
···

       100918
       101130
        
         pnpm = nodeEnv.buildNodePackage {

     

       100919
       101131
        
           name = "pnpm";

     

       100920
       101132
        
           packageName = "pnpm";

     

       100921
       100921
       -
           version = "6.6.1";

     

       101133
       101133
       +
           version = "6.6.2";

     

       100922
       101134
        
           src = fetchurl {

     

       100923
       100923
       -
             url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.1.tgz";

     

       100924
       100924
       -
             sha512 = "viktTHmFzFckpvY/Gwtl8esjeOItpCgycIrVgLPh4qbxK4f+JqkEM+3LZF5dudyWzBZCOspZHePNuxeM0zn/Ew==";

     

       101135
       101135
       +
             url = "https://registry.npmjs.org/pnpm/-/pnpm-6.6.2.tgz";

     

       101136
       101136
       +
             sha512 = "w1YEyx+xiTbrxVt5OP6JG0LqwkK/hq2OkCYj7RZhK9oyv7cCEkgkX5Z5MPVC1wTCv2kQDJRoXzBeedPiIhzN8Q==";

     

       100925
       101137
        
           };

     

       100926
       101138
        
           buildInputs = globalBuildInputs;

     

       100927
       101139
        
           meta = {

     
···

       101470
       101682
        
         pyright = nodeEnv.buildNodePackage {

     

       101471
       101683
        
           name = "pyright";

     

       101472
       101684
        
           packageName = "pyright";

     

       101473
       101473
       -
           version = "1.1.144";

     

       101685
       101685
       +
           version = "1.1.145";

     

       101474
       101686
        
           src = fetchurl {

     

       101475
       101475
       -
             url = "https://registry.npmjs.org/pyright/-/pyright-1.1.144.tgz";

     

       101476
       101476
       -
             sha512 = "nzCTqxg7JPHy5FkyX4+meD4c7Zt/mgPBI+nFGS9HoN/3GVPHAlTcCKa1JPTEh7O/N5+8W/9WZUuUntBW2R3adg==";

     

       101687
       101687
       +
             url = "https://registry.npmjs.org/pyright/-/pyright-1.1.145.tgz";

     

       101688
       101688
       +
             sha512 = "eyrK9Ilut2shvqi/TFmpfUrm7U6DrkskMa8UPofkGJZCO1PJzVwzKaGWrR57zlbcAxs5PVvK9JGSIO9DJUVNyA==";

     

       101477
       101689
        
           };

     

       101478
       101690
        
           buildInputs = globalBuildInputs;

     

       101479
       101691
        
           meta = {

     
···

       102144
       102356
        
             sources."camel-case-3.0.0"

     

       102145
       102357
        
             sources."camelcase-5.3.1"

     

       102146
       102358
        
             sources."caniuse-api-3.0.0"

     

       102147
       102147
       -
             sources."caniuse-lite-1.0.30001230"

     

       102359
       102359
       +
             sources."caniuse-lite-1.0.30001232"

     

       102148
       102360
        
             sources."case-sensitive-paths-webpack-plugin-2.4.0"

     

       102149
       102361
        
             sources."caw-2.0.1"

     

       102150
       102362
        
             (sources."chalk-2.4.2" // {

     
···

       102229
       102441
        
             sources."copy-concurrently-1.0.5"

     

       102230
       102442
        
             sources."copy-descriptor-0.1.1"

     

       102231
       102443
        
             sources."core-js-2.6.12"

     

       102232
       102232
       -
             (sources."core-js-compat-3.13.0" // {

     

       102444
       102444
       +
             (sources."core-js-compat-3.13.1" // {

     

       102233
       102445
        
               dependencies = [

     

       102234
       102446
        
                 sources."semver-7.0.0"

     

       102235
       102447
        
               ];

     
···

       102369
       102581
        
             sources."duplexify-3.7.1"

     

       102370
       102582
        
             sources."ee-first-1.1.1"

     

       102371
       102583
        
             sources."ejs-2.7.4"

     

       102372
       102372
       -
             sources."electron-to-chromium-1.3.741"

     

       102584
       102584
       +
             sources."electron-to-chromium-1.3.743"

     

       102373
       102585
        
             (sources."elliptic-6.5.4" // {

     

       102374
       102586
        
               dependencies = [

     

       102375
       102587
        
                 sources."bn.js-4.12.0"

     
···

       102505
       102717
        
             sources."flush-write-stream-1.1.1"

     

       102506
       102718
        
             sources."follow-redirects-1.14.1"

     

       102507
       102719
        
             sources."for-in-1.0.2"

     

       102508
       102508
       -
             sources."forwarded-0.1.2"

     

       102720
       102720
       +
             sources."forwarded-0.2.0"

     

       102509
       102721
        
             sources."fragment-cache-0.2.1"

     

       102510
       102722
        
             sources."fresh-0.5.2"

     

       102511
       102723
        
             sources."from2-2.3.0"

     
···

       102766
       102978
        
               ];

     

       102767
       102979
        
             })

     

       102768
       102980
        
             sources."mime-2.5.2"

     

       102769
       102769
       -
             sources."mime-db-1.47.0"

     

       102770
       102770
       -
             sources."mime-types-2.1.30"

     

       102981
       102981
       +
             sources."mime-db-1.48.0"

     

       102982
       102982
       +
             (sources."mime-types-2.1.30" // {

     

       102983
       102983
       +
               dependencies = [

     

       102984
       102984
       +
                 sources."mime-db-1.47.0"

     

       102985
       102985
       +
               ];

     

       102986
       102986
       +
             })

     

       102771
       102987
        
             sources."mimic-fn-1.2.0"

     

       102772
       102988
        
             sources."mimic-response-1.0.1"

     

       102773
       102989
        
             sources."minimalistic-assert-1.0.1"

     
···

       103043
       103259
        
             sources."promise-inflight-1.0.1"

     

       103044
       103260
        
             sources."prop-types-15.7.2"

     

       103045
       103261
        
             sources."proto-list-1.2.4"

     

       103046
       103046
       -
             sources."proxy-addr-2.0.6"

     

       103262
       103262
       +
             sources."proxy-addr-2.0.7"

     

       103047
       103263
        
             sources."prr-1.0.1"

     

       103048
       103264
        
             sources."pseudomap-1.0.2"

     

       103049
       103265
        
             (sources."public-encrypt-4.0.3" // {

     
···

       103619
       103835
        
             sources."@mozilla/readability-0.4.1"

     

       103620
       103836
        
             sources."@tootallnate/once-1.1.2"

     

       103621
       103837
        
             sources."abab-2.0.5"

     

       103622
       103622
       -
             sources."acorn-8.2.4"

     

       103838
       103838
       +
             sources."acorn-8.3.0"

     

       103623
       103839
        
             (sources."acorn-globals-6.0.0" // {

     

       103624
       103840
        
               dependencies = [

     

       103625
       103841
        
                 sources."acorn-7.4.1"

     
···

       103651
       103867
        
                 sources."webidl-conversions-5.0.0"

     

       103652
       103868
        
               ];

     

       103653
       103869
        
             })

     

       103654
       103654
       -
             sources."dompurify-2.2.8"

     

       103870
       103870
       +
             sources."dompurify-2.2.9"

     

       103655
       103871
        
             sources."emoji-regex-8.0.0"

     

       103656
       103872
        
             sources."escalade-3.1.1"

     

       103657
       103873
        
             sources."escodegen-2.0.0"

     
···

       103748
       103964
        
             sources."@emotion/unitless-0.7.5"

     

       103749
       103965
        
             sources."@exodus/schemasafe-1.0.0-rc.3"

     

       103750
       103966
        
             sources."@redocly/ajv-6.12.4"

     

       103751
       103751
       -
             (sources."@redocly/openapi-core-1.0.0-beta.48" // {

     

       103967
       103967
       +
             (sources."@redocly/openapi-core-1.0.0-beta.49" // {

     

       103752
       103968
        
               dependencies = [

     

       103753
       103969
        
                 sources."@types/node-14.17.1"

     

       103754
       103970
        
               ];

     
···

       103822
       104038
        
             sources."concat-map-0.0.1"

     

       103823
       104039
        
             sources."console-browserify-1.2.0"

     

       103824
       104040
        
             sources."constants-browserify-1.0.0"

     

       103825
       103825
       -
             sources."core-js-3.13.0"

     

       104041
       104041
       +
             sources."core-js-3.13.1"

     

       103826
       104042
        
             sources."core-util-is-1.0.2"

     

       103827
       104043
        
             (sources."create-ecdh-4.0.4" // {

     

       103828
       104044
        
               dependencies = [

     
···

       103845
       104061
        
               ];

     

       103846
       104062
        
             })

     

       103847
       104063
        
             sources."domain-browser-1.2.0"

     

       103848
       103848
       -
             sources."dompurify-2.2.8"

     

       104064
       104064
       +
             sources."dompurify-2.2.9"

     

       103849
       104065
        
             (sources."elliptic-6.5.4" // {

     

       103850
       104066
        
               dependencies = [

     

       103851
       104067
        
                 sources."bn.js-4.12.0"

     
···

       103936
       104152
        
             sources."node-readfiles-0.2.0"

     

       103937
       104153
        
             sources."normalize-path-3.0.0"

     

       103938
       104154
        
             sources."oas-kit-common-1.0.8"

     

       103939
       103939
       -
             sources."oas-linter-3.2.1"

     

       103940
       103940
       -
             (sources."oas-resolver-2.5.4" // {

     

       104155
       104155
       +
             sources."oas-linter-3.2.2"

     

       104156
       104156
       +
             (sources."oas-resolver-2.5.5" // {

     

       103941
       104157
        
               dependencies = [

     

       103942
       103942
       -
                 sources."yargs-16.2.0"

     

       104158
       104158
       +
                 sources."yargs-17.0.1"

     

       103943
       104159
        
               ];

     

       103944
       104160
        
             })

     

       103945
       104161
        
             sources."oas-schema-walker-1.1.5"

     

       103946
       104162
        
             sources."oas-validator-4.0.8"

     

       103947
       104163
        
             sources."object-assign-4.1.1"

     

       103948
       103948
       -
             sources."openapi-sampler-1.0.0"

     

       104164
       104164
       +
             sources."openapi-sampler-1.0.1"

     

       103949
       104165
        
             sources."os-browserify-0.3.0"

     

       103950
       104166
        
             sources."p-limit-2.3.0"

     

       103951
       104167
        
             sources."p-locate-4.1.0"

     
···

       103957
       104173
        
             sources."pbkdf2-3.1.2"

     

       103958
       104174
        
             sources."perfect-scrollbar-1.5.1"

     

       103959
       104175
        
             sources."picomatch-2.3.0"

     

       103960
       103960
       -
             sources."polished-3.7.1"

     

       104176
       104176
       +
             sources."polished-3.7.2"

     

       103961
       104177
        
             sources."postcss-value-parser-4.1.0"

     

       103962
       104178
        
             sources."prismjs-1.23.0"

     

       103963
       104179
        
             sources."process-0.11.10"

     
···

       104272
       104488
        
         rollup = nodeEnv.buildNodePackage {

     

       104273
       104489
        
           name = "rollup";

     

       104274
       104490
        
           packageName = "rollup";

     

       104275
       104275
       -
           version = "2.50.3";

     

       104491
       104491
       +
           version = "2.50.5";

     

       104276
       104492
        
           src = fetchurl {

     

       104277
       104277
       -
             url = "https://registry.npmjs.org/rollup/-/rollup-2.50.3.tgz";

     

       104278
       104278
       -
             sha512 = "58KiHnaCzZn6F5yRMjHe7WTZuFj6r4iJVJz5UwvKD6f/xfTy2IdtbR2AVHN6cyfK1tBy//hJ66ebXy6Y1h7HlQ==";

     

       104493
       104493
       +
             url = "https://registry.npmjs.org/rollup/-/rollup-2.50.5.tgz";

     

       104494
       104494
       +
             sha512 = "Ztz4NurU2LbS3Jn5rlhnYv35z6pkjBUmYKr94fOBIKINKRO6kug9NTFHArT7jqwMP2kqEZ39jJuEtkk91NBltQ==";

     

       104279
       104495
        
           };

     

       104280
       104496
        
           dependencies = [

     

       104281
       104497
        
             sources."fsevents-2.3.2"

     
···

       104330
       104546
        
             sources."@types/node-fetch-2.5.10"

     

       104331
       104547
        
             sources."@types/resolve-1.17.1"

     

       104332
       104548
        
             sources."@types/vscode-1.56.0"

     

       104333
       104333
       -
             sources."@typescript-eslint/eslint-plugin-4.25.0"

     

       104334
       104334
       -
             sources."@typescript-eslint/experimental-utils-4.25.0"

     

       104335
       104335
       -
             sources."@typescript-eslint/parser-4.25.0"

     

       104336
       104336
       -
             sources."@typescript-eslint/scope-manager-4.25.0"

     

       104337
       104337
       -
             sources."@typescript-eslint/types-4.25.0"

     

       104338
       104338
       -
             sources."@typescript-eslint/typescript-estree-4.25.0"

     

       104339
       104339
       -
             sources."@typescript-eslint/visitor-keys-4.25.0"

     

       104549
       104549
       +
             sources."@typescript-eslint/eslint-plugin-4.26.0"

     

       104550
       104550
       +
             sources."@typescript-eslint/experimental-utils-4.26.0"

     

       104551
       104551
       +
             sources."@typescript-eslint/parser-4.26.0"

     

       104552
       104552
       +
             sources."@typescript-eslint/scope-manager-4.26.0"

     

       104553
       104553
       +
             sources."@typescript-eslint/types-4.26.0"

     

       104554
       104554
       +
             sources."@typescript-eslint/typescript-estree-4.26.0"

     

       104555
       104555
       +
             sources."@typescript-eslint/visitor-keys-4.26.0"

     

       104340
       104556
        
             sources."@ungap/promise-all-settled-1.1.2"

     

       104341
       104557
        
             sources."acorn-7.4.1"

     

       104342
       104558
        
             sources."acorn-jsx-5.3.1"

     
···

       104420
       104636
        
             sources."escape-string-regexp-4.0.0"

     

       104421
       104637
        
             (sources."eslint-7.27.0" // {

     

       104422
       104638
        
               dependencies = [

     

       104639
       104639
       +
                 (sources."eslint-utils-2.1.0" // {

     

       104640
       104640
       +
                   dependencies = [

     

       104641
       104641
       +
                     sources."eslint-visitor-keys-1.3.0"

     

       104642
       104642
       +
                   ];

     

       104643
       104643
       +
                 })

     

       104423
       104644
        
                 sources."ignore-4.0.6"

     

       104424
       104645
        
               ];

     

       104425
       104646
        
             })

     

       104426
       104647
        
             sources."eslint-scope-5.1.1"

     

       104427
       104427
       -
             (sources."eslint-utils-2.1.0" // {

     

       104428
       104428
       -
               dependencies = [

     

       104429
       104429
       -
                 sources."eslint-visitor-keys-1.3.0"

     

       104430
       104430
       -
               ];

     

       104431
       104431
       -
             })

     

       104648
       104648
       +
             sources."eslint-utils-3.0.0"

     

       104432
       104649
        
             sources."eslint-visitor-keys-2.1.0"

     

       104433
       104650
        
             (sources."espree-7.3.1" // {

     

       104434
       104651
        
               dependencies = [

     
···

       104603
       104820
        
             sources."resolve-from-4.0.0"

     

       104604
       104821
        
             sources."reusify-1.0.4"

     

       104605
       104822
        
             sources."rimraf-3.0.2"

     

       104606
       104606
       -
             sources."rollup-2.50.3"

     

       104823
       104823
       +
             sources."rollup-2.50.5"

     

       104607
       104824
        
             sources."run-parallel-1.2.0"

     

       104608
       104825
        
             sources."safe-buffer-5.2.1"

     

       104609
       104826
        
             sources."semver-7.3.5"

     
···

       104661
       104878
        
             sources."url-join-1.1.0"

     

       104662
       104879
        
             sources."util-deprecate-1.0.2"

     

       104663
       104880
        
             sources."v8-compile-cache-2.3.0"

     

       104664
       104664
       -
             (sources."vsce-1.88.0" // {

     

       104881
       104881
       +
             (sources."vsce-1.91.0" // {

     

       104665
       104882
        
               dependencies = [

     

       104666
       104883
        
                 sources."chalk-2.4.2"

     

       104667
       104884
        
                 sources."commander-6.2.1"

     
···

       105100
       105317
        
             sources."@tencent-sdk/cls-0.2.1"

     

       105101
       105318
        
             (sources."@tencent-sdk/common-0.1.0" // {

     

       105102
       105319
        
               dependencies = [

     

       105103
       105103
       -
                 sources."type-fest-1.1.3"

     

       105320
       105320
       +
                 sources."type-fest-1.2.0"

     

       105104
       105321
        
               ];

     

       105105
       105322
        
             })

     

       105106
       105323
        
             sources."@tencent-sdk/faas-0.1.5"

     
···

       105279
       105496
        
             sources."component-bind-1.0.0"

     

       105280
       105497
        
             sources."component-emitter-1.3.0"

     

       105281
       105498
        
             sources."component-inherit-0.0.3"

     

       105282
       105282
       -
             sources."compress-commons-4.1.0"

     

       105499
       105499
       +
             sources."compress-commons-4.1.1"

     

       105283
       105500
        
             sources."concat-map-0.0.1"

     

       105284
       105501
        
             sources."console-control-strings-1.1.0"

     

       105285
       105502
        
             (sources."content-disposition-0.5.3" // {

     
···

       105974
       106191
        
             sources."finalhandler-1.1.2"

     

       105975
       106192
        
             sources."forever-agent-0.6.1"

     

       105976
       106193
        
             sources."form-data-2.3.3"

     

       105977
       105977
       -
             sources."forwarded-0.1.2"

     

       106194
       106194
       +
             sources."forwarded-0.2.0"

     

       105978
       106195
        
             sources."fresh-0.5.2"

     

       105979
       106196
        
             sources."from-0.1.7"

     

       105980
       106197
        
             sources."getpass-0.1.7"

     
···

       106036
       106253
        
             sources."path-to-regexp-0.1.7"

     

       106037
       106254
        
             sources."pause-stream-0.0.11"

     

       106038
       106255
        
             sources."performance-now-2.1.0"

     

       106039
       106039
       -
             sources."proxy-addr-2.0.6"

     

       106256
       106256
       +
             sources."proxy-addr-2.0.7"

     

       106040
       106257
        
             sources."psl-1.8.0"

     

       106041
       106258
        
             sources."punycode-2.1.1"

     

       106042
       106259
        
             sources."qs-6.7.0"

     
···

       106518
       106735
        
         snyk = nodeEnv.buildNodePackage {

     

       106519
       106736
        
           name = "snyk";

     

       106520
       106737
        
           packageName = "snyk";

     

       106521
       106521
       -
           version = "1.618.0";

     

       106738
       106738
       +
           version = "1.619.0";

     

       106522
       106739
        
           src = fetchurl {

     

       106523
       106523
       -
             url = "https://registry.npmjs.org/snyk/-/snyk-1.618.0.tgz";

     

       106524
       106524
       -
             sha512 = "N4pTbZQgoZYsammFO65c8SPdmH0bxd3iP0cV6xWsbNeueLqjAJ9pKkT3+tYcIi97HmkXo6Zf1RAliH/Kge/akA==";

     

       106740
       106740
       +
             url = "https://registry.npmjs.org/snyk/-/snyk-1.619.0.tgz";

     

       106741
       106741
       +
             sha512 = "ZQFDU+WniTjD6Z1vqKQcBq50jJ9DWSBBCg0PNW54MZbK5oO+L2rHtbpaD3NI3lQI+AFCe64kdzkWMgsEemkFHQ==";

     

       106525
       106742
        
           };

     

       106526
       106743
        
           dependencies = [

     

       106527
       106744
        
             sources."@arcanis/slice-ansi-1.0.2"

     
···

       106676
       106893
        
             sources."bcrypt-pbkdf-1.0.2"

     

       106677
       106894
        
             sources."binjumper-0.1.4"

     

       106678
       106895
        
             sources."bl-4.1.0"

     

       106679
       106679
       -
             sources."boolean-3.0.4"

     

       106896
       106896
       +
             sources."boolean-3.1.0"

     

       106680
       106897
        
             sources."bottleneck-2.19.5"

     

       106681
       106898
        
             (sources."boxen-5.0.1" // {

     

       106682
       106899
        
               dependencies = [

     
···

       106727
       106944
        
             sources."color-name-1.1.4"

     

       106728
       106945
        
             sources."concat-map-0.0.1"

     

       106729
       106946
        
             sources."configstore-5.0.1"

     

       106730
       106730
       -
             sources."core-js-3.13.0"

     

       106947
       106947
       +
             sources."core-js-3.13.1"

     

       106731
       106948
        
             sources."core-util-is-1.0.2"

     

       106732
       106949
        
             (sources."cross-spawn-6.0.5" // {

     

       106733
       106950
        
               dependencies = [

     
···

       108693
       108910
        
             })

     

       108694
       108911
        
             (sources."express-4.17.1" // {

     

       108695
       108912
        
               dependencies = [

     

       108696
       108696
       -
                 sources."proxy-addr-2.0.6"

     

       108913
       108913
       +
                 sources."proxy-addr-2.0.7"

     

       108697
       108914
        
                 sources."qs-6.7.0"

     

       108698
       108915
        
               ];

     

       108699
       108916
        
             })

     
···

       108716
       108933
        
             sources."forever-agent-0.6.1"

     

       108717
       108934
        
             sources."form-data-2.1.4"

     

       108718
       108935
        
             sources."formidable-1.2.2"

     

       108719
       108719
       -
             sources."forwarded-0.1.2"

     

       108936
       108936
       +
             sources."forwarded-0.2.0"

     

       108720
       108937
        
             sources."fresh-0.5.2"

     

       108721
       108938
        
             sources."fs.realpath-1.0.0"

     

       108722
       108939
        
             sources."function-bind-1.1.1"

     
···

       108962
       109179
        
             sources."protobufjs-3.8.2"

     

       108963
       109180
        
             (sources."proxy-addr-1.1.5" // {

     

       108964
       109181
        
               dependencies = [

     

       109182
       109182
       +
                 sources."forwarded-0.1.2"

     

       108965
       109183
        
                 sources."ipaddr.js-1.4.0"

     

       108966
       109184
        
               ];

     

       108967
       109185
        
             })

     
···

       109359
       109577
        
             sources."callsites-3.1.0"

     

       109360
       109578
        
             sources."camelcase-5.3.1"

     

       109361
       109579
        
             sources."camelcase-keys-6.2.2"

     

       109362
       109362
       -
             sources."caniuse-lite-1.0.30001230"

     

       109580
       109580
       +
             sources."caniuse-lite-1.0.30001232"

     

       109363
       109581
        
             (sources."chalk-4.1.1" // {

     

       109364
       109582
        
               dependencies = [

     

       109365
       109583
        
                 sources."ansi-styles-4.3.0"

     
···

       109397
       109615
        
             sources."domelementtype-1.3.1"

     

       109398
       109616
        
             sources."domhandler-2.4.2"

     

       109399
       109617
        
             sources."domutils-1.7.0"

     

       109400
       109400
       -
             sources."electron-to-chromium-1.3.741"

     

       109618
       109618
       +
             sources."electron-to-chromium-1.3.743"

     

       109401
       109619
        
             sources."emoji-regex-8.0.0"

     

       109402
       109620
        
             sources."entities-1.1.2"

     

       109403
       109621
        
             sources."error-ex-1.3.2"

     
···

       110963
       111181
        
             sources."@types/normalize-package-data-2.4.0"

     

       110964
       111182
        
             sources."@types/parse5-5.0.3"

     

       110965
       111183
        
             sources."@types/unist-2.0.3"

     

       110966
       110966
       -
             sources."acorn-8.2.4"

     

       111184
       111184
       +
             sources."acorn-8.3.0"

     

       110967
       111185
        
             sources."acorn-jsx-5.3.1"

     

       110968
       111186
        
             sources."alex-9.1.0"

     

       110969
       111187
        
             (sources."ansi-align-3.0.0" // {

     
···

       111846
       112064
        
             sources."content-type-1.0.4"

     

       111847
       112065
        
             sources."cookie-0.4.0"

     

       111848
       112066
        
             sources."cookie-signature-1.0.6"

     

       111849
       111849
       -
             sources."core-js-3.13.0"

     

       112067
       112067
       +
             sources."core-js-3.13.1"

     

       111850
       112068
        
             sources."core-util-is-1.0.2"

     

       111851
       112069
        
             sources."css-select-1.2.0"

     

       111852
       112070
        
             sources."css-what-2.1.3"

     
···

       111913
       112131
        
             sources."finalhandler-1.1.2"

     

       111914
       112132
        
             sources."forever-agent-0.6.1"

     

       111915
       112133
        
             sources."form-data-2.3.3"

     

       111916
       111916
       -
             sources."forwarded-0.1.2"

     

       112134
       112134
       +
             sources."forwarded-0.2.0"

     

       111917
       112135
        
             sources."fresh-0.5.2"

     

       111918
       112136
        
             sources."fs-minipass-1.2.7"

     

       111919
       112137
        
             sources."fs.realpath-1.0.0"

     
···

       112075
       112293
        
             sources."precond-0.2.3"

     

       112076
       112294
        
             sources."prepend-http-2.0.0"

     

       112077
       112295
        
             sources."process-nextick-args-2.0.1"

     

       112078
       112078
       -
             sources."proxy-addr-2.0.6"

     

       112296
       112296
       +
             sources."proxy-addr-2.0.7"

     

       112079
       112297
        
             sources."psl-1.8.0"

     

       112080
       112298
        
             sources."pump-3.0.0"

     

       112081
       112299
        
             sources."punycode-2.1.1"

     
···

       112822
       113040
        
             sources."fecha-4.2.1"

     

       112823
       113041
        
             sources."finalhandler-1.1.2"

     

       112824
       113042
        
             sources."fn.name-1.1.0"

     

       112825
       112825
       -
             sources."forwarded-0.1.2"

     

       113043
       113043
       +
             sources."forwarded-0.2.0"

     

       112826
       113044
        
             sources."fresh-0.5.2"

     

       112827
       113045
        
             sources."fs.realpath-1.0.0"

     

       112828
       113046
        
             sources."get-caller-file-2.0.5"

     
···

       112911
       113129
        
             sources."pause-0.0.1"

     

       112912
       113130
        
             sources."prepend-http-2.0.0"

     

       112913
       113131
        
             sources."process-nextick-args-2.0.1"

     

       112914
       112914
       -
             sources."proxy-addr-2.0.6"

     

       113132
       113132
       +
             sources."proxy-addr-2.0.7"

     

       112915
       113133
        
             sources."pseudomap-1.0.2"

     

       112916
       113134
        
             sources."pump-3.0.0"

     

       112917
       113135
        
             sources."qs-6.7.0"

     
···

       113308
       113526
        
             sources."enquirer-2.3.6"

     

       113309
       113527
        
             sources."escape-string-regexp-4.0.0"

     

       113310
       113528
        
             sources."eslint-7.27.0"

     

       113311
       113311
       -
             sources."eslint-plugin-vue-7.9.0"

     

       113529
       113529
       +
             sources."eslint-plugin-vue-7.10.0"

     

       113312
       113530
        
             sources."eslint-scope-5.1.1"

     

       113313
       113531
        
             (sources."eslint-utils-2.1.0" // {

     

       113314
       113532
        
               dependencies = [

     
···

       114344
       114562
        
             sources."util-deprecate-1.0.2"

     

       114345
       114563
        
             sources."v8-compile-cache-2.3.0"

     

       114346
       114564
        
             sources."vm-browserify-1.1.2"

     

       114347
       114347
       -
             sources."vsce-1.88.0"

     

       114565
       114565
       +
             sources."vsce-1.91.0"

     

       114348
       114566
        
             sources."vscode-debugadapter-testsupport-1.47.0"

     

       114349
       114567
        
             sources."vscode-debugprotocol-1.47.0"

     

       114350
       114568
        
             (sources."watchpack-1.7.5" // {

     
···

       115646
       115864
        
           bypassCache = true;

     

       115647
       115865
        
           reconstructLock = true;

     

       115648
       115866
        
         };

     

       115867
       115867
       +
         wavedrom-cli = nodeEnv.buildNodePackage {

     

       115868
       115868
       +
           name = "wavedrom-cli";

     

       115869
       115869
       +
           packageName = "wavedrom-cli";

     

       115870
       115870
       +
           version = "2.6.8";

     

       115871
       115871
       +
           src = fetchurl {

     

       115872
       115872
       +
             url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.6.8.tgz";

     

       115873
       115873
       +
             sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w==";

     

       115874
       115874
       +
           };

     

       115875
       115875
       +
           dependencies = [

     

       115876
       115876
       +
             sources."@babel/runtime-corejs3-7.14.0"

     

       115877
       115877
       +
             sources."@mapbox/node-pre-gyp-1.0.5"

     

       115878
       115878
       +
             sources."@tootallnate/once-1.1.2"

     

       115879
       115879
       +
             sources."@types/raf-3.4.0"

     

       115880
       115880
       +
             sources."abab-2.0.5"

     

       115881
       115881
       +
             sources."abbrev-1.1.1"

     

       115882
       115882
       +
             sources."acorn-8.3.0"

     

       115883
       115883
       +
             (sources."acorn-globals-6.0.0" // {

     

       115884
       115884
       +
               dependencies = [

     

       115885
       115885
       +
                 sources."acorn-7.4.1"

     

       115886
       115886
       +
               ];

     

       115887
       115887
       +
             })

     

       115888
       115888
       +
             sources."acorn-walk-7.2.0"

     

       115889
       115889
       +
             sources."agent-base-6.0.2"

     

       115890
       115890
       +
             sources."ansi-regex-2.1.1"

     

       115891
       115891
       +
             sources."ansi-styles-4.3.0"

     

       115892
       115892
       +
             sources."aproba-1.2.0"

     

       115893
       115893
       +
             sources."are-we-there-yet-1.1.5"

     

       115894
       115894
       +
             sources."asynckit-0.4.0"

     

       115895
       115895
       +
             sources."at-least-node-1.0.0"

     

       115896
       115896
       +
             sources."atob-2.1.2"

     

       115897
       115897
       +
             sources."balanced-match-1.0.2"

     

       115898
       115898
       +
             (sources."bit-field-1.3.6" // {

     

       115899
       115899
       +
               dependencies = [

     

       115900
       115900
       +
                 sources."ansi-regex-5.0.0"

     

       115901
       115901
       +
                 sources."fs-extra-8.1.0"

     

       115902
       115902
       +
                 sources."is-fullwidth-code-point-3.0.0"

     

       115903
       115903
       +
                 sources."jsonfile-4.0.0"

     

       115904
       115904
       +
                 sources."onml-1.3.0"

     

       115905
       115905
       +
                 sources."string-width-4.2.2"

     

       115906
       115906
       +
                 sources."strip-ansi-6.0.0"

     

       115907
       115907
       +
                 sources."universalify-0.1.2"

     

       115908
       115908
       +
                 sources."yargs-15.4.1"

     

       115909
       115909
       +
               ];

     

       115910
       115910
       +
             })

     

       115911
       115911
       +
             sources."brace-expansion-1.1.11"

     

       115912
       115912
       +
             sources."browser-process-hrtime-1.0.0"

     

       115913
       115913
       +
             sources."btoa-1.2.1"

     

       115914
       115914
       +
             sources."camelcase-5.3.1"

     

       115915
       115915
       +
             sources."canvas-2.8.0"

     

       115916
       115916
       +
             sources."canvg-3.0.7"

     

       115917
       115917
       +
             sources."chownr-2.0.0"

     

       115918
       115918
       +
             (sources."cliui-6.0.0" // {

     

       115919
       115919
       +
               dependencies = [

     

       115920
       115920
       +
                 sources."ansi-regex-5.0.0"

     

       115921
       115921
       +
                 sources."is-fullwidth-code-point-3.0.0"

     

       115922
       115922
       +
                 sources."string-width-4.2.2"

     

       115923
       115923
       +
                 sources."strip-ansi-6.0.0"

     

       115924
       115924
       +
               ];

     

       115925
       115925
       +
             })

     

       115926
       115926
       +
             sources."code-point-at-1.1.0"

     

       115927
       115927
       +
             sources."color-convert-2.0.1"

     

       115928
       115928
       +
             sources."color-name-1.1.4"

     

       115929
       115929
       +
             sources."combined-stream-1.0.8"

     

       115930
       115930
       +
             sources."concat-map-0.0.1"

     

       115931
       115931
       +
             sources."console-control-strings-1.1.0"

     

       115932
       115932
       +
             sources."core-js-pure-3.13.1"

     

       115933
       115933
       +
             sources."core-util-is-1.0.2"

     

       115934
       115934
       +
             sources."cssom-0.4.4"

     

       115935
       115935
       +
             (sources."cssstyle-2.3.0" // {

     

       115936
       115936
       +
               dependencies = [

     

       115937
       115937
       +
                 sources."cssom-0.3.8"

     

       115938
       115938
       +
               ];

     

       115939
       115939
       +
             })

     

       115940
       115940
       +
             sources."data-urls-2.0.0"

     

       115941
       115941
       +
             sources."debug-4.3.2"

     

       115942
       115942
       +
             sources."decamelize-1.2.0"

     

       115943
       115943
       +
             sources."decimal.js-10.2.1"

     

       115944
       115944
       +
             sources."decompress-response-4.2.1"

     

       115945
       115945
       +
             sources."deep-is-0.1.3"

     

       115946
       115946
       +
             sources."delayed-stream-1.0.0"

     

       115947
       115947
       +
             sources."delegates-1.0.0"

     

       115948
       115948
       +
             sources."detect-libc-1.0.3"

     

       115949
       115949
       +
             (sources."domexception-2.0.1" // {

     

       115950
       115950
       +
               dependencies = [

     

       115951
       115951
       +
                 sources."webidl-conversions-5.0.0"

     

       115952
       115952
       +
               ];

     

       115953
       115953
       +
             })

     

       115954
       115954
       +
             sources."emoji-regex-8.0.0"

     

       115955
       115955
       +
             sources."escalade-3.1.1"

     

       115956
       115956
       +
             sources."escodegen-2.0.0"

     

       115957
       115957
       +
             sources."esprima-4.0.1"

     

       115958
       115958
       +
             sources."estraverse-5.2.0"

     

       115959
       115959
       +
             sources."esutils-2.0.3"

     

       115960
       115960
       +
             sources."fast-levenshtein-2.0.6"

     

       115961
       115961
       +
             sources."find-up-4.1.0"

     

       115962
       115962
       +
             sources."form-data-3.0.1"

     

       115963
       115963
       +
             sources."fs-extra-9.1.0"

     

       115964
       115964
       +
             sources."fs-minipass-2.1.0"

     

       115965
       115965
       +
             sources."fs.realpath-1.0.0"

     

       115966
       115966
       +
             sources."gauge-2.7.4"

     

       115967
       115967
       +
             sources."get-caller-file-2.0.5"

     

       115968
       115968
       +
             sources."glob-7.1.7"

     

       115969
       115969
       +
             sources."graceful-fs-4.2.6"

     

       115970
       115970
       +
             sources."has-unicode-2.0.1"

     

       115971
       115971
       +
             sources."html-encoding-sniffer-2.0.1"

     

       115972
       115972
       +
             sources."http-proxy-agent-4.0.1"

     

       115973
       115973
       +
             sources."https-proxy-agent-5.0.0"

     

       115974
       115974
       +
             sources."iconv-lite-0.4.24"

     

       115975
       115975
       +
             sources."inflight-1.0.6"

     

       115976
       115976
       +
             sources."inherits-2.0.4"

     

       115977
       115977
       +
             sources."is-fullwidth-code-point-1.0.0"

     

       115978
       115978
       +
             sources."is-potential-custom-element-name-1.0.1"

     

       115979
       115979
       +
             sources."isarray-1.0.0"

     

       115980
       115980
       +
             sources."jsdom-16.6.0"

     

       115981
       115981
       +
             sources."json5-2.2.0"

     

       115982
       115982
       +
             sources."jsonfile-6.1.0"

     

       115983
       115983
       +
             sources."levn-0.3.0"

     

       115984
       115984
       +
             sources."locate-path-5.0.0"

     

       115985
       115985
       +
             sources."lodash-4.17.21"

     

       115986
       115986
       +
             sources."logidrom-0.3.1"

     

       115987
       115987
       +
             sources."lru-cache-6.0.0"

     

       115988
       115988
       +
             (sources."make-dir-3.1.0" // {

     

       115989
       115989
       +
               dependencies = [

     

       115990
       115990
       +
                 sources."semver-6.3.0"

     

       115991
       115991
       +
               ];

     

       115992
       115992
       +
             })

     

       115993
       115993
       +
             sources."mime-db-1.47.0"

     

       115994
       115994
       +
             sources."mime-types-2.1.30"

     

       115995
       115995
       +
             sources."mimic-response-2.1.0"

     

       115996
       115996
       +
             sources."minimatch-3.0.4"

     

       115997
       115997
       +
             sources."minimist-1.2.5"

     

       115998
       115998
       +
             sources."minipass-3.1.3"

     

       115999
       115999
       +
             sources."minizlib-2.1.2"

     

       116000
       116000
       +
             sources."mkdirp-1.0.4"

     

       116001
       116001
       +
             sources."ms-2.1.2"

     

       116002
       116002
       +
             sources."nan-2.14.2"

     

       116003
       116003
       +
             sources."node-fetch-2.6.1"

     

       116004
       116004
       +
             sources."nopt-5.0.0"

     

       116005
       116005
       +
             sources."npmlog-4.1.2"

     

       116006
       116006
       +
             sources."number-is-nan-1.0.1"

     

       116007
       116007
       +
             sources."nwsapi-2.2.0"

     

       116008
       116008
       +
             sources."object-assign-4.1.1"

     

       116009
       116009
       +
             sources."once-1.4.0"

     

       116010
       116010
       +
             sources."onml-2.1.0"

     

       116011
       116011
       +
             sources."optionator-0.8.3"

     

       116012
       116012
       +
             sources."p-limit-2.3.0"

     

       116013
       116013
       +
             sources."p-locate-4.1.0"

     

       116014
       116014
       +
             sources."p-try-2.2.0"

     

       116015
       116015
       +
             sources."parse5-6.0.1"

     

       116016
       116016
       +
             sources."path-exists-4.0.0"

     

       116017
       116017
       +
             sources."path-is-absolute-1.0.1"

     

       116018
       116018
       +
             sources."performance-now-2.1.0"

     

       116019
       116019
       +
             sources."prelude-ls-1.1.2"

     

       116020
       116020
       +
             sources."process-nextick-args-2.0.1"

     

       116021
       116021
       +
             sources."psl-1.8.0"

     

       116022
       116022
       +
             sources."punycode-2.1.1"

     

       116023
       116023
       +
             sources."raf-3.4.1"

     

       116024
       116024
       +
             sources."readable-stream-2.3.7"

     

       116025
       116025
       +
             sources."regenerator-runtime-0.13.8"

     

       116026
       116026
       +
             sources."require-directory-2.1.1"

     

       116027
       116027
       +
             sources."require-main-filename-2.0.0"

     

       116028
       116028
       +
             sources."rgbcolor-1.0.1"

     

       116029
       116029
       +
             sources."rimraf-3.0.2"

     

       116030
       116030
       +
             sources."safe-buffer-5.1.2"

     

       116031
       116031
       +
             sources."safer-buffer-2.1.2"

     

       116032
       116032
       +
             sources."sax-1.2.4"

     

       116033
       116033
       +
             sources."saxes-5.0.1"

     

       116034
       116034
       +
             sources."semver-7.3.5"

     

       116035
       116035
       +
             sources."set-blocking-2.0.0"

     

       116036
       116036
       +
             sources."signal-exit-3.0.3"

     

       116037
       116037
       +
             sources."simple-concat-1.0.1"

     

       116038
       116038
       +
             sources."simple-get-3.1.0"

     

       116039
       116039
       +
             sources."source-map-0.6.1"

     

       116040
       116040
       +
             sources."stackblur-canvas-2.5.0"

     

       116041
       116041
       +
             sources."string-width-1.0.2"

     

       116042
       116042
       +
             sources."string_decoder-1.1.1"

     

       116043
       116043
       +
             sources."strip-ansi-3.0.1"

     

       116044
       116044
       +
             sources."svg-pathdata-5.0.5"

     

       116045
       116045
       +
             sources."svg2img-0.9.2"

     

       116046
       116046
       +
             sources."symbol-tree-3.2.4"

     

       116047
       116047
       +
             sources."tar-6.1.0"

     

       116048
       116048
       +
             (sources."tough-cookie-4.0.0" // {

     

       116049
       116049
       +
               dependencies = [

     

       116050
       116050
       +
                 sources."universalify-0.1.2"

     

       116051
       116051
       +
               ];

     

       116052
       116052
       +
             })

     

       116053
       116053
       +
             sources."tr46-2.1.0"

     

       116054
       116054
       +
             sources."tspan-0.4.0"

     

       116055
       116055
       +
             sources."type-check-0.3.2"

     

       116056
       116056
       +
             sources."universalify-2.0.0"

     

       116057
       116057
       +
             sources."util-deprecate-1.0.2"

     

       116058
       116058
       +
             sources."w3c-hr-time-1.0.2"

     

       116059
       116059
       +
             sources."w3c-xmlserializer-2.0.0"

     

       116060
       116060
       +
             sources."wavedrom-2.6.9"

     

       116061
       116061
       +
             sources."webidl-conversions-6.1.0"

     

       116062
       116062
       +
             sources."whatwg-encoding-1.0.5"

     

       116063
       116063
       +
             sources."whatwg-mimetype-2.3.0"

     

       116064
       116064
       +
             sources."whatwg-url-8.5.0"

     

       116065
       116065
       +
             sources."which-module-2.0.0"

     

       116066
       116066
       +
             sources."wide-align-1.1.3"

     

       116067
       116067
       +
             sources."word-wrap-1.2.3"

     

       116068
       116068
       +
             (sources."wrap-ansi-6.2.0" // {

     

       116069
       116069
       +
               dependencies = [

     

       116070
       116070
       +
                 sources."ansi-regex-5.0.0"

     

       116071
       116071
       +
                 sources."is-fullwidth-code-point-3.0.0"

     

       116072
       116072
       +
                 sources."string-width-4.2.2"

     

       116073
       116073
       +
                 sources."strip-ansi-6.0.0"

     

       116074
       116074
       +
               ];

     

       116075
       116075
       +
             })

     

       116076
       116076
       +
             sources."wrappy-1.0.2"

     

       116077
       116077
       +
             sources."ws-7.4.6"

     

       116078
       116078
       +
             sources."xml-name-validator-3.0.0"

     

       116079
       116079
       +
             sources."xmlchars-2.2.0"

     

       116080
       116080
       +
             sources."y18n-4.0.3"

     

       116081
       116081
       +
             sources."yallist-4.0.0"

     

       116082
       116082
       +
             (sources."yargs-16.2.0" // {

     

       116083
       116083
       +
               dependencies = [

     

       116084
       116084
       +
                 sources."ansi-regex-5.0.0"

     

       116085
       116085
       +
                 sources."cliui-7.0.4"

     

       116086
       116086
       +
                 sources."is-fullwidth-code-point-3.0.0"

     

       116087
       116087
       +
                 sources."string-width-4.2.2"

     

       116088
       116088
       +
                 sources."strip-ansi-6.0.0"

     

       116089
       116089
       +
                 sources."wrap-ansi-7.0.0"

     

       116090
       116090
       +
                 sources."y18n-5.0.8"

     

       116091
       116091
       +
                 sources."yargs-parser-20.2.7"

     

       116092
       116092
       +
               ];

     

       116093
       116093
       +
             })

     

       116094
       116094
       +
             sources."yargs-parser-18.1.3"

     

       116095
       116095
       +
           ];

     

       116096
       116096
       +
           buildInputs = globalBuildInputs;

     

       116097
       116097
       +
           meta = {

     

       116098
       116098
       +
             description = "WaveDrom command-line interface (CLI)";

     

       116099
       116099
       +
             homepage = "https://github.com/wavedrom/cli#readme";

     

       116100
       116100
       +
             license = "MIT";

     

       116101
       116101
       +
           };

     

       116102
       116102
       +
           production = true;

     

       116103
       116103
       +
           bypassCache = true;

     

       116104
       116104
       +
           reconstructLock = true;

     

       116105
       116105
       +
         };

     

       115649
       116106
        
         web-ext = nodeEnv.buildNodePackage {

     

       115650
       116107
        
           name = "web-ext";

     

       115651
       116108
        
           packageName = "web-ext";

     
···

       116268
       116725
        
             sources."@webassemblyjs/wast-printer-1.11.0"

     

       116269
       116726
        
             sources."@xtuc/ieee754-1.2.0"

     

       116270
       116727
        
             sources."@xtuc/long-4.2.2"

     

       116271
       116271
       -
             sources."acorn-8.2.4"

     

       116728
       116728
       +
             sources."acorn-8.3.0"

     

       116272
       116729
        
             sources."ajv-6.12.6"

     

       116273
       116730
        
             sources."ajv-keywords-3.5.2"

     

       116274
       116731
        
             sources."browserslist-4.16.6"

     

       116275
       116732
        
             sources."buffer-from-1.1.1"

     

       116276
       116276
       -
             sources."caniuse-lite-1.0.30001230"

     

       116733
       116733
       +
             sources."caniuse-lite-1.0.30001232"

     

       116277
       116734
        
             sources."chrome-trace-event-1.0.3"

     

       116278
       116735
        
             sources."colorette-1.2.2"

     

       116279
       116736
        
             sources."commander-2.20.3"

     

       116280
       116280
       -
             sources."electron-to-chromium-1.3.741"

     

       116737
       116737
       +
             sources."electron-to-chromium-1.3.743"

     

       116281
       116738
        
             sources."enhanced-resolve-5.8.2"

     

       116282
       116739
        
             sources."es-module-lexer-0.4.1"

     

       116283
       116740
        
             sources."escalade-3.1.1"

     
···

       116294
       116751
        
             sources."glob-to-regexp-0.4.1"

     

       116295
       116752
        
             sources."graceful-fs-4.2.6"

     

       116296
       116753
        
             sources."has-flag-4.0.0"

     

       116297
       116297
       -
             sources."jest-worker-26.6.2"

     

       116754
       116754
       +
             sources."jest-worker-27.0.2"

     

       116298
       116755
        
             sources."json-parse-better-errors-1.0.2"

     

       116299
       116756
        
             sources."json-schema-traverse-0.4.1"

     

       116300
       116757
        
             sources."loader-runner-4.2.0"

     
···

       116312
       116769
        
             sources."source-list-map-2.0.1"

     

       116313
       116770
        
             sources."source-map-0.6.1"

     

       116314
       116771
        
             sources."source-map-support-0.5.19"

     

       116315
       116315
       -
             sources."supports-color-7.2.0"

     

       116772
       116772
       +
             sources."supports-color-8.1.1"

     

       116316
       116773
        
             sources."tapable-2.2.0"

     

       116317
       116774
        
             (sources."terser-5.7.0" // {

     

       116318
       116775
        
               dependencies = [

     

       116319
       116776
        
                 sources."source-map-0.7.3"

     

       116320
       116777
        
               ];

     

       116321
       116778
        
             })

     

       116322
       116322
       -
             sources."terser-webpack-plugin-5.1.2"

     

       116779
       116779
       +
             sources."terser-webpack-plugin-5.1.3"

     

       116323
       116780
        
             sources."uri-js-4.4.1"

     

       116324
       116781
        
             sources."watchpack-2.2.0"

     

       116325
       116782
        
             sources."webpack-sources-2.3.0"

     
···

       116353
       116810
        
             sources."commander-7.2.0"

     

       116354
       116811
        
             sources."cross-spawn-7.0.3"

     

       116355
       116812
        
             sources."envinfo-7.8.1"

     

       116356
       116356
       -
             sources."execa-5.0.0"

     

       116813
       116813
       +
             sources."execa-5.0.1"

     

       116357
       116814
        
             sources."fastest-levenshtein-1.0.12"

     

       116358
       116815
        
             sources."find-up-4.1.0"

     

       116359
       116816
        
             sources."function-bind-1.1.1"

     
···

       116602
       117059
        
             sources."find-up-3.0.0"

     

       116603
       117060
        
             sources."follow-redirects-1.14.1"

     

       116604
       117061
        
             sources."for-in-1.0.2"

     

       116605
       116605
       -
             sources."forwarded-0.1.2"

     

       117062
       117062
       +
             sources."forwarded-0.2.0"

     

       116606
       117063
        
             sources."fragment-cache-0.2.1"

     

       116607
       117064
        
             sources."fresh-0.5.2"

     

       116608
       117065
        
             sources."fs.realpath-1.0.0"

     
···

       116763
       117220
        
             })

     

       116764
       117221
        
             sources."posix-character-classes-0.1.1"

     

       116765
       117222
        
             sources."process-nextick-args-2.0.1"

     

       116766
       116766
       -
             sources."proxy-addr-2.0.6"

     

       117223
       117223
       +
             sources."proxy-addr-2.0.7"

     

       116767
       117224
        
             sources."prr-1.0.1"

     

       116768
       117225
        
             sources."pump-3.0.0"

     

       116769
       117226
        
             sources."punycode-2.1.1"

     
···

       117051
       117508
        
         webtorrent-cli = nodeEnv.buildNodePackage {

     

       117052
       117509
        
           name = "webtorrent-cli";

     

       117053
       117510
        
           packageName = "webtorrent-cli";

     

       117054
       117054
       -
           version = "3.2.1";

     

       117511
       117511
       +
           version = "3.2.4";

     

       117055
       117512
        
           src = fetchurl {

     

       117056
       117056
       -
             url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.1.tgz";

     

       117057
       117057
       -
             sha512 = "DHUtDymD5ZGv/h35FY4n9YdlHoNOy07X7ibexi+19AL/+MFdGuIIQEEnJQT/wA05mrzR6ubeJmcLXXqZISwLFQ==";

     

       117513
       117513
       +
             url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.4.tgz";

     

       117514
       117514
       +
             sha512 = "fobRASGOskIqf/ciwZ3TF14RhqWga6dR8kUD6a2E0L2YAY5n1PIJv1dVPXEwvfKHBFWDo5VwIH2OAzt/Tw2poQ==";

     

       117058
       117515
        
           };

     

       117059
       117516
        
           dependencies = [

     

       117060
       117517
        
             sources."@protobufjs/aspromise-1.1.2"

     
···

       117150
       117607
        
             sources."create-torrent-4.7.0"

     

       117151
       117608
        
             sources."debug-2.6.9"

     

       117152
       117609
        
             sources."decompress-response-3.3.0"

     

       117610
       117610
       +
             sources."define-lazy-prop-2.0.0"

     

       117153
       117611
        
             (sources."dlnacasts-0.1.0" // {

     

       117154
       117612
        
               dependencies = [

     

       117155
       117613
        
                 sources."mime-1.6.0"

     
···

       117173
       117631
        
             })

     

       117174
       117632
        
             sources."fs.realpath-1.0.0"

     

       117175
       117633
        
             sources."get-browser-rtc-1.1.0"

     

       117176
       117176
       -
             sources."get-stdin-7.0.0"

     

       117634
       117634
       +
             sources."get-stdin-8.0.0"

     

       117177
       117635
        
             sources."glob-7.1.7"

     

       117178
       117636
        
             sources."he-1.2.0"

     

       117179
       117637
        
             sources."http-node-git://github.com/feross/http-node#webtorrent"

     
···

       117211
       117669
        
                 sources."ms-2.1.2"

     

       117212
       117670
        
               ];

     

       117213
       117671
        
             })

     

       117214
       117214
       -
             sources."magnet-uri-5.4.0"

     

       117672
       117672
       +
             sources."magnet-uri-6.2.0"

     

       117215
       117673
        
             sources."mdns-js-0.5.0"

     

       117216
       117674
        
             sources."mdns-js-packet-0.2.0"

     

       117217
       117675
        
             sources."mediasource-2.4.0"

     
···

       117240
       117698
        
             sources."nodebmc-0.0.7"

     

       117241
       117699
        
             sources."on-finished-2.3.0"

     

       117242
       117700
        
             sources."once-1.4.0"

     

       117243
       117243
       -
             sources."open-7.4.2"

     

       117701
       117701
       +
             sources."open-8.2.0"

     

       117244
       117702
        
             sources."package-json-versionify-1.0.4"

     

       117245
       117245
       -
             (sources."parse-torrent-7.1.3" // {

     

       117703
       117703
       +
             (sources."parse-torrent-9.1.3" // {

     

       117246
       117704
        
               dependencies = [

     

       117247
       117247
       -
                 sources."decompress-response-4.2.1"

     

       117248
       117248
       -
                 sources."mimic-response-2.1.0"

     

       117249
       117249
       -
                 sources."simple-get-3.1.0"

     

       117705
       117705
       +
                 sources."decompress-response-6.0.0"

     

       117706
       117706
       +
                 sources."mimic-response-3.1.0"

     

       117707
       117707
       +
                 sources."simple-get-4.0.0"

     

       117250
       117708
        
               ];

     

       117251
       117709
        
             })

     

       117252
       117710
        
             sources."path-is-absolute-1.0.1"

     
···

       117347
       117805
        
               dependencies = [

     

       117348
       117806
        
                 sources."debug-4.3.2"

     

       117349
       117807
        
                 sources."decompress-response-6.0.0"

     

       117350
       117350
       -
                 sources."get-stdin-8.0.0"

     

       117351
       117351
       -
                 sources."magnet-uri-6.2.0"

     

       117352
       117808
        
                 sources."mimic-response-3.1.0"

     

       117353
       117809
        
                 sources."ms-2.1.2"

     

       117354
       117354
       -
                 sources."parse-torrent-9.1.3"

     

       117355
       117810
        
                 sources."simple-get-4.0.0"

     

       117356
       117811
        
               ];

     

       117357
       117812
        
             })

     
···

       117592
       118047
        
                 sources."readable-stream-3.6.0"

     

       117593
       118048
        
               ];

     

       117594
       118049
        
             })

     

       117595
       117595
       -
             sources."boolean-3.0.4"

     

       118050
       118050
       +
             sources."boolean-3.1.0"

     

       117596
       118051
        
             (sources."boxen-1.3.0" // {

     

       117597
       118052
        
               dependencies = [

     

       117598
       118053
        
                 sources."camelcase-4.1.0"

     
···

       117650
       118105
        
             sources."config-chain-1.1.12"

     

       117651
       118106
        
             sources."configstore-3.1.5"

     

       117652
       118107
        
             sources."console-control-strings-1.1.0"

     

       117653
       117653
       -
             sources."core-js-3.13.0"

     

       118108
       118108
       +
             sources."core-js-3.13.1"

     

       117654
       118109
        
             sources."core-util-is-1.0.2"

     

       117655
       118110
        
             sources."create-error-class-3.0.2"

     

       117656
       118111
        
             sources."cross-spawn-6.0.5"

     
···

       118345
       118800
        
                 sources."cross-spawn-7.0.3"

     

       118346
       118801
        
                 sources."debug-4.3.2"

     

       118347
       118802
        
                 sources."escape-string-regexp-4.0.0"

     

       118348
       118348
       -
                 sources."execa-5.0.0"

     

       118803
       118803
       +
                 sources."execa-5.0.1"

     

       118349
       118804
        
                 (sources."figures-3.2.0" // {

     

       118350
       118805
        
                   dependencies = [

     

       118351
       118806
        
                     sources."escape-string-regexp-1.0.5"

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools-scm, six, isPy27 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "FormEncode";

     
···

       16
       16
        
           sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py

     

       17
       17
        
         '';

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
         propagatedBuildInputs = [ six ];

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ dnspython pycountry nose ];

+2 -2

pkgs/development/python-modules/acme-tiny/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse

     

       2
       2
        
       , openssl }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     
···

       17
       17
        
           substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ setuptools_scm ];

     

       20
       20
       +
         buildInputs = [ setuptools-scm ];

     

       21
       21
        
         checkInputs = [ fusepy fuse ];

     

       22
       22
        
       

     

       23
       23
        
         doCheck = false; # seems to hang, not sure

+2 -2

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

···

       2
       2
        
       , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens

     

       3
       3
        
       , brotli, fontmath, mutatormath, booleanoperations

     

       4
       4
        
       , ufoprocessor, ufonormalizer, psautohint, tqdm

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       32
       32
        
           })

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       35
       35
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       36
       36
        
       

     

       37
       37
        
         propagatedBuildInputs = [

     

       38
       38
        
           booleanoperations

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "ailment";

     

       10
       10
       -
         version = "9.0.7491";

     

       10
       10
       +
         version = "9.0.7833";

     

       11
       11
        
         disabled = pythonOlder "3.6";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "angr";

     

       15
       15
        
           repo = pname;

     

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

     

       17
       17
       -
           sha256 = "sha256-rxrj+5cz6zNsc+zgrOp8+/XY/RZG93PJQU59mMy5lDA=";

     

       17
       17
       +
           sha256 = "sha256-GUy1wETKV9Y9RYwJZqV22a0GrWkVRJRuFv/ADzPCzPg=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ pyvex ];

+8 -16

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , aiohttp

     

       3
       3
        
       , async-timeout

     

       4
       4
       +
       , backports-zoneinfo

     

       4
       5
        
       , buildPythonPackage

     

       5
       6
        
       , 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

     

       12
       12
       +
       , tzdata

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "aiopvpc";

     

       17
       17
       -
         version = "2.0.2";

     

       18
       18
       -
         disabled = pythonOlder "3.7";

     

       17
       17
       +
         version = "2.1.2";

     

       18
       18
       +
         disabled = pythonOlder "3.8";

     

       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";

     

       25
       25
       +
           sha256 = "0s8ki46dh39kw6qvsjcfcxa0gblyi33m3hry137kbi4lw5ws6qhr";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

     
···

       31
       31
        
       

     

       32
       32
        
         propagatedBuildInputs = [

     

       33
       33
        
           aiohttp

     

       34
       34
       -
           pytz

     

       34
       34
       +
           backports-zoneinfo

     

       35
       35
       +
           tzdata

     

       35
       36
        
           async-timeout

     

       36
       37
        
         ];

     

       37
       38
        
       

     
···

       41
       42
        
           pytestCheckHook

     

       42
       43
        
         ];

     

       43
       44
        
       

     

       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
       45
        
         postPatch = ''

     

       54
       54
       -
           substituteInPlace pytest.ini --replace \

     

       46
       46
       +
           substituteInPlace pyproject.toml --replace \

     

       55
       47
        
             " --cov --cov-report term --cov-report html" ""

     

       56
       48
        
         '';

     

       57
       49

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , docutils

     

       6
       6
        
       , pyparsing

     

       7
       7
        
       , pytestCheckHook

     
···

       16
       16
        
           sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
         propagatedBuildInputs = [

     

       21
       21
        
           docutils

     

       22
       22
        
           pyparsing

+2 -2

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

···

       42
       42
        
       

     

       43
       43
        
       buildPythonPackage rec {

     

       44
       44
        
         pname = "angr";

     

       45
       45
       -
         version = "9.0.7491";

     

       45
       45
       +
         version = "9.0.7833";

     

       46
       46
        
         disabled = pythonOlder "3.6";

     

       47
       47
        
       

     

       48
       48
        
         src = fetchFromGitHub {

     

       49
       49
        
           owner = pname;

     

       50
       50
        
           repo = pname;

     

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

     

       52
       52
       -
           sha256 = "sha256-d0EWPko3jWCexFNCWbofD6CjDIpjKb5mha2tRgtzL4M=";

     

       52
       52
       +
           sha256 = "sha256-1D1FhRhFHpQSQnMAPmp78TRIx9T5LL5MIdaYV/hPCv0=";

     

       53
       53
        
         };

     

       54
       54
        
       

     

       55
       55
        
         propagatedBuildInputs = [

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "angrop";

     

       12
       12
       -
         version = "9.0.7491";

     

       12
       12
       +
         version = "9.0.7833";

     

       13
       13
        
         disabled = pythonOlder "3.6";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "angr";

     

       17
       17
        
           repo = pname;

     

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

     

       19
       19
       -
           sha256 = "sha256-UWqHNgJ8vUbLK3n9tvwOgHyOyTXsqRJKaAPWQfqi3lo=";

     

       19
       19
       +
           sha256 = "sha256-JhD4/P5/IhmLBvmG3XoIEYVkowK+dDoLuwOdMhGi5q8=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools_scm, toml }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "ansi2html";

     
···

       11
       11
        
           sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       14
       14
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       15
       15
        
         propagatedBuildInputs = [ six setuptools ];

     

       16
       16
        
       

     

       17
       17
        
         preCheck = "export PATH=$PATH:$out/bin";

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, setuptools_scm, isPy3k }:

     

       2
       2
       +
       , pytest, setuptools-scm, isPy3k }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "apipkg";

     
···

       10
       10
        
           sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       13
       13
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       14
       14
        
         checkInputs = [ pytest ];

     

       15
       15
        
       

     

       16
       16
        
         # Fix pytest 4 support. See: https://github.com/pytest-dev/apipkg/issues/14

+2 -2

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

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "archinfo";

     

       10
       10
       -
         version = "9.0.7491";

     

       10
       10
       +
         version = "9.0.7833";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "angr";

     

       14
       14
        
           repo = pname;

     

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

     

       16
       16
       -
           sha256 = "sha256-5mKXpvMhdcIKgvQkmj//YigvsgozZofvv6CvMdW3BHo=";

     

       16
       16
       +
           sha256 = "sha256-wieg38cHxliHU7esoSOl5ViiS/uR5yVJh9l3SEsb3mo=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         checkInputs = [

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pyfiglet

     

       6
       6
        
       , pillow

     

       7
       7
        
       , wcwidth

     
···

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
       -
           setuptools_scm

     

       23
       23
       +
           setuptools-scm

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
       -
       , setuptools_scm

     

       3
       3
       +
       , setuptools-scm

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
        
       , isPy3k

     

       6
       6
        
       , cython

     
···

       25
       25
        
           sha256 = "2c194f8a429b8399de64a413a06881ea49f0525cabaa2d78fc132b9e970adc6a";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ setuptools_scm astropy-helpers astropy-extension-helpers cython jinja2 ];

     

       28
       28
       +
         nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ];

     

       29
       29
        
         propagatedBuildInputs = [ numpy pyerfa ];

     

       30
       30
        
         checkInputs = [ pytest pytest-astropy ];

     

       31
       31

+2 -2

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

···

       1
       1
        
       { lib, fetchPypi, fetchpatch, buildPythonPackage,

     

       2
       2
       -
         setuptools_scm, toml, six, astroid, pytest

     

       2
       2
       +
         setuptools-scm, toml, six, astroid, pytest

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       21
       21
        
           })

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ setuptools_scm toml six astroid ];

     

       24
       24
       +
         propagatedBuildInputs = [ setuptools-scm toml six astroid ];

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [ pytest ];

     

       27
       27

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi,

     

       2
       2
       -
         m2r, setuptools_scm, six, attrs }:

     

       2
       2
       +
         m2r, setuptools-scm, six, attrs }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         version = "20.2.0";

     
···

       10
       10
        
           sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         buildInputs = [ m2r setuptools_scm ];

     

       13
       13
       +
         buildInputs = [ m2r setuptools-scm ];

     

       14
       14
        
         propagatedBuildInputs = [ six attrs ];

     

       15
       15
        
       

     

       16
       16
        
         # Some tests require twisetd, but twisted requires Automat to build.

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , isPy3k

     

       6
       6
        
       , pytest

     

       7
       7
        
       , pytest-black

     
···

       18
       18
        
           sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ];

     

       24
       24
        
         # ironically, they fail a linting test, and pytest.ini forces that test suite

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , future

     

       6
       6
        
       , isPy3k

     

       7
       7
        
       , python

     
···

       18
       18
        
           sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         buildInputs = [ setuptools_scm ];

     

       21
       21
       +
         buildInputs = [ setuptools-scm ];

     

       22
       22
        
         checkInputs = [ hypothesis ];

     

       23
       23
        
         propagatedBuildInputs = [ future ];

     

       24
       24

+2 -2

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

···

       2
       2
        
       , python

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , backports_weakref

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       15
       15
        
           sha256 = "1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ setuptools_scm ];

     

       18
       18
       +
         buildInputs = [ setuptools-scm ];

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ backports_weakref ];

     

       21
       21

+2 -2

pkgs/development/python-modules/backports_unittest-mock/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, mock }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, mock }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "backports.unittest_mock";

     
···

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ mock ];

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ setuptools_scm ];

     

       14
       14
       +
         buildInputs = [ setuptools-scm ];

     

       15
       15
        
       

     

       16
       16
        
         # does not contain tests

     

       17
       17
        
         doCheck = false;

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       # , backports

     

       6
       6
        
       , python

     

       7
       7
        
       }:

     
···

       14
       14
        
           sha256 = "bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         buildInputs = [ setuptools_scm ];

     

       17
       17
       +
         buildInputs = [ setuptools-scm ];

     

       18
       18
        
       #   checkInputs = [ backports ];

     

       19
       19
        
       

     

       20
       20
        
         # Requires backports package

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools_scm

     

       2
       2
       +
       , setuptools-scm

     

       3
       3
        
       , sphinx

     

       4
       4
        
       , hypothesis

     

       5
       5
        
       , py

     
···

       20
       20
        
           sha256 = "4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       23
       23
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       24
       24
        
         propagatedBuildInputs = [ sphinx ];

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [

+2 -2

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

···

       1
       1
        
       { stdenv, lib

     

       2
       2
       -
       , buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm, pytestCheckHook

     

       2
       2
       +
       , buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook

     

       3
       3
        
       , aiohttp

     

       4
       4
        
       , aiohttp-cors

     

       5
       5
        
       , appdirs

     
···

       25
       25
        
           sha256 = "1cdkrl5vw26iy7s23v2zpr39m6g5xsgxhfhagzzflgfbvdc56s93";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       28
       28
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       29
       29
        
       

     

       30
       30
        
         # Necessary for the tests to pass on Darwin with sandbox enabled.

     

       31
       31
        
         # Black starts a local server and needs to bind a local address.

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
        
       , fonttools, fs, pyclipper, defcon, fontpens

     

       3
       3
       -
       , setuptools_scm, pytest

     

       3
       3
       +
       , setuptools-scm, pytest

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     
···

       13
       13
        
           extension = "zip";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [

     

       19
       19
        
           fonttools

+2 -2

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

···

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       , pytest-cov

     

       7
       7
       -
       , setuptools_scm

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     
···

       16
       16
        
           sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [

     

       22
       22
        
           pytest-cov

+2 -2

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

···

       14
       14
        
       , requests

     

       15
       15
        
       , requests-toolbelt

     

       16
       16
        
       , requests-unixsocket

     

       17
       17
       -
       , setuptools_scm

     

       17
       17
       +
       , setuptools-scm

     

       18
       18
        
       , setuptools-scm-git-archive

     

       19
       19
        
       , six

     

       20
       20
        
       , trustme

     
···

       31
       31
        
           sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
       -
         nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];

     

       34
       34
       +
         nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ];

     

       35
       35
        
       

     

       36
       36
        
         propagatedBuildInputs = [

     

       37
       37
        
           # install_requires

+2 -2

pkgs/development/python-modules/cherrypy/17.nix

···

       1
       1
        
       { lib, stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools_scm

     

       2
       2
       +
       , setuptools-scm

     

       3
       3
        
       , cheroot, contextlib2, portend, routes, six, zc_lockfile

     

       4
       4
        
       , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt

     

       5
       5
        
       }:

     
···

       18
       18
        
           cheroot contextlib2 portend routes six zc_lockfile

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [

     

       24
       24
        
           backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt

+2 -2

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

···

       1
       1
        
       { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
       -
       , setuptools_scm

     

       2
       2
       +
       , setuptools-scm

     

       3
       3
        
       , cheroot, portend, more-itertools, zc_lockfile, routes

     

       4
       4
        
       , jaraco_collections

     

       5
       5
        
       , objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services

     
···

       36
       36
        
           })

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       39
       39
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       40
       40
        
       

     

       41
       41
        
         propagatedBuildInputs = [

     

       42
       42
        
           # required

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "claripy";

     

       16
       16
       -
         version = "9.0.7491";

     

       16
       16
       +
         version = "9.0.7833";

     

       17
       17
        
         disabled = pythonOlder "3.6";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "angr";

     

       21
       21
        
           repo = pname;

     

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

     

       23
       23
       -
           sha256 = "sha256-M6Irec8p4l2WNrVeqUob3m2xF3JMtdp7I+LSi0iArZk=";

     

       23
       23
       +
           sha256 = "sha256-C+YjpnMpz96v9QUkcdlhGl83V4UHnWAKZV2eR+vZX3c=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         # Use upstream z3 implementation

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
        
         # The binaries are following the argr projects release cycle

     

       18
       18
       -
         version = "9.0.7491";

     

       18
       18
       +
         version = "9.0.7833";

     

       19
       19
        
       

     

       20
       20
        
         # Binary files from https://github.com/angr/binaries (only used for testing and only here)

     

       21
       21
        
         binaries = fetchFromGitHub {

     
···

       35
       35
        
           owner = "angr";

     

       36
       36
        
           repo = pname;

     

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

     

       38
       38
       -
           sha256 = "sha256-P126IcUpq7b8u74YJFBXluGIIru+UOCnmHYmJBiK9Pc=";

     

       38
       38
       +
           sha256 = "sha256-P8bz50OgJifGWbWRyGXEB3FRfJHG1m9RgMatKA/XQLc=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         propagatedBuildInputs = [

+1 -1

pkgs/development/python-modules/clvm-tools/default.nix

···

       39
       39
        
           "test_cmd_unknown-1_txt"

     

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
       -
         # give a hint to setuptools_scm on package version

     

       42
       42
       +
         # give a hint to setuptools-scm on package version

     

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

     

       44
       44
        
       

     

       45
       45
        
         meta = with lib; {

+1 -1

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

···

       23
       23
        
           setuptools-scm

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         # give a hint to setuptools_scm on package version

     

       26
       26
       +
         # give a hint to setuptools-scm on package version

     

       27
       27
        
         SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
        
       { lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k

     

       2
       2
        
       , pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs

     

       3
       3
       -
       , contextlib2 ? null, typing ? null, setuptools_scm

     

       3
       3
       +
       , contextlib2 ? null, typing ? null, setuptools-scm

     

       4
       4
        
       , pytest, mock ? null, pytest-mock

     

       5
       5
        
       , which, glibcLocales

     

       6
       6
        
       }:

     
···

       27
       27
        
         disabled = !isPy3k;

     

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
       -
           setuptools_scm

     

       30
       30
       +
           setuptools-scm

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/configparser/4.nix

···

       1
       1
       -
       { lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm }:

     

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "configparser";

     
···

       12
       12
        
         # No tests available

     

       13
       13
        
         doCheck = false;

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
       

     

       17
       17
        
         preConfigure = ''

     

       18
       18
        
           export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8

+2 -2

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

···

       1
       1
       -
       { lib, stdenv, buildPythonPackage, fetchPypi, setuptools_scm

     

       1
       1
       +
       { lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm

     

       2
       2
        
       , toml

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       14
       14
        
         # No tests available

     

       15
       15
        
         doCheck = false;

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

     

       20
       20
        
           export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8

+2 -2

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

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , pytestrunner

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       , isort

     

       8
       8
        
       , mpmath

     

       9
       9
        
       , strategies

     
···

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
        
           isort

     

       24
       24
        
           pytestrunner

     

       25
       25
       -
           setuptools_scm

     

       25
       25
       +
           setuptools-scm

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/django-configurations/default.nix

···

       9
       9
        
       , django-cache-url

     

       10
       10
        
       , six

     

       11
       11
        
       , django

     

       12
       12
       -
       , setuptools_scm

     

       12
       12
       +
       , setuptools-scm

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     
···

       21
       21
        
           sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         buildInputs = [ setuptools_scm ];

     

       24
       24
       +
         buildInputs = [ setuptools-scm ];

     

       25
       25
        
         propagatedBuildInputs = [ six ];

     

       26
       26
        
         checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ];

     

       27
       27

+2 -2

pkgs/development/python-modules/django-haystack/default.nix

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools, setuptools_scm, django, dateutil, whoosh, pysolr

     

       2
       2
       +
       , setuptools, setuptools-scm, django, dateutil, whoosh, pysolr

     

       3
       3
        
       , coverage, mock, nose, geopy, requests }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       13
       13
        
       

     

       14
       14
        
         checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ];

     

       15
       15
        
         propagatedBuildInputs = [ django setuptools ];

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         postPatch = ''

     

       19
       19
        
           sed -i 's/geopy==/geopy>=/' setup.py

+2 -2

pkgs/development/python-modules/dotty-dict/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       13
       13
        
           sha256 = "sha256-6wA1o2KezYQ5emjx9C8elKvRw0V3oZzT6srTMe58uvA=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         doCheck = false;

     

       19
       19

+2 -2

pkgs/development/python-modules/drf-yasg/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , inflection

     

       5
       5
        
       , ruamel_yaml

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       , six

     

       8
       8
        
       , coreapi

     

       9
       9
        
       , djangorestframework

     
···

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
       -
           setuptools_scm

     

       30
       30
       +
           setuptools-scm

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

+2 -2

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

···

       4
       4
        
       , numpy

     

       5
       5
        
       , pandas

     

       6
       6
        
       , pybind11

     

       7
       7
       -
       , setuptools_scm

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
        
       , pytestrunner

     

       9
       9
        
       , pytestCheckHook

     

       10
       10
        
       }:

     
···

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

     

       29
       29
        
           pybind11

     

       30
       30
       -
           setuptools_scm

     

       30
       30
       +
           setuptools-scm

     

       31
       31
        
           pytestrunner

     

       32
       32
        
         ];

     

       33
       33

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, python

     

       2
       2
        
       , fonttools, lxml, fs, unicodedata2

     

       3
       3
        
       , defcon, fontpens, fontmath, booleanoperations

     

       4
       4
       -
       , pytest, setuptools_scm

     

       4
       4
       +
       , pytest, setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       14
       14
        
           extension = "zip";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

     

       20
       20
        
           booleanoperations

+2 -2

pkgs/development/python-modules/freetype-py/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools_scm, freetype }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "freetype-py";

     
···

       16
       16
        
           })

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ freetype ];

     

       22
       22

+2 -2

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , sqlalchemy

     

       5
       5
        
       , shapely

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       , pytest

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       16
       16
        
           sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
         propagatedBuildInputs = [ sqlalchemy shapely ];

     

       21
       21
        
       

     

       22
       22
        
         # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst

+2 -2

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

···

       1
       1
       -
       { lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools_scm, cython, pytest }:

     

       1
       1
       +
       { lib, fetchurl, buildPythonPackage, numpy, scikit-learn, setuptools-scm, cython, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "hmmlearn";

     
···

       9
       9
        
           sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         buildInputs = [ setuptools_scm cython ];

     

       12
       12
       +
         buildInputs = [ setuptools-scm cython ];

     

       13
       13
        
         propagatedBuildInputs = [ numpy scikit-learn ];

     

       14
       14
        
         checkInputs = [ pytest ];

     

       15
       15

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , setuptools

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       , freezegun

     
···

       18
       18
        
           sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       22
        
         propagatedBuildInputs = [ setuptools ];

     

       23
       23
        
         checkInputs = [ pytestCheckHook freezegun ];

     

       24
       24

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , toml

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       }:

     
···

       17
       17
        
           sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [ pytestCheckHook ];

     

       23
       23

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
        
       , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools

     

       3
       3
       -
       , setuptools_scm, jaraco_collections, importlib-metadata, toml

     

       3
       3
       +
       , setuptools-scm, jaraco_collections, importlib-metadata, toml

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     
···

       18
       18
        
       

     

       19
       19
        
         pythonImportsCheck = [ "irc" ];

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       22
        
         propagatedBuildInputs = [

     

       23
       23
        
           six

     

       24
       24
        
           importlib-metadata

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, isPy27

     

       2
       2
       -
       , setuptools_scm, toml

     

       2
       2
       +
       , setuptools-scm, toml

     

       3
       3
        
       , more-itertools

     

       4
       4
        
       , pytestCheckHook

     

       5
       5
        
       }:

     
···

       20
       20
        
       

     

       21
       21
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       23
       23
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       24
       24
        
       

     

       25
       25
        
         propagatedBuildInputs = [ more-itertools ];

     

       26
       26

+2 -2

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

···

       1
       1
       -
       { buildPythonPackage, fetchPypi, setuptools_scm

     

       1
       1
       +
       { buildPythonPackage, fetchPypi, setuptools-scm

     

       2
       2
        
       , six, jaraco_classes, jaraco_text

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       13
       13
        
         pythonNamespaces = [ "jaraco" ];

     

       14
       14
        
       

     

       15
       15
        
         doCheck = false;

     

       16
       16
       -
         buildInputs = [ setuptools_scm ];

     

       16
       16
       +
         buildInputs = [ setuptools-scm ];

     

       17
       17
        
         propagatedBuildInputs = [ six jaraco_classes jaraco_text ];

     

       18
       18
        
       

     

       19
       19
        
         # break dependency cycle

+2 -2

pkgs/development/python-modules/jaraco_functools/2.nix

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools_scm

     

       2
       2
       +
       , setuptools-scm

     

       3
       3
        
       , more-itertools, backports_functools_lru_cache }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ setuptools_scm ];

     

       18
       18
       +
         buildInputs = [ setuptools-scm ];

     

       19
       19
        
       

     

       20
       20
        
         meta = with lib; {

     

       21
       21
        
           description = "Additional functools in the spirit of stdlib's functools";

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools_scm, toml

     

       2
       2
       +
       , setuptools-scm, toml

     

       3
       3
        
       , more-itertools, backports_functools_lru_cache }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       11
       11
        
           sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       14
       14
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       15
       15
        
       

     

       16
       16
        
         propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ];

     

       17
       17

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm

     

       2
       2
        
       , inflect, more-itertools, six, pytest

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       13
       13
        
       

     

       14
       14
        
         pythonNamespaces = [ "jaraco" ];

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         propagatedBuildInputs = [ inflect more-itertools six ];

     

       19
       19
        
         checkInputs = [ pytest ];

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm

     

       2
       2
        
       , tempora, six

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       13
       13
        
       

     

       14
       14
        
         pythonNamespaces = [ "jaraco" ];

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
         propagatedBuildInputs = [ tempora six ];

     

       18
       18
        
       

     

       19
       19
        
         # test no longer packaged with pypi

+2 -2

pkgs/development/python-modules/jaraco_stream/2.nix

···

       1
       1
       -
       { buildPythonPackage, fetchPypi, setuptools_scm, six }:

     

       1
       1
       +
       { buildPythonPackage, fetchPypi, setuptools-scm, six }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "jaraco.stream";

     
···

       8
       8
        
           sha256 = "196synw4g76yagcflmavi7wakf5cdgsflmvbj7zs616gv03xbsf2";

     

       9
       9
        
         };

     

       10
       10
        
         doCheck = false;

     

       11
       11
       -
         buildInputs = [ setuptools_scm ];

     

       11
       11
       +
         buildInputs = [ setuptools-scm ];

     

       12
       12
        
         propagatedBuildInputs = [ six ];

     

       13
       13
        
       }

+2 -2

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

···

       1
       1
       -
       { buildPythonPackage, fetchPypi, setuptools_scm, six }:

     

       1
       1
       +
       { buildPythonPackage, fetchPypi, setuptools-scm, six }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "jaraco.stream";

     
···

       12
       12
        
         pythonNamespaces = [ "jaraco" ];

     

       13
       13
        
       

     

       14
       14
        
         doCheck = false;

     

       15
       15
       -
         buildInputs = [ setuptools_scm ];

     

       15
       15
       +
         buildInputs = [ setuptools-scm ];

     

       16
       16
        
         propagatedBuildInputs = [ six ];

     

       17
       17
        
       }

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, pythonOlder

     

       2
       2
        
       , importlib-resources

     

       3
       3
        
       , jaraco_functools

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       15
       15
        
       

     

       16
       16
        
         pythonNamespaces = [ "jaraco" ];

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs =[ setuptools_scm ];

     

       18
       18
       +
         nativeBuildInputs =[ setuptools-scm ];

     

       19
       19
        
         propagatedBuildInputs = [

     

       20
       20
        
           jaraco_functools

     

       21
       21
        
         ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ];

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pytest

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , toml

     

       7
       7
        
       , importlib-metadata

     

       8
       8
        
       }:

     
···

       19
       19
        
         checkInputs = [ pytest ];

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

     

       22
       22
       -
           setuptools_scm

     

       22
       22
       +
           setuptools-scm

     

       23
       23
        
           toml

     

       24
       24
        
         ];

     

       25
       25

+2 -2

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

···

       6
       6
        
       , nose

     

       7
       7
        
       , pyperf

     

       8
       8
        
       , pyrsistent

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       , twisted

     

       11
       11
        
       , vcversioner

     

       12
       12
        
       }:

     
···

       20
       20
        
           sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       23
       23
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       24
       24
        
         propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ];

     

       25
       25
        
         checkInputs = [ nose mock pyperf twisted vcversioner ];

     

       26
       26

+2 -2

pkgs/development/python-modules/keyring/2.nix

···

       1
       1
        
       { lib, stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , dbus-python, setuptools_scm, entrypoints, secretstorage

     

       2
       2
       +
       , dbus-python, setuptools-scm, entrypoints, secretstorage

     

       3
       3
        
       , pytest, pytest-flake8 }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       11
       11
        
           sha256 = "0f58jq58jhfzlhix7x2zz7c4ycdvcs1z3sgs4lkr4xxx680wrmk7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       14
       14
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       15
       15
        
       

     

       16
       16
        
         checkInputs = [ pytest pytest-flake8 ];

     

       17
       17

+2 -2

pkgs/development/python-modules/keyrings-alt/default.nix

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six

     

       2
       2
       -
       , pytest, backports_unittest-mock, keyring, setuptools_scm, toml

     

       2
       2
       +
       , pytest, backports_unittest-mock, keyring, setuptools-scm, toml

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       17
       17
        
             --replace "--flake8" ""

     

       18
       18
        
         '';

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       21
       21
        
         propagatedBuildInputs = [ six ];

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock;

+2 -2

pkgs/development/python-modules/lazy-object-proxy/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pytestCheckHook

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     
···

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [

     

       18
       18
       -
           setuptools_scm

     

       18
       18
       +
           setuptools-scm

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         postPatch = ''

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       13
       13
        
           sha256 = "sha256-2qNQpILtWLVyREPGUUMhkem5ewyDdDh50JExccaigIU=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         # Disabling tests for now due to various (transitive) dependencies on modules

     

       19
       19
        
         # from @smarie which are, as of yet, not part of nixpkgs. Also introduces

+2 -2

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

···

       7
       7
        
       , pytest

     

       8
       8
        
       , pytestrunner

     

       9
       9
        
       , hypothesis

     

       10
       10
       -
       , setuptools_scm

     

       10
       10
       +
       , setuptools-scm

     

       11
       11
        
       , isPy27

     

       12
       12
        
       }:

     

       13
       13
        
       

     
···

       36
       36
        
              --replace "pytest>=3.0,<4.0" "pytest"

     

       37
       37
        
         '';

     

       38
       38
        
       

     

       39
       39
       -
         buildInputs = [ setuptools_scm pytestrunner ];

     

       39
       39
       +
         buildInputs = [ setuptools-scm pytestrunner ];

     

       40
       40
        
         checkInputs = [ pytest hypothesis ];

     

       41
       41
        
         propagatedBuildInputs = [ hopcroftkarp multiset ];

     

       42
       42

+2 -2

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

···

       1
       1
        
       { lib, fetchFromGitHub, buildPythonPackage, isPy3k

     

       2
       2
       -
       , sympy, pytest, pytestrunner, sphinx, setuptools_scm }:

     

       2
       2
       +
       , sympy, pytest, pytestrunner, sphinx, setuptools-scm }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "measurement";

     
···

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [ pytest pytestrunner ];

     

       22
       22
       -
         nativeBuildInputs = [ sphinx setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ sphinx setuptools-scm ];

     

       23
       23
        
         propagatedBuildInputs = [ sympy ];

     

       24
       24
        
       

     

       25
       25
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/mecab-python3/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , mecab

     

       5
       5
        
       , swig

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
        
           mecab # for mecab-config

     

       20
       20
        
           swig

     

       21
       21
       -
           setuptools_scm

     

       21
       21
       +
           setuptools-scm

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ mecab ];

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytestrunner

     

       6
       6
        
       , pytest

     

       7
       7
        
       }:

     
···

       15
       15
        
           sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ setuptools_scm pytestrunner ];

     

       18
       18
       +
         buildInputs = [ setuptools-scm pytestrunner ];

     

       19
       19
        
         checkInputs = [ pytest ];

     

       20
       20
        
       

     

       21
       21
        
         meta = with lib; {

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
        
       , hypothesis

     

       3
       3
       -
       , setuptools_scm

     

       3
       3
       +
       , setuptools-scm

     

       4
       4
        
       , six

     

       5
       5
        
       , attrs

     

       6
       6
        
       , py

     
···

       52
       52
        
           "test_merge"

     

       53
       53
        
         ];

     

       54
       54
        
       

     

       55
       55
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       55
       55
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       56
       56
        
       

     

       57
       57
        
         propagatedBuildInputs = [

     

       58
       58
        
           attrs

+2 -2

pkgs/development/python-modules/nmigen-boards/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , nmigen

     

       5
       5
        
       , setuptools

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       19
       19
        
           sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       23
       23
        
         propagatedBuildInputs = [ setuptools nmigen ];

     

       24
       24
        
       

     

       25
       25
        
         preBuild = ''

+2 -2

pkgs/development/python-modules/nmigen-soc/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , nmigen

     

       5
       5
        
       , setuptools

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       19
       19
        
           sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       23
       23
        
         propagatedBuildInputs = [ setuptools nmigen ];

     

       24
       24
        
       

     

       25
       25
        
         preBuild = ''

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , cython

     

       7
       7
        
       , numpy

     

       8
       8
        
       , msgpack

     
···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
       -
           setuptools_scm

     

       25
       25
       +
           setuptools-scm

     

       26
       26
        
           cython

     

       27
       27
        
           gcc8

     

       28
       28
        
         ];

+2 -2

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

···

       4
       4
        
       , tqdm

     

       5
       5
        
       , aiohttp

     

       6
       6
        
       , pytest

     

       7
       7
       -
       , setuptools_scm

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
        
       , pytest-localserver

     

       9
       9
        
       , pytest-socket

     

       10
       10
        
       , pytest-asyncio

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

     

       24
       24
       -
           setuptools_scm

     

       24
       24
       +
           setuptools-scm

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/path.py/2.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytest

     

       6
       6
        
       , pytest-flake8

     

       7
       7
        
       , glibcLocales

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytest pytest-flake8 glibcLocales packaging ];

     

       24
       24
       -
         buildInputs = [ setuptools_scm ];

     

       24
       24
       +
         buildInputs = [ setuptools-scm ];

     

       25
       25
        
         propagatedBuildInputs = [

     

       26
       26
        
           importlib-metadata

     

       27
       27
        
         ] ++ lib.optional isPy27 backports_os

+2 -2

pkgs/development/python-modules/path.py/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       , pytest-flake8

     

       7
       7
        
       , glibcLocales

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         checkInputs = [ pytestCheckHook pytest-flake8 glibcLocales packaging ];

     

       24
       24
       -
         buildInputs = [ setuptools_scm ];

     

       24
       24
       +
         buildInputs = [ setuptools-scm ];

     

       25
       25
        
         propagatedBuildInputs = [

     

       26
       26
        
           importlib-metadata

     

       27
       27
        
         ];

+2 -2

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

···

       3
       3
        
       , Mako

     

       4
       4
        
       , markdown

     

       5
       5
        
       , setuptools-git

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       16
       16
        
           sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools-git setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-git setuptools-scm ];

     

       20
       20
        
         propagatedBuildInputs = [ Mako markdown ];

     

       21
       21
        
       

     

       22
       22
        
         meta = with lib; {

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pythonOlder

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , importlib-metadata

     

       7
       7
        
       , packaging

     

       8
       8
        
       # Check Inputs

     
···

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.6";

     

       26
       26
        
       

     

       27
       27
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       27
       27
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [ packaging ]

     

       30
       30
        
           ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

+2 -2

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

···

       1
       1
        
       { buildPythonPackage

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , importlib-metadata

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       21
       21
        
         # To prevent infinite recursion with pytest

     

       22
       22
        
         doCheck = false;

     

       23
       23
        
       

     

       24
       24
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       24
       24
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [ importlib-metadata ];

     

       27
       27

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, setuptools_scm, tempora, pytest-black, pytestcov }:

     

       2
       2
       +
       , pytest, setuptools-scm, tempora, pytest-black, pytestcov }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "portend";

     
···

       14
       14
        
           substituteInPlace pytest.ini --replace "--flake8" ""

     

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [ tempora ];

     

       20
       20

+2 -2

pkgs/development/python-modules/prettytable/1.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , glibcLocales

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , wcwidth

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       15
       15
        
           sha256 = "0wcpp1nkicrswb353yn6xd2x535cpif62nw5rgz33c1wj0wzbdvb";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       18
       18
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       19
       19
        
         buildInputs = [ glibcLocales ];

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ wcwidth ];

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , glibcLocales

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , wcwidth

     

       7
       7
        
       , importlib-metadata

     

       8
       8
        
       , pythonOlder

     
···

       17
       17
        
           sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       21
       21
        
         buildInputs = [ glibcLocales ];

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       2
       2
        
       , fonttools

     

       3
       3
        
       , lxml, fs # for fonttools extras

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytestCheckHook, pytestcov, pytest_xdist

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       25
       25
        
           sed -i '/setup(/a \     version="${version}",' setup.py

     

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       28
       28
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [ fonttools lxml fs ];

     

       31
       31

+2 -2

pkgs/development/python-modules/pure-eval/default.nix

···

       1
       1
       -
       { buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools_scm, toml, pytest }:

     

       1
       1
       +
       { buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pure_eval";

     
···

       15
       15
        
       

     

       16
       16
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ setuptools_scm ];

     

       18
       18
       +
         buildInputs = [ setuptools-scm ];

     

       19
       19
        
         propagatedBuildInputs = [ toml ];

     

       20
       20
        
       

     

       21
       21
        
         checkInputs = [ pytest ];

+2 -2

pkgs/development/python-modules/py-air-control-exporter/default.nix

···

       1
       1
        
       { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests

     

       2
       2
        
       , prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner

     

       3
       3
       -
       , setuptools_scm }:

     

       3
       3
       +
       , setuptools-scm }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "py-air-control-exporter";

     
···

       12
       12
        
           sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
         checkInputs = [ pytestCheckHook pytestcov pytestrunner ];

     

       17
       17
        
         propagatedBuildInputs = [ flask prometheus_client py-air-control ];

     

       18
       18

+2 -2

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

···

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

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "py";

     
···

       12
       12
        
         # Circular dependency on pytest

     

       13
       13
        
         doCheck = false;

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
       

     

       17
       17
        
         pythonImportsCheck = [

     

       18
       18
        
           "py"

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:

     

       1
       1
       +
       { lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         _arrow-cpp = arrow-cpp.override { python3 = python; };

     
···

       12
       12
        
       

     

       13
       13
        
         sourceRoot = "apache-arrow-${version}/python";

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ];

     

       16
       16
        
         propagatedBuildInputs = [ numpy six ];

     

       17
       17
        
         checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];

     

       18
       18

+2 -2

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

···

       1
       1
       -
       { lib, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }:

     

       1
       1
       +
       { lib, fetchPypi, buildPythonPackage, isPy3k, setuptools-scm, pygccxml }:

     

       2
       2
        
       buildPythonPackage rec {

     

       3
       3
        
         pname = "PyBindGen";

     

       4
       4
        
         version = "0.21.0";

     
···

       8
       8
        
           sha256 = "4501aa3954fdac7bb4c049894f8aa1f0f4e1c1f50cc2303feef9bbe3aecfe364";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ setuptools_scm ];

     

       11
       11
       +
         buildInputs = [ setuptools-scm ];

     

       12
       12
        
       

     

       13
       13
        
         checkInputs = [ pygccxml ];

     

       14
       14
        
         doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchPypi

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , cython

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
       -
           setuptools_scm

     

       19
       19
       +
           setuptools-scm

     

       20
       20
        
           cython

     

       21
       21
        
         ];

     

       22
       22

+2 -2

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

···

       1
       1
        
       { lib, stdenv, fetchPypi, buildPythonPackage

     

       2
       2
        
       , libmediainfo

     

       3
       3
       -
       , setuptools_scm

     

       3
       3
       +
       , setuptools-scm

     

       4
       4
        
       , pytest, glibcLocales }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     
···

       22
       22
        
                       "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0"

     

       23
       23
        
         '';

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       25
       25
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       26
       26
        
       

     

       27
       27
        
         checkInputs = [ glibcLocales pytest ];

     

       28
       28

+2 -2

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

···

       1
       1
       -
       { lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm,

     

       1
       1
       +
       { lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm,

     

       2
       2
        
       setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll,

     

       3
       3
        
       pytest, tox }:

     

       4
       4
        
       

     
···

       23
       23
        
         })

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = [ setuptools_scm setuptools-scm-git-archive ];

     

       26
       26
       +
         buildInputs = [ setuptools-scm setuptools-scm-git-archive ];

     

       27
       27
        
         propagatedBuildInputs = [ pillow ];

     

       28
       28
        
         checkInputs = [ pytest tox ];

     

       29
       29
        
         checkPhase = "pytest";

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, requests, mock }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, requests, mock }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pysolr";

     
···

       9
       9
        
           sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       12
       12
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       13
       13
        
       

     

       14
       14
        
         propagatedBuildInputs = [ requests ];

     

       15
       15

+2 -2

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

···

       9
       9
        
       , pytest-remotedata

     

       10
       10
        
       , pytest-openfiles

     

       11
       11
        
       , pytest-arraydiff

     

       12
       12
       -
       , setuptools_scm

     

       12
       12
       +
       , setuptools-scm

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     
···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
       -
           setuptools_scm

     

       25
       25
       +
           setuptools-scm

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         buildInputs = [ pytest ];

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
        
       , black

     

       3
       3
        
       , pytest

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , toml

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       14
       14
        
           sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ pytest ];

     

       20
       20

+2 -1

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pytest, setuptools_scm }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-celery";

     
···

       17
       17
        
           description = "pytest plugin for unittest subTest() support and subtests fixture";

     

       18
       18
        
           homepage = "https://github.com/pytest-dev/pytest-subtests";

     

       19
       19
        
           license = licenses.mit;

     

       20
       20
       +
           maintainers = [ ];

     

       20
       21
        
         };

     

       21
       22
        
       }

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchFromGitHub

     

       2
       2
       -
       , setuptools_scm, pytest, cmake

     

       2
       2
       +
       , setuptools-scm, pytest, cmake

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     
···

       14
       14
        
           sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         preBuild = ''

     

       20
       20
        
           export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"

+2 -2

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pytest

     

       5
       5
        
       , django

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       , django-configurations

     

       8
       8
        
       , pytest_xdist

     

       9
       9
        
       , six

     
···

       17
       17
        
           sha256 = "26f02c16d36fd4c8672390deebe3413678d89f30720c16efb8b2a6bf63b9041f";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ pytest setuptools_scm ];

     

       20
       20
       +
         nativeBuildInputs = [ pytest setuptools-scm ];

     

       21
       21
        
         checkInputs = [ pytest django-configurations pytest_xdist six ];

     

       22
       22
        
         propagatedBuildInputs = [ django ];

     

       23
       23

+2 -2

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

···

       6
       6
        
       , pytest

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
        
       , numpy

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     
···

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
       -
           setuptools_scm

     

       23
       23
       +
           setuptools-scm

     

       24
       24
        
         ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
        
           pytest

+2 -2

pkgs/development/python-modules/pytest-filter-subpackage/default.nix

···

       5
       5
        
       , pytestcov

     

       6
       6
        
       , pytest-doctestplus

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
       -
       , setuptools_scm

     

       8
       8
       +
       , setuptools-scm

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     
···

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     

       21
       21
       -
           setuptools_scm

     

       21
       21
       +
           setuptools-scm

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [ pytest ];

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools_scm, isPy27 }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, isPy27 }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-flask";

     
···

       19
       19
        
           werkzeug

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       23
       23
        
       

     

       24
       24
        
         meta = with lib; {

     

       25
       25
        
           homepage = "https://github.com/pytest-dev/pytest-flask/";

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , py

     

       6
       6
        
       , pytest

     

       7
       7
        
       , pytestCheckHook

     
···

       16
       16
        
           sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

     

       22
       22
        
           pytest

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, pythonOlder

     

       2
       2
       -
       , pytest, pytest-metadata, setuptools_scm }:

     

       2
       2
       +
       , pytest, pytest-metadata, setuptools-scm }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pytest-html";

     
···

       11
       11
        
           sha256 = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       14
       14
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       15
       15
        
         buildInputs = [ pytest ];

     

       16
       16
        
         propagatedBuildInputs = [ pytest-metadata ];

     

       17
       17

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, setuptools_scm }:

     

       2
       2
       +
       , pytest, setuptools-scm }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pytest-metadata";

     
···

       10
       10
        
           sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       13
       13
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       14
       14
        
         buildInputs = [ pytest ];

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

+2 -2

pkgs/development/python-modules/pytest-mock/2.nix

···

       5
       5
        
       , isPy3k

     

       6
       6
        
       , pytest

     

       7
       7
        
       , mock

     

       8
       8
       -
       , setuptools_scm

     

       8
       8
       +
       , setuptools-scm

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     
···

       20
       20
        
         propagatedBuildInputs = lib.optional (!isPy3k) mock;

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [

     

       23
       23
       -
          setuptools_scm

     

       23
       23
       +
          setuptools-scm

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [

+2 -2

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pytest-asyncio

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       15
       15
        
           sha256 = "1z6r3n78bilfzkbxj083p0ib04ia1bhfgnj2qq9x6q4mmykapqm1";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       18
       18
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       19
       19
        
       

     

       20
       20
        
         checkInputs = [

     

       21
       21
        
           pytest-asyncio

+2 -2

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

···

       4
       4
        
       , filelock

     

       5
       5
        
       , pytest

     

       6
       6
        
       , mypy

     

       7
       7
       -
       , setuptools_scm

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     
···

       16
       16
        
           sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ pytest ];

     

       22
       22

+2 -2

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

···

       5
       5
        
       , pytest

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       , psutil

     

       8
       8
       -
       , setuptools_scm

     

       8
       8
       +
       , setuptools-scm

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     
···

       18
       18
        
           sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [ pytest ];

     

       24
       24

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytest

     

       6
       6
        
       , pyqt5

     

       7
       7
        
       }:

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
       -
           setuptools_scm

     

       19
       19
       +
           setuptools-scm

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = [

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytest

     

       6
       6
        
       , fetchpatch

     

       7
       7
        
       }:

     
···

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [

     

       19
       19
       -
           setuptools_scm

     

       19
       19
       +
           setuptools-scm

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         checkInputs = [

+2 -2

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

···

       5
       5
        
       , requests

     

       6
       6
        
       , psutil

     

       7
       7
        
       , pytest

     

       8
       8
       -
       , setuptools_scm

     

       8
       8
       +
       , setuptools-scm

     

       9
       9
        
       , subprocess32 ? null

     

       10
       10
        
       , toml

     

       11
       11
        
       , zc_lockfile

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
       -
           setuptools_scm

     

       24
       24
       +
           setuptools-scm

     

       25
       25
        
           toml

     

       26
       26
        
         ];

     

       27
       27

+2 -2

pkgs/development/python-modules/pytest-xdist/1.nix

···

       1
       1
        
       { lib, fetchPypi, buildPythonPackage, execnet, pytest

     

       2
       2
       -
       , setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }:

     

       2
       2
       +
       , setuptools-scm, pytest-forked, filelock, psutil, six, isPy3k }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "pytest-xdist";

     
···

       10
       10
        
           sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ setuptools_scm pytest ];

     

       13
       13
       +
         nativeBuildInputs = [ setuptools-scm pytest ];

     

       14
       14
        
         checkInputs = [ pytest filelock ];

     

       15
       15
        
         propagatedBuildInputs = [ execnet pytest-forked psutil six ];

     

       16
       16

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       , filelock

     

       8
       8
        
       , execnet

     
···

       21
       21
        
           sha256 = "718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       24
       24
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       25
       25
        
         buildInputs = [

     

       26
       26
        
           pytest

     

       27
       27
        
         ];

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
        
       , psutil

     

       3
       3
        
       , pytest

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       13
       13
        
           sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       16
       16
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ pytest ];

     

       19
       19

+2 -2

pkgs/development/python-modules/pytest/4.nix

···

       1
       1
        
       { lib, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py

     

       2
       2
       -
       , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools

     

       2
       2
       +
       , setuptools-scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools

     

       3
       3
        
       , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy

     

       4
       4
        
       }:

     

       5
       5
        
       buildPythonPackage rec {

     
···

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         checkInputs = [ hypothesis mock ];

     

       15
       15
       -
         buildInputs = [ setuptools_scm ];

     

       15
       15
       +
         buildInputs = [ setuptools-scm ];

     

       16
       16
        
         propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ]

     

       17
       17
        
           ++ lib.optionals (!isPy3k) [ funcsigs ]

     

       18
       18
        
           ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];

+2 -2

pkgs/development/python-modules/pytest/5.nix

···

       12
       12
        
       , pygments

     

       13
       13
        
       , python

     

       14
       14
        
       , setuptools

     

       15
       15
       -
       , setuptools_scm

     

       15
       15
       +
       , setuptools-scm

     

       16
       16
        
       , six

     

       17
       17
        
       , toml

     

       18
       18
        
       , wcwidth

     
···

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         checkInputs = [ hypothesis pygments ];

     

       34
       34
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       34
       34
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           atomicwrites

     

       37
       37
        
           attrs

+2 -2

pkgs/development/python-modules/pytestrunner/2.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-runner";

     
···

       9
       9
        
           sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ setuptools_scm pytest ];

     

       12
       12
       +
         nativeBuildInputs = [ setuptools-scm pytest ];

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

     

       15
       15
        
           rm pytest.ini

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pytest-runner";

     
···

       9
       9
        
           sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         nativeBuildInputs = [ setuptools_scm pytest ];

     

       12
       12
       +
         nativeBuildInputs = [ setuptools-scm pytest ];

     

       13
       13
        
       

     

       14
       14
        
         postPatch = ''

     

       15
       15
        
           rm pytest.ini

+3 -3

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

···

       8
       8
        
       , pytest

     

       9
       9
        
       , pytestcov

     

       10
       10
        
       , pytestrunner

     

       11
       11
       -
       , setuptools_scm

     

       11
       11
       +
       , setuptools-scm

     

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     
···

       23
       23
        
           sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ];

     

       26
       26
       +
         nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ];

     

       27
       27
        
         checkInputs = [ pytest pytestcov psutil ];

     

       28
       28
        
         propagatedBuildInputs = lib.optionals (!isPy3k) [ future ];

     

       29
       29
        
       

     

       30
       30
       -
         # give a hint to setuptools_scm on package version

     

       30
       30
       +
         # give a hint to setuptools-scm on package version

     

       31
       31
        
         preBuild = ''

     

       32
       32
        
           export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"

     

       33
       33
        
         '';

+2 -2

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

···

       1
       1
       -
       { lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools_scm }:

     

       1
       1
       +
       { lib, stdenv, fetchPypi, buildPythonPackage, libusb1, setuptools-scm }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "pyusb";

     
···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [

     

       13
       13
       -
           setuptools_scm

     

       13
       13
       +
           setuptools-scm

     

       14
       14
        
         ];

     

       15
       15
        
       

     

       16
       16
        
         # Fix the USB backend library lookup

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pythonOlder

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , six

     

       7
       7
        
       , pytest

     

       8
       8
        
       }:

     
···

       17
       17
        
           sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         buildInputs = [ setuptools_scm ];

     

       20
       20
       +
         buildInputs = [ setuptools-scm ];

     

       21
       21
        
         propagatedBuildInputs = [ six ];

     

       22
       22
        
       

     

       23
       23
        
         checkPhase = ''

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "pyvex";

     

       14
       14
       -
         version = "9.0.7491";

     

       14
       14
       +
         version = "9.0.7833";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "sha256-tKfOkW1mLa4gCweF5bGVwnS7E+dRdc/PiuOfT7AgKNo=";

     

       18
       18
       +
           sha256 = "sha256-vasPukhDpvTNEvSy3A2H4ZkFMpLSoHB6+uuimYH1VT4=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         postPatch = lib.optionalString stdenv.isDarwin ''

+20 -8

pkgs/development/python-modules/qiskit-aer/default.nix

···

       2
       2
        
       , pythonOlder

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       +
       , fetchpatch

     

       5
       6
        
         # C Inputs

     

       6
       7
        
       , blas

     

       7
       8
        
       , catch2

     
···

       27
       28
        
       

     

       28
       29
        
       buildPythonPackage rec {

     

       29
       30
        
         pname = "qiskit-aer";

     

       30
       30
       -
         version = "0.8.0";

     

       31
       31
       +
         version = "0.8.2";

     

       31
       32
        
         format = "pyproject";

     

       32
       33
        
       

     

       33
       34
        
         disabled = pythonOlder "3.6";

     
···

       36
       37
        
           owner = "Qiskit";

     

       37
       38
        
           repo = "qiskit-aer";

     

       38
       39
        
           rev = version;

     

       39
       39
       -
           hash = "sha256-CWF3ehLs0HBXnYH11r+2CQwIcxddAfQm3ulAf1agl/o=";

     

       40
       40
       +
           hash = "sha256-7NWM7qpMQ3vA6p0dhEPnkBjsPMdhceYTYcAD4tsClf0=";

     

       40
       41
        
         };

     

       41
       42
        
       

     

       43
       43
       +
         patches = [

     

       44
       44
       +
           (fetchpatch {

     

       45
       45
       +
             # https://github.com/Qiskit/qiskit-aer/pull/1250

     

       46
       46
       +
             name = "qiskit-aer-pr-1250-native-cmake_dl_libs.patch";

     

       47
       47
       +
             url = "https://github.com/Qiskit/qiskit-aer/commit/2bf04ade3e5411776817706cf82cc67a3b3866f6.patch";

     

       48
       48
       +
             sha256 = "0ldwzxxfgaad7ifpci03zfdaj0kqj0p3h94qgshrd2953mf27p6z";

     

       49
       49
       +
           })

     

       50
       50
       +
         ];

     

       51
       51
       +
         # Remove need for cmake python package

     

       52
       52
       +
         # pybind11 shouldn't be an install requirement, just build requirement.

     

       53
       53
       +
         postPatch = ''

     

       54
       54
       +
           substituteInPlace setup.py \

     

       55
       55
       +
             --replace "'cmake!=3.17,!=3.17.0'," "" \

     

       56
       56
       +
             --replace "'pybind11>=2.6'" ""

     

       57
       57
       +
         '';

     

       58
       58
       +
       

     

       42
       59
        
         nativeBuildInputs = [

     

       43
       60
        
           cmake

     

       44
       61
        
           ninja

     

       45
       62
        
           scikit-build

     

       63
       63
       +
           pybind11

     

       46
       64
        
         ];

     

       47
       65
        
       

     

       48
       66
        
         buildInputs = [

     
···

       58
       76
        
           cvxpy

     

       59
       77
        
           cython  # generates some cython files at runtime that need to be cython-ized

     

       60
       78
        
           numpy

     

       61
       61
       -
           pybind11

     

       62
       79
        
         ];

     

       63
       63
       -
       

     

       64
       64
       -
         # tries to install pypi cmake package, not needed

     

       65
       65
       -
         postPatch = ''

     

       66
       66
       -
           substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'," ""

     

       67
       67
       -
         '';

     

       68
       80
        
       

     

       69
       81
        
         # Disable using conan for build

     

       70
       82
        
         preBuild = ''

+4 -8

pkgs/development/python-modules/qiskit-aqua/default.nix

···

       10
       10
        
       , networkx

     

       11
       11
        
       , numpy

     

       12
       12
        
       , psutil

     

       13
       13
       -
       , python

     

       14
       13
        
       , qiskit-ignis

     

       15
       14
        
       , qiskit-terra

     

       16
       15
        
       , quandl

     
···

       34
       33
        
       

     

       35
       34
        
       buildPythonPackage rec {

     

       36
       35
        
         pname = "qiskit-aqua";

     

       37
       37
       -
         version = "0.9.0";

     

       36
       36
       +
         version = "0.9.1";

     

       38
       37
        
       

     

       39
       38
        
         disabled = pythonOlder "3.6";

     

       40
       39
        
       

     
···

       43
       42
        
           owner = "Qiskit";

     

       44
       43
        
           repo = "qiskit-aqua";

     

       45
       44
        
           rev = version;

     

       46
       46
       -
           hash = "sha256-knue9uJih72UQHsvfXZ9AA94mol4ERa9Lo/GMcp+2hA=";

     

       45
       45
       +
           hash = "sha256-fptyqPrkUgl3UjtlEmDYORdX/SsONxWozQGEs/EahmU=";

     

       47
       46
        
         };

     

       48
       47
        
       

     

       49
       48
        
         # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed.

     
···

       97
       96
        
             >> qiskit/optimization/__init__.py

     

       98
       97
        
         '';

     

       99
       98
        
       

     

       100
       100
       -
         postInstall = "rm -rf $out/${python.sitePackages}/docs";  # Remove docs dir b/c it can cause conflicts.

     

       101
       101
       -
       

     

       102
       99
        
         checkInputs = [

     

       103
       100
        
           pytestCheckHook

     

       104
       101
        
           ddt

     
···

       123
       120
        
           "--ignore=test/chemistry/test_bopes_sampler.py"

     

       124
       121
        
         ];

     

       125
       122
        
         disabledTests = [

     

       126
       126
       -
           # Disabled due to missing pyscf

     

       127
       127
       -
           "test_validate" # test/chemistry/test_inputparser.py

     

       128
       128
       -
       

     

       129
       123
        
           # Online tests

     

       130
       124
        
           "test_exchangedata"

     

       131
       125
        
           "test_yahoo"

     
···

       163
       157
        
           "test_eoh"

     

       164
       158
        
           "test_qasm_5"

     

       165
       159
        
           "test_uccsd_hf"

     

       160
       160
       +
         ] ++ lib.optionals (!withPyscf) [

     

       161
       161
       +
           "test_validate" # test/chemistry/test_inputparser.py

     

       166
       162
        
         ];

     

       167
       163
        
       

     

       168
       164
        
         meta = with lib; {

+5 -3

pkgs/development/python-modules/qiskit-ibmq-provider/default.nix

···

       39
       39
        
       in

     

       40
       40
        
       buildPythonPackage rec {

     

       41
       41
        
         pname = "qiskit-ibmq-provider";

     

       42
       42
       -
         version = "0.12.2";

     

       42
       42
       +
         version = "0.13.1";

     

       43
       43
        
       

     

       44
       44
        
         disabled = pythonOlder "3.6";

     

       45
       45
        
       

     
···

       47
       47
        
           owner = "Qiskit";

     

       48
       48
        
           repo = pname;

     

       49
       49
        
           rev = version;

     

       50
       50
       -
           sha256 = "0yil363mqssq0453nrwxgkjivzk3a4jgbnaf21bp7lwfcl2jdhqm";

     

       50
       50
       +
           hash = "sha256-DlHlXncttzGo4uVoh2aQ7urW6krN3ej2sJ/EwuxeF2I=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         propagatedBuildInputs = [

     
···

       83
       83
        
       

     

       84
       84
        
         # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud).

     

       85
       85
        
         # Options defined in qiskit.terra.test.testing_options.py::get_test_options

     

       86
       86
       -
         QISKIT_TESTS = "skip_online";

     

       86
       86
       +
         preCheck = ''

     

       87
       87
       +
           export QISKIT_TESTS=skip_online

     

       88
       88
       +
         '';

     

       87
       89
        
       

     

       88
       90
        
         meta = with lib; {

     

       89
       91
        
           description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ";

+6 -10

pkgs/development/python-modules/qiskit-ignis/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , pythonOlder

     

       3
       4
        
       , buildPythonPackage

     

       4
       5
        
       , fetchFromGitHub

     

       5
       5
       -
       , python

     

       6
       6
        
       , numpy

     

       7
       7
        
       , qiskit-terra

     

       8
       8
        
       , scikit-learn

     
···

       34
       34
        
           rev = version;

     

       35
       35
        
           hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0=";

     

       36
       36
        
         };

     

       37
       37
       -
       

     

       38
       38
       -
         # hacky, fix https://github.com/Qiskit/qiskit-ignis/issues/532.

     

       39
       39
       -
         # TODO: remove on qiskit-ignis v0.5.2

     

       40
       40
       -
         postPatch = ''

     

       41
       41
       -
           substituteInPlace qiskit/ignis/mitigation/expval/base_meas_mitigator.py --replace "plt.axes" "'plt.axes'"

     

       42
       42
       -
         '';

     

       43
       37
        
       

     

       44
       38
        
         propagatedBuildInputs = [

     

       45
       39
        
           numpy

     
···

       49
       43
        
         ] ++ lib.optionals (withCvx) [ cvxpy ]

     

       50
       44
        
         ++ lib.optionals (withVisualization) [ matplotlib ]

     

       51
       45
        
         ++ lib.optionals (withJit) [ numba ];

     

       52
       52
       -
         postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts

     

       53
       46
        
       

     

       54
       47
        
         # Tests

     

       55
       48
        
         pythonImportsCheck = [ "qiskit.ignis" ];

     

       56
       49
        
         dontUseSetuptoolsCheck = true;

     

       57
       57
       -
         preCheck = "export HOME=$TMPDIR";

     

       50
       50
       +
         preCheck = ''

     

       51
       51
       +
           export HOME=$TMPDIR

     

       52
       52
       +
         '';

     

       58
       53
        
         checkInputs = [

     

       59
       54
        
           pytestCheckHook

     

       60
       55
        
           ddt

     
···

       63
       58
        
         ];

     

       64
       59
        
         disabledTests = [

     

       65
       60
        
           "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds

     

       66
       66
       -
           "test_qv_fitter" # execution hangs, ran for several minutes

     

       61
       61
       +
         ] ++ lib.optionals stdenv.isAarch64 [

     

       62
       62
       +
           "test_fitters" # Fails check that arrays are close. Might be due to aarch64 math issues.

     

       67
       63
        
         ];

     

       68
       64
        
       

     

       69
       65
        
         meta = with lib; {

+11 -4

pkgs/development/python-modules/qiskit-terra/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , pythonOlder

     

       3
       4
        
       , buildPythonPackage

     

       4
       5
        
       , fetchFromGitHub

     
···

       56
       57
        
       

     

       57
       58
        
       buildPythonPackage rec {

     

       58
       59
        
         pname = "qiskit-terra";

     

       59
       59
       -
         version = "0.17.0";

     

       60
       60
       +
         version = "0.17.4";

     

       60
       61
        
       

     

       61
       62
        
         disabled = pythonOlder "3.6";

     

       62
       63
        
       

     
···

       64
       65
        
           owner = "Qiskit";

     

       65
       66
        
           repo = pname;

     

       66
       67
        
           rev = version;

     

       67
       67
       -
           hash = "sha256-LbNbaHAWAVG5YLc9juuwcOlrREBW6OjEl7VPtACfl3I=";

     

       68
       68
       +
           hash = "sha256-JyNuke+XPqjLVZbvPud9Y7k0+EmvETVKcOYcDldBiVo=";

     

       68
       69
        
         };

     

       69
       70
        
       

     

       70
       71
        
         nativeBuildInputs = [ cython ];

     
···

       106
       107
        
           "test/python/classical_function_compiler/"

     

       107
       108
        
         ];

     

       108
       109
        
         disabledTests = [

     

       110
       110
       +
           # Not working on matplotlib >= 3.4.0, checks images match.

     

       111
       111
       +
           "test_plot_circuit_layout"

     

       112
       112
       +
       

     

       109
       113
        
           # Flaky tests

     

       110
       114
        
           "test_cx_equivalence"

     

       111
       115
        
           "test_pulse_limits"

     

       116
       116
       +
           "test_1q_random"

     

       112
       117
        
         ] ++ lib.optionals (!withClassicalFunctionCompiler) [

     

       113
       118
        
           "TestPhaseOracle"

     

       119
       119
       +
         ] ++ lib.optionals stdenv.isAarch64 [

     

       120
       120
       +
           "test_circuit_init" # failed on aarch64, https://gist.github.com/r-rmcgibbo/c2e173d43ced4f6954811004f6b5b842

     

       114
       121
        
         ]

     

       115
       122
        
         # Disabling slow tests for build constraints

     

       116
       123
        
         ++ [

     
···

       155
       162
        
           pushd $PACKAGEDIR

     

       156
       163
        
         '';

     

       157
       164
        
         postCheck = ''

     

       158
       158
       -
           rm -rf test

     

       159
       159
       -
           rm -rf examples

     

       165
       165
       +
           rm -r test

     

       166
       166
       +
           rm -r examples

     

       160
       167
        
           popd

     

       161
       168
        
         '';

     

       162
       169

+2 -2

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

···

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "qiskit";

     

       17
       17
        
         # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history

     

       18
       18
       -
         version = "0.25.0";

     

       18
       18
       +
         version = "0.26.2";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.6";

     

       21
       21
        
       

     
···

       23
       23
        
           owner = "qiskit";

     

       24
       24
        
           repo = "qiskit";

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           hash = "sha256-pJM6d3AyFs9AexvQXG+8QQ4zwpFisJC16iBFR9gNSk0=";

     

       26
       26
       +
           hash = "sha256-QYWKKS7e/uCt5puWV4jA9Emp7M4Cyv2RUCxilbChWhw=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         propagatedBuildInputs = [

+2 -2

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

···

       10
       10
        
       , scipy

     

       11
       11
        
       , pytest

     

       12
       12
        
       , pytest-astropy

     

       13
       13
       -
       , setuptools_scm

     

       13
       13
       +
       , setuptools-scm

     

       14
       14
        
       , cython

     

       15
       15
        
       }:

     

       16
       16
        
       

     
···

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ];

     

       35
       35
       -
         nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools_scm ];

     

       35
       35
       +
         nativeBuildInputs = [ astropy-helpers cython astropy-extension-helpers setuptools-scm ];

     

       36
       36
        
         checkInputs = [ pytest pytest-astropy ];

     

       37
       37
        
       

     

       38
       38
        
         # Tests must be run in the build directory

+20 -8

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

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , buildPythonPackage

     

       3
       4
        
       , pythonOlder

     

       4
       5
        
       , rustPlatform

     

       5
       6
        
       , fetchFromGitHub

     

       6
       6
       -
       

     

       7
       7
       +
       , libiconv

     

       7
       8
        
         # Check inputs

     

       8
       9
        
       , pytestCheckHook

     

       10
       10
       +
       , fixtures

     

       11
       11
       +
       , graphviz

     

       12
       12
       +
       , matplotlib

     

       9
       13
        
       , networkx

     

       10
       14
        
       , numpy

     

       15
       15
       +
       , pydot

     

       11
       16
        
       }:

     

       12
       17
        
       

     

       13
       18
        
       buildPythonPackage rec {

     

       14
       19
        
         pname = "retworkx";

     

       15
       15
       -
         version = "0.8.0";

     

       20
       20
       +
         version = "0.9.0";

     

       16
       21
        
         format = "pyproject";

     

       17
       22
        
         disabled = pythonOlder "3.6";

     

       18
       23
        
       

     
···

       20
       25
        
           owner = "Qiskit";

     

       21
       26
        
           repo = "retworkx";

     

       22
       27
        
           rev = version;

     

       23
       23
       -
           sha256 = "0plpri6a3d6f1000kmcah9066vq2i37d14bdf8sm96493fhpqhrd";

     

       28
       28
       +
           hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk=";

     

       24
       29
        
         };

     

       25
       30
        
       

     

       26
       31
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       27
       32
        
           inherit src;

     

       28
       33
        
           name = "${pname}-${version}";

     

       29
       29
       -
           hash = "sha256-+k779gmge8wDdoZrWn9ND47kUqt7pqe75Zuj2Byfefo=";

     

       34
       34
       +
           hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco=";

     

       30
       35
        
         };

     

       31
       36
        
       

     

       32
       37
        
         nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];

     

       33
       38
        
       

     

       34
       34
       -
         # Needed b/c need to check AFTER python wheel is installed (using Rust Build, not buildPythonPackage)

     

       35
       35
       -
         doCheck = false;

     

       36
       36
       -
         doInstallCheck = true;

     

       39
       39
       +
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       37
       40
        
       

     

       38
       38
       -
         installCheckInputs = [ pytestCheckHook networkx numpy ];

     

       41
       41
       +
         pythonImportsCheck = [ "retworkx" ];

     

       42
       42
       +
         checkInputs = [

     

       43
       43
       +
           pytestCheckHook

     

       44
       44
       +
           fixtures

     

       45
       45
       +
           graphviz

     

       46
       46
       +
           matplotlib

     

       47
       47
       +
           networkx

     

       48
       48
       +
           numpy

     

       49
       49
       +
           pydot

     

       50
       50
       +
         ];

     

       39
       51
        
       

     

       40
       52
        
         preCheck = ''

     

       41
       53
        
           export TESTDIR=$(mktemp -d)

+2 -2

pkgs/development/python-modules/sapi-python-client/default.nix

···

       1
       1
       -
       { lib, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:

     

       1
       1
       +
       { lib, git, setuptools, setuptools-scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
           pname = "sapi-python-client";

     
···

       17
       17
        
       

     

       18
       18
        
           doCheck = false; # requires API token and an active keboola bucket

     

       19
       19
        
       

     

       20
       20
       -
           nativeBuildInputs = [ git setuptools_scm ];

     

       20
       20
       +
           nativeBuildInputs = [ git setuptools-scm ];

     

       21
       21
        
       

     

       22
       22
        
           propagatedBuildInputs = [ setuptools requests boto3 responses ];

     

       23
       23

+2 -2

pkgs/development/python-modules/setuptools-scm-git-archive/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "setuptools-scm-git-archive";

     
···

       10
       10
        
           sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       13
       13
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       14
       14
        
       

     

       15
       15
        
         checkInputs = [ pytest ];

     

       16
       16

pkgs/development/python-modules/setuptools_scm/2.nix pkgs/development/python-modules/setuptools-scm/2.nix

pkgs/development/python-modules/setuptools_scm/default.nix pkgs/development/python-modules/setuptools-scm/default.nix

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, fetchpatch, mock

     

       2
       2
       -
       , future, six, setuptools_scm }:

     

       2
       2
       +
       , future, six, setuptools-scm }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "sievelib";

     
···

       23
       23
        
           })

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
       -
         buildInputs = [ setuptools_scm ];

     

       26
       26
       +
         buildInputs = [ setuptools-scm ];

     

       27
       27
        
         propagatedBuildInputs = [ future six ];

     

       28
       28
        
         checkInputs = [ mock ];

     

       29
       29

+2 -2

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

···

       1
       1
       -
       { buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools_scm

     

       1
       1
       +
       { buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools-scm

     

       2
       2
        
       , pytestCheckHook }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     
···

       12
       12
        
           sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [ setuptools ];

     

       18
       18

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , isPy3k

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , setuptools

     

       7
       7
        
       , requests

     

       8
       8
        
       , lxml

     
···

       26
       26
        
           snscrape --help

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       29
       29
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       30
       30
        
         propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ];

     

       31
       31
        
       

     

       32
       32
        
         meta = with lib; {

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     
···

       15
       15
        
           sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       18
       18
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       19
       19
        
         # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl.

     

       20
       20
        
         doCheck = false;

     

       21
       21

+2 -2

pkgs/development/python-modules/sphinxcontrib-openapi/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy27

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , m2r

     

       7
       7
        
       , pyyaml

     

       8
       8
        
       , jsonschema

     
···

       19
       19
        
           sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       23
       23
        
         propagatedBuildInputs = [ pyyaml jsonschema m2r sphinxcontrib_httpdomain ];

     

       24
       24
        
       

     

       25
       25
        
         doCheck = false;

+2 -2

pkgs/development/python-modules/stack-data/default.nix

···

       8
       8
        
       , pure-eval

     

       9
       9
        
       , pygments

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
       -
       , setuptools_scm

     

       11
       11
       +
       , setuptools-scm

     

       12
       12
        
       , toml

     

       13
       13
        
       , typeguard

     

       14
       14
        
       }:

     
···

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

     

       30
       30
        
           git

     

       31
       31
       -
           setuptools_scm

     

       31
       31
       +
           setuptools-scm

     

       32
       32
        
           toml

     

       33
       33
        
         ];

     

       34
       34

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock

     

       2
       2
       +
       , setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock

     

       3
       3
        
       , six, pytz, jaraco_functools, pythonOlder

     

       4
       4
        
       , pytest-flake8, pytestcov, pytest-black, pytest-mypy

     

       5
       5
        
       }:

     
···

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.2";

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       18
       18
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [ six pytz jaraco_functools ];

     

       21
       21

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k

     

       2
       2
       -
       , pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm

     

       2
       2
       +
       , pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools-scm

     

       3
       3
        
       , pytest, sphinx, tornado, typeguard

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       12
       12
        
           sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ pbr setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ pbr setuptools-scm ];

     

       16
       16
        
         propagatedBuildInputs = [ six ]

     

       17
       17
        
           ++ lib.optionals isPy27 [ futures monotonic typing ];

     

       18
       18

+2 -2

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

···

       8
       8
        
       , numpy

     

       9
       9
        
       , wheel

     

       10
       10
        
       , isPy3k

     

       11
       11
       -
       , setuptools_scm

     

       11
       11
       +
       , setuptools-scm

     

       12
       12
        
       , psutil

     

       13
       13
        
       , pandas

     

       14
       14
        
       }:

     
···

       28
       28
        
         nativeBuildInputs = [

     

       29
       29
        
           cython

     

       30
       30
        
           pybind11

     

       31
       31
       -
           setuptools_scm

     

       31
       31
       +
           setuptools-scm

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         buildInputs = [

+2 -2

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

···

       6
       6
        
       , py

     

       7
       7
        
       , six

     

       8
       8
        
       , virtualenv

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       , toml

     

       11
       11
        
       , filelock

     

       12
       12
        
       }:

     
···

       15
       15
        
         pname = "tox";

     

       16
       16
        
         version = "3.23.0";

     

       17
       17
        
       

     

       18
       18
       -
         buildInputs = [ setuptools_scm ];

     

       18
       18
       +
         buildInputs = [ setuptools-scm ];

     

       19
       19
        
         propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ];

     

       20
       20
        
       

     

       21
       21
        
         doCheck = false;

+2 -2

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

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       , pytest-asyncio

     

       8
       8
        
       , pytest-timeout

     
···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [

     

       25
       25
       -
           setuptools_scm

     

       25
       25
       +
           setuptools-scm

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
        
         checkInputs = [

+2 -2

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

···

       6
       6
        
       , readme_renderer

     

       7
       7
        
       , requests

     

       8
       8
        
       , requests_toolbelt

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       , tqdm

     

       11
       11
        
       , colorama

     

       12
       12
        
       , rfc3986

     
···

       22
       22
        
           sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       25
       25
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       26
       26
        
         propagatedBuildInputs = [

     

       27
       27
        
           importlib-metadata

     

       28
       28
        
           keyring

+2 -2

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

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools_scm }:

     

       1
       1
       +
       { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "ufonormalizer";

     
···

       12
       12
        
           extension = "zip";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       15
       15
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
        
       

     

       17
       17
        
         meta = with lib; {

     

       18
       18
        
           description = "Script to normalize the XML and other data inside of a UFO";

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
        
       , defcon, fonttools, lxml, fs

     

       3
       3
        
       , mutatormath, fontmath, fontparts

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     
···

       14
       14
        
           extension = "zip";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         propagatedBuildInputs = [

     

       20
       20
        
           defcon

+2 -2

pkgs/development/python-modules/ujson/2.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       14
       14
        
           sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       17
       17
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       18
       18
        
       

     

       19
       19
        
         checkInputs = [

     

       20
       20
        
           pytestCheckHook

+2 -2

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

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , isPy3k

     

       5
       5
        
       , isPyPy

     

       6
       6
       -
       , setuptools_scm

     

       6
       6
       +
       , setuptools-scm

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     
···

       16
       16
        
           sha256 = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       19
       19
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       20
       20
        
       

     

       21
       21
        
         meta = with lib; {

     

       22
       22
        
           homepage = "https://pypi.python.org/pypi/ujson";

+2 -2

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

···

       2
       2
        
       , isPy27

     

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , pytestrunner

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , singledispatch ? null

     

       7
       7
        
       , pytest

     

       8
       8
        
       , lib

     
···

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     

       21
       21
        
           pytestrunner

     

       22
       22
       -
           setuptools_scm

     

       22
       22
       +
           setuptools-scm

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         checkInputs = [

+2 -2

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

···

       14
       14
        
       , pytestCheckHook

     

       15
       15
        
       , pytest-localserver

     

       16
       16
        
       , pytest-subtesthack

     

       17
       17
       -
       , setuptools_scm

     

       17
       17
       +
       , setuptools-scm

     

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     
···

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
        
         nativeBuildInputs = [

     

       39
       39
       -
           setuptools_scm

     

       39
       39
       +
           setuptools-scm

     

       40
       40
        
         ];

     

       41
       41
        
       

     

       42
       42
        
         checkInputs = [

+2 -2

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

···

       16
       16
        
       , pytest-timeout

     

       17
       17
        
       , pytestCheckHook

     

       18
       18
        
       , pythonOlder

     

       19
       19
       -
       , setuptools_scm

     

       19
       19
       +
       , setuptools-scm

     

       20
       20
        
       , six

     

       21
       21
        
       , stdenv

     

       22
       22
        
       }:

     
···

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [

     

       34
       34
       -
           setuptools_scm

     

       34
       34
       +
           setuptools-scm

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         propagatedBuildInputs = [

+2 -2

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

···

       1
       1
        
       { lib, buildPythonPackage, substituteAll, stdenv,

     

       2
       2
        
         fetchPypi, numpy, cython, freetype-py, fontconfig, libGL,

     

       3
       3
       -
         setuptools_scm, setuptools-scm-git-archive

     

       3
       3
       +
         setuptools-scm, setuptools-scm-git-archive

     

       4
       4
        
         }:

     

       5
       5
        
       

     

       6
       6
        
       buildPythonPackage rec {

     
···

       21
       21
        
         ];

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
       -
           cython setuptools_scm setuptools-scm-git-archive

     

       24
       24
       +
           cython setuptools-scm setuptools-scm-git-archive

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       , numpy

     

       7
       7
        
       , scikit-learn

     

       8
       8
        
       , six

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       , gcc

     

       11
       11
        
       , pytest

     

       12
       12
        
       , pytestcov

     
···

       28
       28
        
           sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ setuptools_scm gcc ];

     

       31
       31
       +
         nativeBuildInputs = [ setuptools-scm gcc ];

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [ cython numpy scikit-learn six ];

     

       34
       34

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , six

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , xorg

     

       7
       7
        
       , python

     

       8
       8
        
       , mock

     
···

       26
       26
        
         '';

     

       27
       27
        
       

     

       28
       28
        
         checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];

     

       29
       29
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       29
       29
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       30
       30
        
         buildInputs = [ xorg.libX11 ];

     

       31
       31
        
         propagatedBuildInputs = [ six ];

     

       32
       32

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "yfinance";

     

       12
       12
       -
         version = "0.1.56";

     

       12
       12
       +
         version = "0.1.59";

     

       13
       13
        
       

     

       14
       14
        
         # GitHub source releases aren't tagged

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "a6d4c7b939fdd48d983556501f5b387e20aaef86afc8e6ba6f91a49a7e22d2dd";

     

       17
       17
       +
           sha256 = "fe4dc46807eceadc6604bf51ece7297b752dc5402a38a87385094fbfc7565fa0";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         propagatedBuildInputs = [

+2 -2

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

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , isPy27

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , setuptools_scm

     

       5
       5
       +
       , setuptools-scm

     

       6
       6
        
       , asciitree

     

       7
       7
        
       , numpy

     

       8
       8
        
       , fasteners

     
···

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [

     

       24
       24
       -
           setuptools_scm

     

       24
       24
       +
           setuptools-scm

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/zipp/1.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytest

     

       6
       6
        
       , pytest-flake8

     

       7
       7
        
       , more-itertools

     
···

       17
       17
        
           sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ more-itertools ];

     

       23
       23

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , pytest

     

       6
       6
        
       , pytest-flake8

     

       7
       7
        
       , more-itertools

     
···

       17
       17
        
           sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         nativeBuildInputs = [ setuptools_scm toml ];

     

       20
       20
       +
         nativeBuildInputs = [ setuptools-scm toml ];

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [ more-itertools ];

     

       23
       23

+1 -1

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

···

       28
       28
        
       python3.pkgs.buildPythonPackage rec {

     

       29
       29
        
         inherit pname version disabled src;

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = with python3.pkgs; [ setuptools_scm ];

     

       31
       31
       +
         nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];

     

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = with python3.pkgs; [

     

       34
       34
        
           pytest

+2 -2

pkgs/development/tools/continuous-integration/jenkins/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "jenkins";

     

       6
       6
       -
         version = "2.277.4";

     

       6
       6
       +
         version = "2.289.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";

     

       10
       10
       -
           sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6";

     

       10
       10
       +
           sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildCommand = ''

+2 -2

pkgs/development/tools/dt-schema/default.nix

···

       6
       6
        
       , jsonschema

     

       7
       7
        
       , rfc3987

     

       8
       8
        
       , setuptools

     

       9
       9
       -
       , setuptools_scm

     

       9
       9
       +
       , setuptools-scm

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     
···

       18
       18
        
           sha256 = "d9f88f069068dc5dc7e895785d7172d260cbbc34cab3b52704b20e89b80c6de8";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ setuptools_scm git ];

     

       21
       21
       +
         nativeBuildInputs = [ setuptools-scm git ];

     

       22
       22
        
         propagatedBuildInputs = [

     

       23
       23
        
           setuptools

     

       24
       24
        
           ruamel_yaml

+1 -1

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

···

       28
       28
        
           pyusb

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       31
       31
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       32
       32
        
       

     

       33
       33
        
         preBuild = ''

     

       34
       34
        
           export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"

+1 -1

pkgs/development/tools/poetry2nix/poetry2nix/default.nix

···

       210
       210
        
                         poetry = if __isBootstrap then null else poetryPkg;

     

       211
       211
        
       

     

       212
       212
        
                         # The canonical name is setuptools-scm

     

       213
       213
       -
                         setuptools-scm = super.setuptools_scm;

     

       213
       213
       +
                         setuptools-scm = super.setuptools-scm;

     

       214
       214
        
       

     

       215
       215
        
                         __toPluginAble = toPluginAble self;

     

       216
       216

+1 -1

pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix

···

       89
       89
        
       

     

       90
       90
        
             # Prevent infinite recursion

     

       91
       91
        
             skipSetupToolsSCM = [

     

       92
       92
       -
               "setuptools_scm"

     

       92
       92
       +
               "setuptools-scm"

     

       93
       93
        
               "setuptools-scm"

     

       94
       94
        
               "toml" # Toml is an extra for setuptools-scm

     

       95
       95
        
             ];

+4 -1

pkgs/games/liquidwar/default.nix

···

       3
       3
        
       , expat, gettext, perl, guile

     

       4
       4
        
       , SDL, SDL_image, SDL_mixer, SDL_ttf

     

       5
       5
        
       , curl, sqlite, libtool, readline

     

       6
       6
       -
       , libogg, libvorbis, libcaca, csound, cunit } :

     

       6
       6
       +
       , libogg, libvorbis, libcaca, csound, cunit

     

       7
       7
       +
       , pkg-config }:

     

       7
       8
        
       

     

       8
       9
        
       stdenv.mkDerivation rec {

     

       9
       10
        
         pname = "liquidwar6";

     
···

       24
       25
        
           libXrender libcaca cunit

     

       25
       26
        
           libtool readline

     

       26
       27
        
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [ pkg-config ];

     

       27
       30
        
       

     

       28
       31
        
         hardeningDisable = [ "format" ];

     

       29
       32

+1 -1

pkgs/games/portmod/default.nix

···

       48
       48
        
         '';

     

       49
       49
        
       

     

       50
       50
        
         propagatedBuildInputs = with python3Packages; [

     

       51
       51
       -
           setuptools_scm

     

       51
       51
       +
           setuptools-scm

     

       52
       52
        
           setuptools

     

       53
       53
        
           requests

     

       54
       54
        
           chardet

+8 -6

pkgs/misc/autotiling/default.nix

···

       1
       1
       -
       { lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }:

     

       1
       1
       +
       { lib, buildPythonApplication, fetchFromGitHub, i3ipc, importlib-metadata }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "autotiling";

     

       5
       5
       -
         version = "1.1";

     

       5
       5
       +
         version = "1.5";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchPypi {

     

       8
       8
       -
           inherit pname version;

     

       9
       9
       -
           sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "nwg-piotr";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "0ih8yd1gankjxn88gd88vxs6f1cniyi04z25jz4nsgqi9snz65v4";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         propagatedBuildInputs = [ i3ipc importlib-metadata ];

     
···

       16
       18
        
           homepage = "https://github.com/nwg-piotr/autotiling";

     

       17
       19
        
           description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation";

     

       18
       20
        
           license = licenses.gpl3Plus;

     

       19
       19
       -
           platforms= platforms.linux;

     

       21
       21
       +
           platforms = platforms.linux;

     

       20
       22
        
           maintainers = with maintainers; [ artturin ];

     

       21
       23
        
         };

     

       22
       24
        
       }

+12

pkgs/misc/vim-plugins/generated.nix

···

       579
       579
        
           meta.homepage = "https://github.com/metakirby5/codi.vim/";

     

       580
       580
        
         };

     

       581
       581
        
       

     

       582
       582
       +
         colorbuddy-nvim = buildVimPluginFrom2Nix {

     

       583
       583
       +
           pname = "colorbuddy-nvim";

     

       584
       584
       +
           version = "2021-04-16";

     

       585
       585
       +
           src = fetchFromGitHub {

     

       586
       586
       +
             owner = "tjdevries";

     

       587
       587
       +
             repo = "colorbuddy.nvim";

     

       588
       588
       +
             rev = "87c80e3f4a590d0387d9b128d1f1fc456759408a";

     

       589
       589
       +
             sha256 = "19gfmyhmwpr8gi03w44zm056zrzaj74hplpl4psy9mylvb0ghf0k";

     

       590
       590
       +
           };

     

       591
       591
       +
           meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/";

     

       592
       592
       +
         };

     

       593
       593
       +
       

     

       582
       594
        
         colorizer = buildVimPluginFrom2Nix {

     

       583
       595
        
           pname = "colorizer";

     

       584
       596
        
           version = "2020-07-23";

pkgs/misc/vim-plugins/vim-plugin-names

···

       643
       643
        
       tiagofumo/vim-nerdtree-syntax-highlight

     

       644
       644
        
       tikhomirov/vim-glsl

     

       645
       645
        
       TimUntersberger/neogit

     

       646
       646
       +
       tjdevries/colorbuddy.nvim

     

       646
       647
        
       tjdevries/nlua.nvim

     

       647
       648
        
       tjdevries/train.nvim

     

       648
       649
        
       tmhedberg/SimpylFold

+5 -5

pkgs/os-specific/linux/raspberrypi-eeprom/default.nix

···

       1
       1
        
       { stdenvNoCC, lib, fetchFromGitHub, makeWrapper

     

       2
       2
        
       , python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi

     

       3
       3
        
       }:

     

       4
       4
       -
       stdenvNoCC.mkDerivation {

     

       4
       4
       +
       stdenvNoCC.mkDerivation rec {

     

       5
       5
        
         pname = "raspberrypi-eeprom";

     

       6
       6
       -
         version = "2021-03-18";

     

       6
       6
       +
         version = "2021.04.29-138a1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "raspberrypi";

     

       10
       10
        
           repo = "rpi-eeprom";

     

       11
       11
       -
           rev = "ff27ccf69403b01e337fc4ee6e7ae75244028cce";

     

       12
       12
       -
           sha256 = "1q1vlld0xxh9zinf5g0qa6jw1dggq93br938mvrfx3nb2aviiwcj";

     

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

     

       12
       12
       +
           sha256 = "sha256-nzAMPa4gqCAcROFa7z34IoMA3aoMHX9fYCsPFde9dac=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ python3 ];

     
···

       19
       19
        
           # Don't try to verify md5 signatures from /var/lib/dpkg and

     

       20
       20
        
           # fix path to the configuration.

     

       21
       21
        
           substituteInPlace rpi-eeprom-update \

     

       22
       22
       -
             --replace 'IGNORE_DPKG_CHECKSUMS=$LOCAL_MODE' 'IGNORE_DPKG_CHECKSUMS=1' \

     

       22
       22
       +
             --replace 'IGNORE_DPKG_CHECKSUMS=''${LOCAL_MODE}' 'IGNORE_DPKG_CHECKSUMS=1' \

     

       23
       23
        
             --replace '/etc/default' '/etc'

     

       24
       24
        
         '';

     

       25
       25

pkgs/os-specific/linux/tuxedo-keyboard/default.nix

···

       25
       25
        
           homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/";

     

       26
       26
        
           license = licenses.gpl3Plus;

     

       27
       27
        
           platforms = platforms.linux;

     

       28
       28
       +
           broken = stdenv.isAarch64;

     

       28
       29
        
           maintainers = [ maintainers.blanky0230 ];

     

       29
       30
        
         };

     

       30
       31
        
       }

+1 -1

pkgs/servers/dico/default.nix

···

       22
       22
        
           homepage    = "https://www.gnu.org/software/dico/";

     

       23
       23
        
           license     = licenses.gpl3Plus;

     

       24
       24
        
           maintainers = with maintainers; [ lovek323 ];

     

       25
       25
       -
           platforms   = platforms.linux;

     

       25
       25
       +
           platforms   = platforms.unix;

     

       26
       26
        
       

     

       27
       27
        
           longDescription = ''

     

       28
       28
        
             GNU Dico is a flexible modular implementation of DICT server

+4 -4

pkgs/servers/routinator/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "routinator";

     

       5
       5
       -
         version = "0.8.3";

     

       5
       5
       +
         version = "0.9.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "NLnetLabs";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "sha256-8CBsLOAF0JnRMe7qLod6UDPGLMPwqDm0Z5BjB4KCkBc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = lib.optionals stdenv.isDarwin [ Security ];

     

       15
       15
       -
         cargoSha256 = "sha256-NtugqvaickcEowxGwotGuh6jb2NTK95csJxtjezy90s=";

     

       15
       15
       +
         cargoSha256 = "sha256-S/RAt3tCIlaSqIHqP5C+QK9aQq+4CO/MW2toUo9kVKk=";

     

       16
       16
        
       

     

       17
       17
        
         meta = with lib; {

     

       18
       18
        
           description = "An RPKI Validator written in Rust";

+3 -2

pkgs/servers/samba/4.x.nix

···

       26
       26
        
       , tdb

     

       27
       27
        
       , cmocka

     

       28
       28
        
       , rpcsvc-proto

     

       29
       29
       +
       , python3Packages

     

       29
       30
        
       , nixosTests

     

       30
       31
        
       

     

       31
       32
        
       , enableLDAP ? false, openldap

     
···

       91
       92
        
           libtasn1

     

       92
       93
        
           tdb

     

       93
       94
        
         ] ++ optionals stdenv.isLinux [ liburing systemd ]

     

       94
       94
       -
           ++ optional enableLDAP openldap

     

       95
       95
       +
           ++ optionals enableLDAP [ openldap.dev python3Packages.markdown ]

     

       95
       96
        
           ++ optional (enablePrinting && stdenv.isLinux) cups

     

       96
       97
        
           ++ optional enableMDNS avahi

     

       97
       97
       -
           ++ optionals enableDomainController [ gpgme lmdb ]

     

       98
       98
       +
           ++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ]

     

       98
       99
        
           ++ optional enableRegedit ncurses

     

       99
       100
        
           ++ optional (enableCephFS && stdenv.isLinux) libceph

     

       100
       101
        
           ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]

+3 -3

pkgs/servers/tautulli/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }:

     

       1
       1
       +
       { lib, fetchFromGitHub, buildPythonApplication, setuptools, wrapPython, makeWrapper }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "Tautulli";

     

       5
       5
       -
         version = "2.6.8";

     

       5
       5
       +
         version = "2.7.3";

     

       6
       6
        
         format = "other";

     

       7
       7
        
       

     

       8
       8
        
         pythonPath = [ setuptools ];

     
···

       12
       12
        
           owner = "Tautulli";

     

       13
       13
        
           repo = pname;

     

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

     

       15
       15
       -
           sha256 = "0pkki72maxnrp3frninw2qbxyf76rvkza23k3s8fppandkr7qpvj";

     

       15
       15
       +
           sha256 = "1ig2vq19sb6n2x2w2zbf54izynaqay9l8xq1zds116v0z729wlkh";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         installPhase = ''

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       in package.override rec {

     

       17
       17
        
         name = "bookstack";

     

       18
       18
       -
         version = "21.04.5";

     

       18
       18
       +
         version = "21.05";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "bookstackapp";

     

       22
       22
        
           repo = name;

     

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

     

       24
       24
       -
           sha256 = "0gwpa4g2xna4s3lnd970wjpr32i9cwyaixfqxhb8zbz1i9gyxjaa";

     

       24
       24
       +
           sha256 = "0vn1n2l66xsv2qjhh53dm28vwm7d9ba62syx2gviznva1lsyn78z";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

+69 -69

pkgs/servers/web-apps/bookstack/php-packages.nix

···

       5
       5
        
           "aws/aws-sdk-php" = {

     

       6
       6
        
             targetDir = "";

     

       7
       7
        
             src = composerEnv.buildZipPackage {

     

       8
       8
       -
               name = "aws-aws-sdk-php-948a4defbe2a571cc4460725015b8e98b7060f2d";

     

       8
       8
       +
               name = "aws-aws-sdk-php-3b3aafdceac4cb820e2ae65a8785e4d07db471a7";

     

       9
       9
        
               src = fetchurl {

     

       10
       10
       -
                 url = https://api.github.com/repos/aws/aws-sdk-php/zipball/948a4defbe2a571cc4460725015b8e98b7060f2d;

     

       11
       11
       -
                 sha256 = "06vv6h5j909gbn2d8ih1yr2vf19jnw2va1kghj9qykvll6jzx1cq";

     

       10
       10
       +
                 url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3b3aafdceac4cb820e2ae65a8785e4d07db471a7;

     

       11
       11
       +
                 sha256 = "0pyc5n1h9c12li03wk0p04k25rg1x8qlq4ns4wr8xbxcysdm6xi1";

     

       12
       12
        
               };

     

       13
       13
        
             };

     

       14
       14
        
           };

     
···

       35
       35
        
           "doctrine/cache" = {

     

       36
       36
        
             targetDir = "";

     

       37
       37
        
             src = composerEnv.buildZipPackage {

     

       38
       38
       -
               name = "doctrine-cache-a9c1b59eba5a08ca2770a76eddb88922f504e8e0";

     

       38
       38
       +
               name = "doctrine-cache-3bb5588cec00a0268829cc4a518490df6741af9d";

     

       39
       39
        
               src = fetchurl {

     

       40
       40
       -
                 url = https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0;

     

       41
       41
       -
                 sha256 = "0r1rdfs7k0zl6fqm35qjwbfiqmf3r3nbvfyxzig1379xsgvdd84y";

     

       40
       40
       +
                 url = https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d;

     

       41
       41
       +
                 sha256 = "0r9fhv0y79ma7a5llmj1skycflnwbxyyrblkavjj6svld46li94q";

     

       42
       42
        
               };

     

       43
       43
        
             };

     

       44
       44
        
           };

     
···

       135
       135
        
           "facade/ignition" = {

     

       136
       136
        
             targetDir = "";

     

       137
       137
        
             src = composerEnv.buildZipPackage {

     

       138
       138
       -
               name = "facade-ignition-b6aea4a99303d9d32afd486a285162a89af8a8a3";

     

       138
       138
       +
               name = "facade-ignition-dc49305538aeb77e4c89eba57cee4ceff9e42f33";

     

       139
       139
        
               src = fetchurl {

     

       140
       140
       -
                 url = https://api.github.com/repos/facade/ignition/zipball/b6aea4a99303d9d32afd486a285162a89af8a8a3;

     

       141
       141
       -
                 sha256 = "1dx6gf4qz6jf8hds3lyxs09zlr6ndl3d36212w2hr4b15ihmyszw";

     

       140
       140
       +
                 url = https://api.github.com/repos/facade/ignition/zipball/dc49305538aeb77e4c89eba57cee4ceff9e42f33;

     

       141
       141
       +
                 sha256 = "1nwqgxgp1dsrixf44qh4ywsvd0d35nqg23a8bc9mjvn9wmhdn2q0";

     

       142
       142
        
               };

     

       143
       143
        
             };

     

       144
       144
        
           };

     
···

       225
       225
        
           "laravel/framework" = {

     

       226
       226
        
             targetDir = "";

     

       227
       227
        
             src = composerEnv.buildZipPackage {

     

       228
       228
       -
               name = "laravel-framework-0117d797dc1ab64b1f88d4f6b966380ea7def091";

     

       228
       228
       +
               name = "laravel-framework-92c0417e60efc39bc556ba5dfc9b20a56f7848fb";

     

       229
       229
        
               src = fetchurl {

     

       230
       230
       -
                 url = https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091;

     

       231
       231
       -
                 sha256 = "11aw7smg042g8kyyhdzawmkwgbv5hkn6l6k2m27lc34v84r6kdqm";

     

       230
       230
       +
                 url = https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb;

     

       231
       231
       +
                 sha256 = "17wpm3fk6qakq4b8qf2bvmyzm7zfamiabdgqshzcnfjm7kj4rijy";

     

       232
       232
        
               };

     

       233
       233
        
             };

     

       234
       234
        
           };

     
···

       245
       245
        
           "league/commonmark" = {

     

       246
       246
        
             targetDir = "";

     

       247
       247
        
             src = composerEnv.buildZipPackage {

     

       248
       248
       -
               name = "league-commonmark-2651c497f005de305c7ba3f232cbd87b8c00ee8c";

     

       248
       248
       +
               name = "league-commonmark-7d70d2f19c84bcc16275ea47edabee24747352eb";

     

       249
       249
        
               src = fetchurl {

     

       250
       250
       -
                 url = https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c;

     

       251
       251
       -
                 sha256 = "0mf2avlnn0c9p4fi1jz5m85k6y7xg2p0dm1n4r7cpg25vngswmfs";

     

       250
       250
       +
                 url = https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb;

     

       251
       251
       +
                 sha256 = "1clfi4k0xp15pzg8c344qj5jk54k9dm9xbg4sd6l6iv66md1xasn";

     

       252
       252
        
               };

     

       253
       253
        
             };

     

       254
       254
        
           };

     
···

       315
       315
        
           "nesbot/carbon" = {

     

       316
       316
        
             targetDir = "";

     

       317
       317
        
             src = composerEnv.buildZipPackage {

     

       318
       318
       -
               name = "nesbot-carbon-606262fd8888b75317ba9461825a24fc34001e1e";

     

       318
       318
       +
               name = "nesbot-carbon-8d1f50f1436fb4b05e7127360483dd9c6e73da16";

     

       319
       319
        
               src = fetchurl {

     

       320
       320
       -
                 url = https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e;

     

       321
       321
       -
                 sha256 = "0iqhb3gfmray8jkwki19pwm15vmf96vfj4m12nk7lmn74470lf2x";

     

       320
       320
       +
                 url = https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16;

     

       321
       321
       +
                 sha256 = "102pypd7x9l739qv2fp5lv4gw4sywr1jpgxlgpqyi1ww1dm3dch0";

     

       322
       322
        
               };

     

       323
       323
        
             };

     

       324
       324
        
           };

     
···

       615
       615
        
           "symfony/console" = {

     

       616
       616
        
             targetDir = "";

     

       617
       617
        
             src = composerEnv.buildZipPackage {

     

       618
       618
       -
               name = "symfony-console-36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625";

     

       618
       618
       +
               name = "symfony-console-1b15ca1b1bedda86f98064da9ff5d800560d4c6d";

     

       619
       619
        
               src = fetchurl {

     

       620
       620
       -
                 url = https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625;

     

       621
       621
       -
                 sha256 = "0n5caxf7vgx0x6izsxfkkjdl9jw96qi7h9h0k4s8fccqqmwb61cc";

     

       620
       620
       +
                 url = https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d;

     

       621
       621
       +
                 sha256 = "0xpk6241vg866z56dksv384xmk0vkrz1by9vb8q2d6cbp6nw17y0";

     

       622
       622
        
               };

     

       623
       623
        
             };

     

       624
       624
        
           };

     

       625
       625
        
           "symfony/css-selector" = {

     

       626
       626
        
             targetDir = "";

     

       627
       627
        
             src = composerEnv.buildZipPackage {

     

       628
       628
       -
               name = "symfony-css-selector-01c77324d1d47efbfd7891f62a7c256c69330115";

     

       628
       628
       +
               name = "symfony-css-selector-947cacaf1b3a2af6f13a435392873d5ddaba5f70";

     

       629
       629
        
               src = fetchurl {

     

       630
       630
       -
                 url = https://api.github.com/repos/symfony/css-selector/zipball/01c77324d1d47efbfd7891f62a7c256c69330115;

     

       631
       631
       -
                 sha256 = "12hd9vga35w8g4bwmlkr87pxlwdx71sp2bkxs8j854hf28yam75w";

     

       630
       630
       +
                 url = https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70;

     

       631
       631
       +
                 sha256 = "1v5fl6vhbc2n9mm0y9m28i1gz12n1v0zqzc2sspymyq98921q3gp";

     

       632
       632
        
               };

     

       633
       633
        
             };

     

       634
       634
        
           };

     
···

       655
       655
        
           "symfony/error-handler" = {

     

       656
       656
        
             targetDir = "";

     

       657
       657
        
             src = composerEnv.buildZipPackage {

     

       658
       658
       -
               name = "symfony-error-handler-76603a8df8e001436df80758eb03a8baa5324175";

     

       658
       658
       +
               name = "symfony-error-handler-21d75bfbdfdd3581a7f97080deb98926987f14a7";

     

       659
       659
        
               src = fetchurl {

     

       660
       660
       -
                 url = https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175;

     

       661
       661
       -
                 sha256 = "15s46vjwzny821qq93qsnd9ig14d72rakbavgb3sd43gipyjld8g";

     

       660
       660
       +
                 url = https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7;

     

       661
       661
       +
                 sha256 = "0hdcvmid17xcm21crj3k2gxvnhfww3yaw3liiqrjrkwmny9pr73q";

     

       662
       662
        
               };

     

       663
       663
        
             };

     

       664
       664
        
           };

     
···

       685
       685
        
           "symfony/finder" = {

     

       686
       686
        
             targetDir = "";

     

       687
       687
        
             src = composerEnv.buildZipPackage {

     

       688
       688
       -
               name = "symfony-finder-2543795ab1570df588b9bbd31e1a2bd7037b94f6";

     

       688
       688
       +
               name = "symfony-finder-a96bc19ed87c88eec78e1a4c803bdc1446952983";

     

       689
       689
        
               src = fetchurl {

     

       690
       690
       -
                 url = https://api.github.com/repos/symfony/finder/zipball/2543795ab1570df588b9bbd31e1a2bd7037b94f6;

     

       691
       691
       -
                 sha256 = "0scclnfc9aphjsric1xaj51vbqqz56kiz6l8l6ldqv6cvyg8zlyi";

     

       690
       690
       +
                 url = https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983;

     

       691
       691
       +
                 sha256 = "065mk0cvby82wv799gl5n4xw75nm7q32g816kily39d70rfjwzrs";

     

       692
       692
        
               };

     

       693
       693
        
             };

     

       694
       694
        
           };

     
···

       705
       705
        
           "symfony/http-foundation" = {

     

       706
       706
        
             targetDir = "";

     

       707
       707
        
             src = composerEnv.buildZipPackage {

     

       708
       708
       -
               name = "symfony-http-foundation-1a6f87ef99d05b1bf5c865b4ef7992263e1cb081";

     

       708
       708
       +
               name = "symfony-http-foundation-2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5";

     

       709
       709
        
               src = fetchurl {

     

       710
       710
       -
                 url = https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081;

     

       711
       711
       -
                 sha256 = "0da13w35j7hrkv87p8rrfxdxpksbf1dvji0ag7chwzhfg63516l6";

     

       710
       710
       +
                 url = https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5;

     

       711
       711
       +
                 sha256 = "02dras9h0h2g3xkibvpqfly7108qhg609cv16cgmw109m9d6rv7p";

     

       712
       712
        
               };

     

       713
       713
        
             };

     

       714
       714
        
           };

     

       715
       715
        
           "symfony/http-kernel" = {

     

       716
       716
        
             targetDir = "";

     

       717
       717
        
             src = composerEnv.buildZipPackage {

     

       718
       718
       -
               name = "symfony-http-kernel-cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f";

     

       718
       718
       +
               name = "symfony-http-kernel-59925ee79f2541b4c6e990843e1a42768e898254";

     

       719
       719
        
               src = fetchurl {

     

       720
       720
       -
                 url = https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f;

     

       721
       721
       -
                 sha256 = "0wk4nivw1w4kl7gziazvvzxzjhs7lalc2gc1pnscxj6k3gkfq6fl";

     

       720
       720
       +
                 url = https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254;

     

       721
       721
       +
                 sha256 = "1v6ah9ibz6n2kdpmji1wfqzvb4cbndnwfz4hjqhhrysc0vffpbk4";

     

       722
       722
        
               };

     

       723
       723
        
             };

     

       724
       724
        
           };

     

       725
       725
        
           "symfony/mime" = {

     

       726
       726
        
             targetDir = "";

     

       727
       727
        
             src = composerEnv.buildZipPackage {

     

       728
       728
       -
               name = "symfony-mime-7af452bf51c46f18da00feb32e1ad36db9426515";

     

       728
       728
       +
               name = "symfony-mime-64258e870f8cc75c3dae986201ea2df58c210b52";

     

       729
       729
        
               src = fetchurl {

     

       730
       730
       -
                 url = https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515;

     

       731
       731
       -
                 sha256 = "1rkm66zr6sfp8jw80h4vjrbpx40sqhhlpbc126x990mbzzapjlay";

     

       730
       730
       +
                 url = https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52;

     

       731
       731
       +
                 sha256 = "14s26zam8dxhbskizcw6mpyizg6n4i1ambq5ni6r9gv3rs6cfr9p";

     

       732
       732
        
               };

     

       733
       733
        
             };

     

       734
       734
        
           };

     

       735
       735
        
           "symfony/polyfill-ctype" = {

     

       736
       736
        
             targetDir = "";

     

       737
       737
        
             src = composerEnv.buildZipPackage {

     

       738
       738
       -
               name = "symfony-polyfill-ctype-c6c942b1ac76c82448322025e084cadc56048b4e";

     

       738
       738
       +
               name = "symfony-polyfill-ctype-46cd95797e9df938fdd2b03693b5fca5e64b01ce";

     

       739
       739
        
               src = fetchurl {

     

       740
       740
       -
                 url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e;

     

       741
       741
       -
                 sha256 = "0jpk859wx74vm03q5s9z25f4ak2138p2x5q3b587wvy8rq2m4pbd";

     

       740
       740
       +
                 url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce;

     

       741
       741
       +
                 sha256 = "0z4iiznxxs4r72xs4irqqb6c0wnwpwf0hklwn2imls67haq330zn";

     

       742
       742
        
               };

     

       743
       743
        
             };

     

       744
       744
        
           };

     

       745
       745
        
           "symfony/polyfill-iconv" = {

     

       746
       746
        
             targetDir = "";

     

       747
       747
        
             src = composerEnv.buildZipPackage {

     

       748
       748
       -
               name = "symfony-polyfill-iconv-06fb361659649bcfd6a208a0f1fcaf4e827ad342";

     

       748
       748
       +
               name = "symfony-polyfill-iconv-63b5bb7db83e5673936d6e3b8b3e022ff6474933";

     

       749
       749
        
               src = fetchurl {

     

       750
       750
       -
                 url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342;

     

       751
       751
       -
                 sha256 = "0glb56w5q4v2j629rkndp2c7v4mcs6xdl14nwaaxy85lr5w4ixnq";

     

       750
       750
       +
                 url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933;

     

       751
       751
       +
                 sha256 = "1jyjsjprsgb3r6cbc4x1wg1q1zqakqm8a62ah5lppxnjgq1sgjc5";

     

       752
       752
        
               };

     

       753
       753
        
             };

     

       754
       754
        
           };

     

       755
       755
        
           "symfony/polyfill-intl-idn" = {

     

       756
       756
        
             targetDir = "";

     

       757
       757
        
             src = composerEnv.buildZipPackage {

     

       758
       758
       -
               name = "symfony-polyfill-intl-idn-2d63434d922daf7da8dd863e7907e67ee3031483";

     

       758
       758
       +
               name = "symfony-polyfill-intl-idn-65bd267525e82759e7d8c4e8ceea44f398838e65";

     

       759
       759
        
               src = fetchurl {

     

       760
       760
       -
                 url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483;

     

       761
       761
       -
                 sha256 = "0sk592qrdb6dvk6v8msjva8p672qmhmnzkw1lw53gks0xrc20xjy";

     

       760
       760
       +
                 url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65;

     

       761
       761
       +
                 sha256 = "1cx2cjx0vzni297l7avd3cb1q4c8d2hylkvdqcjlpxjqdimn4jkn";

     

       762
       762
        
               };

     

       763
       763
        
             };

     

       764
       764
        
           };

     

       765
       765
        
           "symfony/polyfill-intl-normalizer" = {

     

       766
       766
        
             targetDir = "";

     

       767
       767
        
             src = composerEnv.buildZipPackage {

     

       768
       768
       -
               name = "symfony-polyfill-intl-normalizer-43a0283138253ed1d48d352ab6d0bdb3f809f248";

     

       768
       768
       +
               name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8";

     

       769
       769
        
               src = fetchurl {

     

       770
       770
       -
                 url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248;

     

       771
       771
       -
                 sha256 = "04irkl6aks8zyfy17ni164060liihfyraqm1fmpjbs5hq0b14sc9";

     

       770
       770
       +
                 url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8;

     

       771
       771
       +
                 sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3";

     

       772
       772
        
               };

     

       773
       773
        
             };

     

       774
       774
        
           };

     

       775
       775
        
           "symfony/polyfill-mbstring" = {

     

       776
       776
        
             targetDir = "";

     

       777
       777
        
             src = composerEnv.buildZipPackage {

     

       778
       778
       -
               name = "symfony-polyfill-mbstring-5232de97ee3b75b0360528dae24e73db49566ab1";

     

       778
       778
       +
               name = "symfony-polyfill-mbstring-2df51500adbaebdc4c38dea4c89a2e131c45c8a1";

     

       779
       779
        
               src = fetchurl {

     

       780
       780
       -
                 url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1;

     

       781
       781
       -
                 sha256 = "1mm670fxj2x72a9mbkyzs3yifpp6glravq2ss438bags1xf6psz8";

     

       780
       780
       +
                 url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1;

     

       781
       781
       +
                 sha256 = "1fbi13p4a6nn01ix3gcj966kq6z8qx03li4vbjylsr9ac2mgnmnn";

     

       782
       782
        
               };

     

       783
       783
        
             };

     

       784
       784
        
           };

     

       785
       785
        
           "symfony/polyfill-php72" = {

     

       786
       786
        
             targetDir = "";

     

       787
       787
        
             src = composerEnv.buildZipPackage {

     

       788
       788
       -
               name = "symfony-polyfill-php72-cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9";

     

       788
       788
       +
               name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976";

     

       789
       789
        
               src = fetchurl {

     

       790
       790
       -
                 url = https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9;

     

       791
       791
       -
                 sha256 = "12dmz2n1b9pqqd758ja0c8h8h5dxdai5ik74iwvaxc5xn86a026b";

     

       790
       790
       +
                 url = https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976;

     

       791
       791
       +
                 sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b";

     

       792
       792
        
               };

     

       793
       793
        
             };

     

       794
       794
        
           };

     

       795
       795
        
           "symfony/polyfill-php73" = {

     

       796
       796
        
             targetDir = "";

     

       797
       797
        
             src = composerEnv.buildZipPackage {

     

       798
       798
       -
               name = "symfony-polyfill-php73-a678b42e92f86eca04b7fa4c0f6f19d097fb69e2";

     

       798
       798
       +
               name = "symfony-polyfill-php73-fba8933c384d6476ab14fb7b8526e5287ca7e010";

     

       799
       799
        
               src = fetchurl {

     

       800
       800
       -
                 url = https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2;

     

       801
       801
       -
                 sha256 = "10rq2x2q9hsdzskrz0aml5qcji27ypxam324044fi24nl60fyzg0";

     

       800
       800
       +
                 url = https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010;

     

       801
       801
       +
                 sha256 = "0fc1d60iw8iar2zcvkzwdvx0whkbw8p6ll0cry39nbkklzw85n1h";

     

       802
       802
        
               };

     

       803
       803
        
             };

     

       804
       804
        
           };

     

       805
       805
        
           "symfony/polyfill-php80" = {

     

       806
       806
        
             targetDir = "";

     

       807
       807
        
             src = composerEnv.buildZipPackage {

     

       808
       808
       -
               name = "symfony-polyfill-php80-dc3063ba22c2a1fd2f45ed856374d79114998f91";

     

       808
       808
       +
               name = "symfony-polyfill-php80-eca0bf41ed421bed1b57c4958bab16aa86b757d0";

     

       809
       809
        
               src = fetchurl {

     

       810
       810
       -
                 url = https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91;

     

       811
       811
       -
                 sha256 = "1mhfjibk7mqyzlqpz6jjpxpd93fnfw0nik140x3mq1d2blg5cbvd";

     

       810
       810
       +
                 url = https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0;

     

       811
       811
       +
                 sha256 = "1y5kc4vqh920wyjdlgxp23b958g5i9mw10mhbr30vf8j20vf1gra";

     

       812
       812
        
               };

     

       813
       813
        
             };

     

       814
       814
        
           };

     
···

       825
       825
        
           "symfony/routing" = {

     

       826
       826
        
             targetDir = "";

     

       827
       827
        
             src = composerEnv.buildZipPackage {

     

       828
       828
       -
               name = "symfony-routing-049e7c5c41f98511959668791b4adc0898a821b3";

     

       828
       828
       +
               name = "symfony-routing-b42c3631fd9e3511610afb2ba081ea7e38d9fa38";

     

       829
       829
        
               src = fetchurl {

     

       830
       830
       -
                 url = https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3;

     

       831
       831
       -
                 sha256 = "1557bvcmxpa7hmcvwl9qf94l7n9x0y7xw2k3s8v85ys35fi54clw";

     

       830
       830
       +
                 url = https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38;

     

       831
       831
       +
                 sha256 = "167lvg9n8qvgkz7hgx8hv7a53j4shqiriir03g5qz7zhvddlk7vp";

     

       832
       832
        
               };

     

       833
       833
        
             };

     

       834
       834
        
           };

     
···

       845
       845
        
           "symfony/translation" = {

     

       846
       846
        
             targetDir = "";

     

       847
       847
        
             src = composerEnv.buildZipPackage {

     

       848
       848
       -
               name = "symfony-translation-eb8f5428cc3b40d6dffe303b195b084f1c5fbd14";

     

       848
       848
       +
               name = "symfony-translation-424d29dfcc15575af05196de0100d7b52f650602";

     

       849
       849
        
               src = fetchurl {

     

       850
       850
       -
                 url = https://api.github.com/repos/symfony/translation/zipball/eb8f5428cc3b40d6dffe303b195b084f1c5fbd14;

     

       851
       851
       -
                 sha256 = "0x80ijdhpfv9is847pp09jlr0g0hwg9sil95jknil7dgx5pjsa5z";

     

       850
       850
       +
                 url = https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602;

     

       851
       851
       +
                 sha256 = "0fpbhbiix0yqvbq5iv5wy7b37wsfgnsay0g1292s339dil60i6a6";

     

       852
       852
        
               };

     

       853
       853
        
             };

     

       854
       854
        
           };

+3 -3

pkgs/shells/nushell/default.nix

···

       17
       17
        
       

     

       18
       18
        
       rustPlatform.buildRustPackage rec {

     

       19
       19
        
         pname = "nushell";

     

       20
       20
       -
         version = "0.31.0";

     

       20
       20
       +
         version = "0.32.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = pname;

     

       24
       24
        
           repo = pname;

     

       25
       25
        
           rev = version;

     

       26
       26
       -
           sha256 = "1dpbc6m0pxizkh4r02nw1i1fx9v43llylqnd28naqkklwc15pb2w";

     

       26
       26
       +
           sha256 = "1wj054rzv88ys4ask4zp7crrw0dxrck8svlj3i16qqd8x5dnyhqs";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         cargoSha256 = "1znqac3s48ah9a7zpqdgw0lvvhklryj2j7mym65myzjbn1g264rm";

     

       29
       29
       +
         cargoSha256 = "09ph3njll9assk85yh5pyvpsab3nk0mvxrdpqhy5rwps1478w0cq";

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ pkg-config ]

     

       32
       32
        
           ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

+1 -1

pkgs/tools/X11/caffeine-ng/default.nix

···

       14
       14
        
         nativeBuildInputs = [ wrapGAppsHook glib ];

     

       15
       15
        
         buildInputs = [

     

       16
       16
        
           gdk-pixbuf gobject-introspection libnotify gtk3

     

       17
       17
       -
           python3Packages.setuptools_scm

     

       17
       17
       +
           python3Packages.setuptools-scm

     

       18
       18
        
         ];

     

       19
       19
        
         pythonPath = with python3Packages; [

     

       20
       20
        
           dbus-python docopt ewmh pygobject3 pyxdg

+3 -3

pkgs/tools/admin/google-cloud-sdk/default.nix

···

       21
       21
        
         sources = name: system: {

     

       22
       22
        
           x86_64-darwin = {

     

       23
       23
        
             url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";

     

       24
       24
       -
             sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d";

     

       24
       24
       +
             sha256 = "1mrhzg07dm11dirxhwdpxz9rch65z631abss0khdi944l3zv8lq4";

     

       25
       25
        
           };

     

       26
       26
        
       

     

       27
       27
        
           x86_64-linux = {

     

       28
       28
        
             url = "${baseUrl}/${name}-linux-x86_64.tar.gz";

     

       29
       29
       -
             sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj";

     

       29
       29
       +
             sha256 = "0m8zbjzr9a4f13z4szhqs5296lmyqrfmxr7pyvy8mrap3fqxvv02";

     

       30
       30
        
           };

     

       31
       31
        
         }.${system};

     

       32
       32
        
       

     

       33
       33
        
       in stdenv.mkDerivation rec {

     

       34
       34
        
         pname = "google-cloud-sdk";

     

       35
       35
       -
         version = "340.0.0";

     

       35
       35
       +
         version = "342.0.0";

     

       36
       36
        
       

     

       37
       37
        
         src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);

     

       38
       38

+3 -11

pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch

···

       1
       1
        
       diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py

     

       2
       2
       -
       index 06ca5e5..4a4e225 100644

     

       2
       2
       +
       index f490bb3..dc6bbcc 100644

     

       3
       3
        
       --- a/platform/gsutil/gslib/command_runner.py

     

       4
       4
        
       +++ b/platform/gsutil/gslib/command_runner.py

     

       5
       5
       -
       @@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue

     

       6
       6
       -
        from gslib.utils.text_util import print_to_fd

     

       7
       7
       -
        from gslib.utils.unit_util import SECONDS_PER_DAY

     

       8
       8
       -
        from gslib.utils.update_util import LookUpGsutilVersion

     

       9
       9
       -
       -from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST

     

       10
       10
       -
        

     

       11
       11
       -
        

     

       12
       12
       -
        def HandleHeaderCoding(headers):

     

       13
       13
       -
       @@ -331,17 +330,6 @@ class CommandRunner(object):

     

       5
       5
       +
       @@ -330,17 +330,6 @@ class CommandRunner(object):

     

       14
       6
        
            Returns:

     

       15
       7
        
              Return value(s) from Command that was run.

     

       16
       8
        
            """

     
···

       28
       20
        
            if not args:

     

       29
       21
        
              args = []

     

       30
       22
        
        

     

       31
       31
       -
       @@ -414,18 +402,10 @@ class CommandRunner(object):

     

       23
       23
       +
       @@ -413,18 +402,10 @@ class CommandRunner(object):

     

       32
       24
        
              ShutDownGsutil()

     

       33
       25
        
            if GetFailureCount() > 0:

     

       34
       26
        
              return_code = 1

+1 -1

pkgs/tools/admin/salt/pepper/default.nix

···

       11
       11
        
           sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = with python3Packages; [ setuptools setuptools_scm salt ];

     

       14
       14
       +
         buildInputs = with python3Packages; [ setuptools setuptools-scm salt ];

     

       15
       15
        
         checkInputs = with python3Packages; [

     

       16
       16
        
           pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado

     

       17
       17
        
         ];

+1 -1

pkgs/tools/admin/simp_le/default.nix

···

       20
       20
        
           $out/bin/simp_le --test

     

       21
       21
        
         '';

     

       22
       22
        
       

     

       23
       23
       -
         propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];

     

       23
       23
       +
         propagatedBuildInputs = with python3Packages; [ acme setuptools-scm josepy idna ];

     

       24
       24
        
       

     

       25
       25
        
         checkInputs = with python3Packages; [ mock ];

     

       26
       26

+1 -1

pkgs/tools/misc/adafruit-ampy/default.nix

···

       11
       11
        
           sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       14
       14
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       15
       15
        
         propagatedBuildInputs = [ click python-dotenv pyserial ];

     

       16
       16
        
       

     

       17
       17
        
         # No tests

+1 -1

pkgs/tools/misc/bepasty/default.nix

···

       36
       36
        
           xstatic-pygments

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       -
         buildInputs = [ setuptools_scm ];

     

       39
       39
       +
         buildInputs = [ setuptools-scm ];

     

       40
       40
        
       

     

       41
       41
        
         src = fetchPypi {

     

       42
       42
        
           inherit pname version;

+48

pkgs/tools/misc/dgoss/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , resholvePackage

     

       4
       4
       +
       , substituteAll

     

       5
       5
       +
       , bash

     

       6
       6
       +
       , coreutils

     

       7
       7
       +
       , goss

     

       8
       8
       +
       , which

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       resholvePackage rec {

     

       12
       12
       +
         pname = "dgoss";

     

       13
       13
       +
         version = "0.3.16";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "aelsabbahy";

     

       17
       17
       +
           repo = "goss";

     

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

     

       19
       19
       +
           sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         dontConfigure = true;

     

       23
       23
       +
         dontBuild = true;

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = ''

     

       26
       26
       +
           sed -i '2i GOSS_PATH=${goss}/bin/goss' extras/dgoss/dgoss

     

       27
       27
       +
           install -D extras/dgoss/dgoss $out/bin/dgoss

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         solutions = {

     

       31
       31
       +
           default = {

     

       32
       32
       +
             scripts = [ "bin/dgoss" ];

     

       33
       33
       +
             interpreter = "${bash}/bin/bash";

     

       34
       34
       +
             inputs = [ coreutils which ];

     

       35
       35
       +
             fake = {

     

       36
       36
       +
               external = [ "docker" ];

     

       37
       37
       +
             };

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           homepage = "https://github.com/aelsabbahy/goss/blob/v${version}/extras/dgoss/README.md";

     

       43
       43
       +
           description = "Convenience wrapper around goss that aims to bring the simplicity of goss to docker containers";

     

       44
       44
       +
           license = licenses.asl20;

     

       45
       45
       +
           platforms = platforms.linux;

     

       46
       46
       +
           maintainers = with maintainers; [ hyzual ];

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+2 -2

pkgs/tools/misc/fortune/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "fortune-mod";

     

       5
       5
       -
         version = "3.4.1";

     

       5
       5
       +
         version = "3.6.1";

     

       6
       6
        
       

     

       7
       7
        
         # We use fetchurl instead of fetchFromGitHub because the release pack has some

     

       8
       8
        
         # special files.

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";

     

       11
       11
       -
           sha256 = "02hjf432mq5qpbf1hywid7b356jys5n9brrrmm6z6r05jpzybbg3";

     

       11
       11
       +
           sha256 = "1cw7xf9xhh6d73y4h4q57g6akjhc1gq6xv37k57sx0wx77wjxqdp";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake perl ];

+6 -6

pkgs/tools/misc/kalk/default.nix pkgs/tools/misc/kalker/default.nix

···

       4
       4
        
       , rustPlatform

     

       5
       5
        
       }:

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
       -
         pname = "kalk";

     

       8
       8
       -
         version = "0.5.4";

     

       7
       7
       +
         pname = "kalker";

     

       8
       8
       +
         version = "1.0.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "PaddiM8";

     

       12
       12
        
           repo = pname;

     

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

     

       14
       14
       -
           sha256 = "sha256-lHHnNiNy8L8GdjOj5EqtticnksPrCwhFoFatFrWEQJ4=";

     

       14
       14
       +
           sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoSha256 = "sha256-Qtip9CeurTM4aY67F5tSM3fis6W/dlnaIVMQ29UoBzc=";

     

       17
       17
       +
         cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58=";

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [ m4 ];

     

       20
       20
        
       

     
···

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
        
         meta = with lib; {

     

       28
       28
       -
           homepage = "https://kalk.strct.net";

     

       29
       29
       -
           changelog = "https://github.com/PaddiM8/kalk/releases/tag/v${version}";

     

       28
       28
       +
           homepage = "https://kalker.strct.net";

     

       29
       29
       +
           changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}";

     

       30
       30
        
           description = "A command line calculator";

     

       31
       31
        
           longDescription = ''

     

       32
       32
        
             A command line calculator that supports math-like syntax with user-defined

+26

pkgs/tools/misc/mutt-wizard/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenvNoCC

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenvNoCC.mkDerivation rec {

     

       7
       7
       +
         pname = "mutt-wizard";

     

       8
       8
       +
         version = "3.2.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "LukeSmithxyz";

     

       12
       12
       +
           repo = "mutt-wizard";

     

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

     

       14
       14
       +
           sha256 = "1m4s0vj57hh38rdgdc28p10vnsq80dh708imvdgxbj1i96nq41r8";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         makeFlags = [ "PREFIX=$(out)" ];

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "System for automatically configuring mutt and isync";

     

       21
       21
       +
           homepage = "https://github.com/LukeSmithxyz/mutt-wizard";

     

       22
       22
       +
           license = licenses.gpl3Plus;

     

       23
       23
       +
           maintainers = with maintainers; [ shamilton ];

     

       24
       24
       +
           platforms = platforms.unix;

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+31

pkgs/tools/misc/nvfancontrol/default.nix

···

       1
       1
       +
       { lib, rustPlatform, fetchFromGitHub, libXNVCtrl, libX11, libXext }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "nvfancontrol";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "foucault";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis=";

     

       15
       15
       +
       

     

       16
       16
       +
         nativeBuildInputs = [ libXNVCtrl libX11 libXext ];

     

       17
       17
       +
       

     

       18
       18
       +
         # Needed for static linking

     

       19
       19
       +
         preConfigure = ''

     

       20
       20
       +
           export LIBRARY_PATH=${libXNVCtrl}/lib:${libX11}/lib:${libXext}/lib

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         meta = with lib; {

     

       24
       24
       +
           description = "NVidia dynamic fan control for Linux";

     

       25
       25
       +
           homepage = "https://github.com/foucault/nvfancontrol";

     

       26
       26
       +
           changelog = "https://github.com/foucault/nvfancontrol/releases/tag/${version}";

     

       27
       27
       +
           license = with licenses; [ gpl3Only ];

     

       28
       28
       +
           platforms = platforms.linux;

     

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

     

       30
       30
       +
         };

     

       31
       31
       +
       }

pkgs/tools/networking/innernet/default.nix

···

       24
       24
        
         postInstall = ''

     

       25
       25
        
           installManPage doc/innernet-server.8.gz

     

       26
       26
        
           installManPage doc/innernet.8.gz

     

       27
       27
       +
           installShellCompletion doc/innernet.completions.{bash,fish,zsh}

     

       28
       28
       +
           installShellCompletion doc/innernet-server.completions.{bash,fish,zsh}

     

       27
       29
        
         '';

     

       28
       30
        
       

     

       29
       31
        
         doInstallCheck = true;

+2 -2

pkgs/tools/networking/kapp/default.nix

···

       1
       1
        
       { lib, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       buildGoModule rec {

     

       3
       3
        
         pname = "kapp";

     

       4
       4
       -
         version = "0.36.0";

     

       4
       4
       +
         version = "0.37.0";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
        
           owner = "vmware-tanzu";

     

       8
       8
        
           repo = "carvel-kapp";

     

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

     

       10
       10
       -
           sha256 = "sha256-hYKRfAnpHw8hHT70sOQSGlDj0dgzU0wlZpXA5f2BBfg=";

     

       10
       10
       +
           sha256 = "sha256-SxS6KBiKc68PcRycdVDWWfXBKOJvo7GuG/0dUQGcHsg=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         vendorSha256 = null;

+2 -2

pkgs/tools/package-management/protontricks/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonApplication

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , setuptools_scm

     

       4
       4
       +
       , setuptools-scm

     

       5
       5
        
       , vdf

     

       6
       6
        
       , bash

     

       7
       7
        
       , steam-run

     
···

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       30
       30
       -
         nativeBuildInputs = [ setuptools_scm ];

     

       30
       30
       +
         nativeBuildInputs = [ setuptools-scm ];

     

       31
       31
        
         propagatedBuildInputs = [ vdf ];

     

       32
       32
        
       

     

       33
       33
        
         makeWrapperArgs = [

+1 -1

pkgs/tools/package-management/reuse/default.nix

···

       19
       19
        
           license-expression

     

       20
       20
        
           requests

     

       21
       21
        
           setuptools

     

       22
       22
       -
           setuptools_scm

     

       22
       22
       +
           setuptools-scm

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         checkInputs = with python3Packages; [ pytestCheckHook ];

+3 -3

pkgs/tools/security/dnsx/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "dnsx";

     

       8
       8
       -
         version = "1.0.3";

     

       8
       8
       +
         version = "1.0.4";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "projectdiscovery";

     

       12
       12
        
           repo = "dnsx";

     

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

     

       14
       14
       -
           sha256 = "sha256-k71Pw6XdOFMUf7w7QAAxqQkmkCINl+3KApkIPRyAQLM=";

     

       14
       14
       +
           sha256 = "sha256-dfjchsmGqyWLxO2sP+TlBEeKz9Fd4bHWG2r4FJPGNMs=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-YA0XZSXmpAcNEFutrBbQE8DN7v5hcva0fscemEMLewU=";

     

       17
       17
       +
         vendorSha256 = "sha256-KJyWb+coWSdvZGwDw/JSLtPeynndnaevwyYIzyEH4Kc=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Fast and multi-purpose DNS toolkit";

+2 -2

pkgs/tools/security/libtpms/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "libtpms";

     

       10
       10
       -
         version = "0.8.2";

     

       10
       10
       +
         version = "0.8.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "stefanberger";

     

       14
       14
        
           repo = "libtpms";

     

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

     

       16
       16
       -
           sha256 = "sha256-ljzxaZYC2RzasKoRvnjead8CEkbdptGD4V5QapvAQUQ=";

     

       16
       16
       +
           sha256 = "sha256-D6lYOVlgtBY6C07YqbG6TPnDKrUoEj82Ra6GK/HB7X8=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+1 -1

pkgs/tools/security/sshuttle/default.nix

···

       19
       19
        
       

     

       20
       20
        
         patches = [ ./sudo.patch ];

     

       21
       21
        
       

     

       22
       22
       -
         nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ];

     

       22
       22
       +
         nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ];

     

       23
       23
        
       

     

       24
       24
        
         checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ];

     

       25
       25

+1 -1

pkgs/tools/text/ocrmypdf/default.nix

···

       43
       43
        
         nativeBuildInputs = with python3Packages; [

     

       44
       44
        
           setuptools

     

       45
       45
        
           setuptools-scm-git-archive

     

       46
       46
       -
           setuptools_scm

     

       46
       46
       +
           setuptools-scm

     

       47
       47
        
         ];

     

       48
       48
        
       

     

       49
       49
        
         propagatedBuildInputs = with python3Packages; [

+2 -2

pkgs/tools/virtualization/shipyard/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "shipyard";

     

       5
       5
       -
         version = "0.3.1";

     

       5
       5
       +
         version = "0.3.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

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

     

       9
       9
        
           owner = "shipyard-run";

     

       10
       10
        
           repo = pname;

     

       11
       11
       -
           sha256 = "sha256-zN9anlm+KbSbFKphC8mLaK+w8cOuOSKrVw5YGNCjEeA=";

     

       11
       11
       +
           sha256 = "sha256-9eGaOSmHrJlcLOvZuLaNu8D/D/rWiyFb4ztxybUP0uM=";

     

       12
       12
        
         };

     

       13
       13
        
         vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA=";

     

       14
       14

pkgs/top-level/aliases.nix

···

       340
       340
        
         jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";

     

       341
       341
        
         joseki = apache-jena-fuseki; # added 2016-02-28

     

       342
       342
        
         json_glib = json-glib; # added 2018-02-25

     

       343
       343
       +
         kalk = kalker; # added 2021-06-03

     

       343
       344
        
         kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16

     

       344
       345
        
         k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06

     

       345
       346
        
         kodiGBM = kodi-gbm;

+12 -2

pkgs/top-level/all-packages.nix

···

       1406
       1406
        
       

     

       1407
       1407
        
         cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };

     

       1408
       1408
        
       

     

       1409
       1409
       +
         deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };

     

       1410
       1410
       +
       

     

       1409
       1411
        
         deltachat-electron = callPackage

     

       1410
       1412
        
           ../applications/networking/instant-messengers/deltachat-electron { };

     

       1411
       1413
        
       

     
···

       2395
       2397
        
       

     

       2396
       2398
        
         ioport = callPackage ../os-specific/linux/ioport {};

     

       2397
       2399
        
       

     

       2400
       2400
       +
         dgoss = callPackage ../tools/misc/dgoss { };

     

       2401
       2401
       +
       

     

       2398
       2402
        
         diagrams-builder = callPackage ../tools/graphics/diagrams-builder {

     

       2399
       2403
        
           inherit (haskellPackages) ghcWithPackages diagrams-builder;

     

       2400
       2404
        
         };

     
···

       2845
       2849
        
       

     

       2846
       2850
        
         kaldi = callPackage ../tools/audio/kaldi { };

     

       2847
       2851
        
       

     

       2848
       2848
       -
         kalk = callPackage ../tools/misc/kalk { };

     

       2852
       2852
       +
         kalker = callPackage ../tools/misc/kalker { };

     

       2849
       2853
        
       

     

       2850
       2854
        
         kisslicer = callPackage ../tools/misc/kisslicer { };

     

       2851
       2855
        
       

     
···

       7300
       7304
        
         nuttcp = callPackage ../tools/networking/nuttcp { };

     

       7301
       7305
        
       

     

       7302
       7306
        
         nssmdns = callPackage ../tools/networking/nss-mdns { };

     

       7307
       7307
       +
       

     

       7308
       7308
       +
         nvfancontrol = callPackage ../tools/misc/nvfancontrol {

     

       7309
       7309
       +
           libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;

     

       7310
       7310
       +
         };

     

       7303
       7311
        
       

     

       7304
       7312
        
         nvimpager = callPackage ../tools/misc/nvimpager { };

     

       7305
       7313
        
       

     
···

       19793
       19801
        
           enableDomainController = true;

     

       19794
       19802
        
           enableRegedit = true;

     

       19795
       19803
        
           enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64;

     

       19796
       19796
       -
           enableGlusterFS = true;

     

       19797
       19804
        
         });

     

       19798
       19805
        
       

     

       19799
       19806
        
         sambaFull = samba4Full;

     
···

       25364
       25371
        
         mutt-with-sidebar = mutt.override {

     

       25365
       25372
        
           withSidebar = true;

     

       25366
       25373
        
         };

     

       25374
       25374
       +
         mutt-wizard = callPackage ../tools/misc/mutt-wizard { };

     

       25367
       25375
        
       

     

       25368
       25376
        
         mwic = callPackage ../applications/misc/mwic {

     

       25369
       25377
        
           pythonPackages = python3Packages;

     
···

       25376
       25384
        
         neomutt = callPackage ../applications/networking/mailreaders/neomutt { };

     

       25377
       25385
        
       

     

       25378
       25386
        
         natron = callPackage ../applications/video/natron { };

     

       25387
       25387
       +
       

     

       25388
       25388
       +
         natural-docs = callPackage ../applications/misc/natural-docs { };

     

       25379
       25389
        
       

     

       25380
       25390
        
         neocomp  = callPackage ../applications/window-managers/neocomp { };

     

       25381
       25391

+2 -1

pkgs/top-level/python-aliases.nix

···

       36
       36
        
         smart_open = smart-open; # added 2021-03-14

     

       37
       37
        
         google_api_python_client = google-api-python-client; # added 2021-03-19

     

       38
       38
        
         googleapis_common_protos = googleapis-common-protos; # added 2021-03-19

     

       39
       39
       -
         MechanicalSoup = mechanicalsoup;  # added 2021-06-01

     

       39
       39
       +
         MechanicalSoup = mechanicalsoup; # added 2021-06-01

     

       40
       40
       +
         setuptools_scm = setuptools-scm; # added 2021-06-03

     

       40
       41
        
       })

+1 -2

pkgs/top-level/python-packages.nix

···

       7624
       7624
        
       

     

       7625
       7625
        
         setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };

     

       7626
       7626
        
       

     

       7627
       7627
       -
         setuptools-scm = self.setuptools_scm; # added 2021-01-04

     

       7628
       7628
       -
         setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };

     

       7627
       7627
       +
         setuptools-scm = callPackage ../development/python-modules/setuptools-scm { };

     

       7629
       7628
        
       

     

       7630
       7629
        
         setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };

     

       7631
       7630

+1 -1

pkgs/top-level/python2-packages.nix

···

       548
       548
        
       

     

       549
       549
        
         setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { };

     

       550
       550
        
       

     

       551
       551
       -
         setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { };

     

       551
       551
       +
         setuptools-scm = callPackage ../development/python-modules/setuptools-scm/2.nix { };

     

       552
       552
        
       

     

       553
       553
        
         setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { };

     

       554
       554