commit d471c5d1f3f2ea49adc0e3673a081a19ad43e7a8 · pyrox.dev/nixpkgs

+6 -6

doc/builders/images/dockertools.xml

···

       132
       132
        
          <para>

     

       133
       133
        
           By default <function>buildImage</function> will use a static date of one second past the UNIX Epoch. This allows <function>buildImage</function> to produce binary reproducible images. When listing images with <command>docker images</command>, the newly created images will be listed like this:

     

       134
       134
        
          </para>

     

       135
       135
       -
       <screen><![CDATA[

     

       136
       136
       -
       $ docker images

     

       135
       135
       +
       <screen>

     

       136
       136
       +
       <prompt>$ </prompt>docker images

     

       137
       137
        
       REPOSITORY   TAG      IMAGE ID       CREATED        SIZE

     

       138
       138
        
       hello        latest   08c791c7846e   48 years ago   25.2MB

     

       139
       139
       -
       ]]></screen>

     

       139
       139
       +
       </screen>

     

       140
       140
        
          <para>

     

       141
       141
        
           You can break binary reproducibility but have a sorted, meaningful <literal>CREATED</literal> column by setting <literal>created</literal> to <literal>now</literal>.

     

       142
       142
        
          </para>

     
···

       152
       152
        
       ]]></programlisting>

     

       153
       153
        
          <para>

     

       154
       154
        
           and now the Docker CLI will display a reasonable date and sort the images as expected:

     

       155
       155
       -
       <screen><![CDATA[

     

       156
       156
       -
       $ docker images

     

       155
       155
       +
       <screen>

     

       156
       156
       +
       <prompt>$ </prompt>docker images

     

       157
       157
        
       REPOSITORY   TAG      IMAGE ID       CREATED              SIZE

     

       158
       158
        
       hello        latest   de2bf4786de6   About a minute ago   25.2MB

     

       159
       159
       -
       ]]></screen>

     

       159
       159
       +
       </screen>

     

       160
       160
        
           however, the produced images will not be binary reproducible.

     

       161
       161
        
          </para>

     

       162
       162
        
         </example>

+1 -2

doc/builders/images/ocitools.xml

···

       38
       38
        
       

     

       39
       39
        
         readonly = false; <co xml:id='ex-ociTools-buildContainer-3' />

     

       40
       40
        
       }

     

       41
       41
       -
       

     

       42
       42
       -
           </programlisting>

     

       41
       41
       +
       </programlisting>

     

       43
       42
        
          <calloutlist>

     

       44
       43
        
           <callout arearefs='ex-ociTools-buildContainer-1'>

     

       45
       44
        
            <para>

+4 -4

doc/builders/packages/citrix.xml

···

       22
       22
        
         </para>

     

       23
       23
        
         <para>

     

       24
       24
        
          In order to set this up, you first have to <link xlink:href="https://its.uiowa.edu/support/article/102186">download the <literal>.cr</literal> file from the Netscaler Gateway</link>. After that you can configure the <command>selfservice</command> like this:

     

       25
       25
       -
          <screen>

     

       26
       26
       -
           <prompt>$ </prompt>storebrowse -C ~/Downloads/receiverconfig.cr

     

       27
       27
       -
           <prompt>$ </prompt>selfservice

     

       28
       28
       -
          </screen>

     

       25
       25
       +
       <screen>

     

       26
       26
       +
       <prompt>$ </prompt>storebrowse -C ~/Downloads/receiverconfig.cr

     

       27
       27
       +
       <prompt>$ </prompt>selfservice

     

       28
       28
       +
       </screen>

     

       29
       29
        
         </para>

     

       30
       30
        
        </section>

     

       31
       31

+32 -18

doc/builders/packages/urxvt.xml

···

       18
       18
        
          includes all available plugins. To make use of this functionality, use an

     

       19
       19
        
          overlay or directly install an expression that overrides its configuration,

     

       20
       20
        
          such as

     

       21
       21
       -
          <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {

     

       21
       21
       +
       <programlisting>

     

       22
       22
       +
       rxvt-unicode.override {

     

       23
       23
       +
         configure = { availablePlugins, ... }: {

     

       22
       24
        
           plugins = with availablePlugins; [ perls resize-font vtwheel ];

     

       23
       23
       -
         }

     

       24
       24
       -
       }</programlisting>

     

       25
       25
       +
         };

     

       26
       26
       +
       }

     

       27
       27
       +
       </programlisting>

     

       25
       28
        
          If the <literal>configure</literal> function returns an attrset without the

     

       26
       29
        
          <literal>plugins</literal> attribute, <literal>availablePlugins</literal>

     

       27
       30
        
          will be used automatically.

     
···

       30
       33
        
         <para>

     

       31
       34
        
          In order to add plugins but also keep all default plugins installed, it is

     

       32
       35
        
          possible to use the following method:

     

       33
       33
       -
          <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {

     

       34
       34
       -
            plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ];

     

       35
       35
       -
          };

     

       36
       36
       -
       }</programlisting>

     

       36
       36
       +
       <programlisting>

     

       37
       37
       +
       rxvt-unicode.override {

     

       38
       38
       +
         configure = { availablePlugins, ... }: {

     

       39
       39
       +
           plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

     

       42
       42
       +
       </programlisting>

     

       37
       43
        
         </para>

     

       38
       44
        
       

     

       39
       45
        
         <para>

     

       40
       46
        
          To get a list of all the plugins available, open the Nix REPL and run

     

       41
       41
       -
          <programlisting>$ nix repl

     

       47
       47
       +
       <screen>

     

       48
       48
       +
       <prompt>$ </prompt>nix repl

     

       42
       49
        
       :l &lt;nixpkgs&gt;

     

       43
       50
        
       map (p: p.name) pkgs.rxvt-unicode.plugins

     

       44
       44
       -
          </programlisting>

     

       51
       51
       +
       </screen>

     

       45
       52
        
          Alternatively, if your shell is bash or zsh and have completion enabled,

     

       46
       53
        
          simply type <literal>nixpkgs.rxvt-unicode.plugins.&lt;tab&gt;</literal>.

     

       47
       54
        
         </para>

     
···

       53
       60
        
           <literal>extraDeps</literal> can be used, for example, to provide

     

       54
       61
        
           <literal>xsel</literal> (a clipboard manager) to the clipboard plugin,

     

       55
       62
        
           without installing it globally:

     

       56
       56
       -
           <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {

     

       57
       57
       -
            pluginsDeps = [ xsel ];

     

       58
       58
       -
          }

     

       59
       59
       -
       }</programlisting>

     

       63
       63
       +
       <programlisting>

     

       64
       64
       +
       rxvt-unicode.override {

     

       65
       65
       +
         configure = { availablePlugins, ... }: {

     

       66
       66
       +
           pluginsDeps = [ xsel ];

     

       67
       67
       +
         };

     

       68
       68
       +
       }

     

       69
       69
       +
       </programlisting>

     

       60
       70
        
       

     

       61
       71
        
           <literal>perlDeps</literal> is a handy way to provide Perl packages to

     

       62
       72
        
           your custom plugins (in <literal>$HOME/.urxvt/ext</literal>). For example,

     

       63
       73
        
           if you need <literal>AnyEvent</literal> you can do:

     

       64
       64
       -
           <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: {

     

       65
       65
       -
            perlDeps = with perlPackages; [ AnyEvent ];

     

       66
       66
       -
          }

     

       67
       67
       -
       }</programlisting>

     

       74
       74
       +
       <programlisting>

     

       75
       75
       +
       rxvt-unicode.override {

     

       76
       76
       +
         configure = { availablePlugins, ... }: {

     

       77
       77
       +
           perlDeps = with perlPackages; [ AnyEvent ];

     

       78
       78
       +
         };

     

       79
       79
       +
       }

     

       80
       80
       +
       </programlisting>

     

       68
       81
        
         </para>

     

       69
       82
        
       

     

       70
       83
        
        </section>

     
···

       90
       103
        
         <para>

     

       91
       104
        
          If the plugin is itself a perl package that needs to be imported from

     

       92
       105
        
          other plugins or scripts, add the following passthrough:

     

       93
       93
       -
          <programlisting>passthru.perlPackages = [ "self" ];

     

       106
       106
       +
       <programlisting>

     

       107
       107
       +
       passthru.perlPackages = [ "self" ];

     

       94
       108
        
       </programlisting>

     

       95
       109
        
          This will make the urxvt wrapper pick up the dependency and set up the perl

     

       96
       110
        
          path accordingly.

+6 -6

doc/contributing/submitting-changes.xml

···

       209
       209
        
         </para>

     

       210
       210
        
       

     

       211
       211
        
       <programlisting>

     

       212
       212
       -
          (fetchpatch {

     

       213
       213
       -
            name = "CVE-2019-11068.patch";

     

       214
       214
       -
            url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";

     

       215
       215
       -
            sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";

     

       216
       216
       -
          })

     

       217
       217
       -
         </programlisting>

     

       212
       212
       +
       (fetchpatch {

     

       213
       213
       +
         name = "CVE-2019-11068.patch";

     

       214
       214
       +
         url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";

     

       215
       215
       +
         sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";

     

       216
       216
       +
       })

     

       217
       217
       +
       </programlisting>

     

       218
       218
        
       

     

       219
       219
        
         <para>

     

       220
       220
        
          If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch.

+3 -3

doc/languages-frameworks/beam.xml

···

       72
       72
        
          To install any of those builders into your profile, refer to them by their attribute path <literal>beamPackages.rebar3</literal>:

     

       73
       73
        
         </para>

     

       74
       74
        
       

     

       75
       75
       -
         <screen>

     

       76
       76
       -
         <prompt>$ </prompt>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.rebar3

     

       77
       77
       -
         </screen>

     

       75
       75
       +
       <screen>

     

       76
       76
       +
       <prompt>$ </prompt>nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.rebar3

     

       77
       77
       +
       </screen>

     

       78
       78
        
       </section>

     

       79
       79
        
       

     

       80
       80
        
        <section xml:id="packaging-beam-applications">

+69 -45

doc/languages-frameworks/go.xml

···

       38
       38
        
       

     

       39
       39
        
         vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; <co xml:id='ex-buildGoModule-1' />

     

       40
       40
        
       

     

       41
       41
       -
         subPackages = [ "." ]; <co xml:id='ex-buildGoModule-2' />

     

       42
       42
       -
       

     

       43
       43
       -
         deleteVendor = true; <co xml:id='ex-buildGoModule-3' />

     

       44
       44
       -
       

     

       45
       45
       -
         runVend = true; <co xml:id='ex-buildGoModule-4' />

     

       41
       41
       +
         runVend = true; <co xml:id='ex-buildGoModule-2' />

     

       46
       42
        
       

     

       47
       43
        
         meta = with lib; {

     

       48
       44
        
           description = "Simple command-line snippet manager, written in Go";

     
···

       65
       61
        
           </callout>

     

       66
       62
        
           <callout arearefs='ex-buildGoModule-2'>

     

       67
       63
        
            <para>

     

       68
       68
       -
             <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.

     

       69
       69
       -
            </para>

     

       70
       70
       -
           </callout>

     

       71
       71
       -
           <callout arearefs='ex-buildGoModule-3'>

     

       72
       72
       -
            <para>

     

       73
       73
       -
             <varname>deleteVendor</varname> removes the pre-existing vendor directory and fetches the dependencies. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

     

       74
       74
       -
            </para>

     

       75
       75
       -
           </callout>

     

       76
       76
       -
           <callout arearefs='ex-buildGoModule-4'>

     

       77
       77
       -
            <para>

     

       78
       64
        
             <varname>runVend</varname> runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build.

     

       79
       65
        
            </para>

     

       80
       66
        
           </callout>

     
···

       82
       68
        
         </para>

     

       83
       69
        
       

     

       84
       70
        
         <para>

     

       85
       85
       -
           <varname>vendorSha256</varname> can also take <varname>null</varname> as an input.

     

       86
       86
       -
       

     

       87
       87
       -
           When `null` is used as a value, rather than fetching the dependencies

     

       88
       88
       -
           and vendoring them, we use the vendoring included within the source repo.

     

       89
       89
       -
           If you'd like to not have to update this field on dependency changes,

     

       90
       90
       -
           run `go mod vendor` in your source repo and set 'vendorSha256 = null;'

     

       71
       71
       +
          <varname>vendorSha256</varname> can also take <varname>null</varname> as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;'

     

       91
       72
        
         </para>

     

       92
       73
        
        </section>

     

       93
       74
        
       

     
···

       106
       87
        
         version = "1.13.0";

     

       107
       88
        
       

     

       108
       89
        
         goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' />

     

       109
       109
       -
         subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' />

     

       110
       90
        
       

     

       111
       91
        
         src = fetchFromGitHub {

     

       112
       92
        
           owner = "deis";

     
···

       115
       95
        
           sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";

     

       116
       96
        
         };

     

       117
       97
        
       

     

       118
       118
       -
         goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-3' />

     

       119
       119
       -
       

     

       120
       120
       -
         deleteVendor = true; <co xml:id='ex-buildGoPackage-4' />

     

       121
       121
       -
       

     

       122
       122
       -
         buildFlags = [ "--tags" "release" ]; <co xml:id='ex-buildGoPackage-5' />

     

       98
       98
       +
         goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-2' />

     

       123
       99
        
       }

     

       124
       100
        
       </programlisting>

     

       125
       101
        
         </example>

     
···

       134
       110
        
           </callout>

     

       135
       111
        
           <callout arearefs='ex-buildGoPackage-2'>

     

       136
       112
        
            <para>

     

       137
       137
       -
             <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.

     

       138
       138
       -
            </para>

     

       139
       139
       -
            <para>

     

       140
       140
       -
             In this example only <literal>github.com/deis/deis/client</literal> will be built.

     

       141
       141
       -
            </para>

     

       142
       142
       -
           </callout>

     

       143
       143
       -
           <callout arearefs='ex-buildGoPackage-3'>

     

       144
       144
       -
            <para>

     

       145
       113
        
             <varname>goDeps</varname> is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate <varname>deps.nix</varname> file for readability. The dependency data structure is described below.

     

       146
       146
       -
            </para>

     

       147
       147
       -
           </callout>

     

       148
       148
       -
           <callout arearefs='ex-buildGoPackage-4'>

     

       149
       149
       -
            <para>

     

       150
       150
       -
             <varname>deleteVendor</varname> removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

     

       151
       151
       -
            </para>

     

       152
       152
       -
           </callout>

     

       153
       153
       -
           <callout arearefs='ex-buildGoPackage-5'>

     

       154
       154
       -
            <para>

     

       155
       155
       -
             <varname>buildFlags</varname> is a list of flags passed to the go build command.

     

       156
       114
        
            </para>

     

       157
       115
        
           </callout>

     

       158
       116
        
          </calloutlist>

     
···

       220
       178
        
       done

     

       221
       179
        
       </screen>

     

       222
       180
        
         </para>

     

       181
       181
       +
        </section>

     

       182
       182
       +
       

     

       183
       183
       +
        <section xml:id="ssec-go-common-attributes">

     

       184
       184
       +
         <title>Attributes used by the builders</title>

     

       185
       185
       +
       

     

       186
       186
       +
         <para>

     

       187
       187
       +
          Both <link xlink:href="#ssec-go-modules"><varname>buildGoModule</varname></link> and <link xlink:href="#ssec-go-modules"><varname>buildGoPackage</varname></link> can be tweaked to behave slightly differently, if the following attributes are used:

     

       188
       188
       +
         </para>

     

       189
       189
       +
       

     

       190
       190
       +
         <variablelist>

     

       191
       191
       +
          <varlistentry xml:id="var-go-buildFlagsArray">

     

       192
       192
       +
           <term>

     

       193
       193
       +
            <varname>buildFlagsArray</varname> and <varname>buildFlags</varname>

     

       194
       194
       +
           </term>

     

       195
       195
       +
           <listitem>

     

       196
       196
       +
            <para>

     

       197
       197
       +
             These attributes set build flags supported by <varname>go build</varname>. We recommend using <varname>buildFlagsArray</varname>. The most common use case of these attributes is to make the resulting executable aware of its own version. For example:

     

       198
       198
       +
            </para>

     

       199
       199
       +
            <example xml:id='ex-goBuildFlags-nospaces'>

     

       200
       200
       +
             <title>buildFlagsArray</title>

     

       201
       201
       +
       <programlisting>

     

       202
       202
       +
         buildFlagsArray = [

     

       203
       203
       +
           "-ldflags=-X main.Version=${version} -X main.Commit=${version}" <co xml:id='ex-goBuildFlags-1' />

     

       204
       204
       +
         ];

     

       205
       205
       +
       </programlisting>

     

       206
       206
       +
            </example>

     

       207
       207
       +
            <calloutlist>

     

       208
       208
       +
             <callout arearefs='ex-goBuildFlags-1'>

     

       209
       209
       +
              <para>

     

       210
       210
       +
               Note: single quotes are not needed.

     

       211
       211
       +
              </para>

     

       212
       212
       +
             </callout>

     

       213
       213
       +
            </calloutlist>

     

       214
       214
       +
            <example xml:id='ex-goBuildFlags-noarray'>

     

       215
       215
       +
             <title>buildFlagsArray</title>

     

       216
       216
       +
       <programlisting>

     

       217
       217
       +
         buildFlagsArray = ''

     

       218
       218
       +
           -ldflags=

     

       219
       219
       +
           -X main.Version=${version}

     

       220
       220
       +
           -X main.Commit=${version}

     

       221
       221
       +
         '';

     

       222
       222
       +
       </programlisting>

     

       223
       223
       +
            </example>

     

       224
       224
       +
           </listitem>

     

       225
       225
       +
          </varlistentry>

     

       226
       226
       +
          <varlistentry xml:id="var-go-deleteVendor">

     

       227
       227
       +
           <term>

     

       228
       228
       +
            <varname>deleteVendor</varname>

     

       229
       229
       +
           </term>

     

       230
       230
       +
           <listitem>

     

       231
       231
       +
            <para>

     

       232
       232
       +
             Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete.

     

       233
       233
       +
            </para>

     

       234
       234
       +
           </listitem>

     

       235
       235
       +
          </varlistentry>

     

       236
       236
       +
          <varlistentry xml:id="var-go-subPackages">

     

       237
       237
       +
           <term>

     

       238
       238
       +
            <varname>subPackages</varname>

     

       239
       239
       +
           </term>

     

       240
       240
       +
           <listitem>

     

       241
       241
       +
            <para>

     

       242
       242
       +
             Limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built.

     

       243
       243
       +
            </para>

     

       244
       244
       +
           </listitem>

     

       245
       245
       +
          </varlistentry>

     

       246
       246
       +
         </variablelist>

     

       223
       247
        
        </section>

     

       224
       248
        
       </section>

+93 -93

doc/languages-frameworks/perl.xml

···

       8
       8
        
       

     

       9
       9
        
         <para>

     

       10
       10
        
          When executing a Perl script, it is possible you get an error such as <literal>./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory</literal>. This happens when the script expects Perl to be installed at <filename>/usr/bin/perl</filename>, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to:

     

       11
       11
       -
         <programlisting>

     

       12
       12
       -
         #!/usr/bin/env perl

     

       13
       13
       -
         </programlisting>

     

       11
       11
       +
       <programlisting>

     

       12
       12
       +
       #!/usr/bin/env perl

     

       13
       13
       +
       </programlisting>

     

       14
       14
        
         to take the Perl installation from the <literal>PATH</literal> environment variable, or invoke Perl directly with:

     

       15
       15
       -
         <screen>

     

       16
       16
       -
         <prompt>$ </prompt>perl ./myscript.pl

     

       17
       17
       -
         </screen>

     

       15
       15
       +
       <screen>

     

       16
       16
       +
       <prompt>$ </prompt>perl ./myscript.pl

     

       17
       17
       +
       </screen>

     

       18
       18
        
         </para>

     

       19
       19
        
       

     

       20
       20
        
         <para>

     

       21
       21
        
          When the script is using a Perl library that is not installed globally, you might get an error such as <literal>Can't locate DB_File.pm in @INC (you may need to install the DB_File module)</literal>. In that case, you can use <command>nix-shell</command> to start an ad-hoc shell with that library installed, for instance:

     

       22
       22
       -
         <screen>

     

       23
       23
       -
         <prompt>$ </prompt>nix-shell -p perl perlPackages.DBFile --run ./myscript.pl

     

       24
       24
       -
         </screen>

     

       22
       22
       +
       <screen>

     

       23
       23
       +
       <prompt>$ </prompt>nix-shell -p perl perlPackages.DBFile --run ./myscript.pl

     

       24
       24
       +
       </screen>

     

       25
       25
        
         </para>

     

       26
       26
        
       

     

       27
       27
        
         <para>

     

       28
       28
        
         If you are always using the script in places where <command>nix-shell</command> is available, you can embed the <command>nix-shell</command> invocation in the shebang like this:

     

       29
       29
       -
         <programlisting>

     

       30
       30
       -
         #!/usr/bin/env nix-shell

     

       31
       31
       -
         #! nix-shell -i perl -p perl perlPackages.DBFile

     

       32
       32
       -
         </programlisting>

     

       29
       29
       +
       <programlisting>

     

       30
       30
       +
       #!/usr/bin/env nix-shell

     

       31
       31
       +
       #! nix-shell -i perl -p perl perlPackages.DBFile

     

       32
       32
       +
       </programlisting>

     

       33
       33
        
         </para>

     

       34
       34
        
        </section>

     

       35
       35
        
       

     
···

       44
       44
        
         <para>

     

       45
       45
        
          Perl packages from CPAN are defined in <link

     

       46
       46
        
        xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from <filename>perl-packages.nix</filename>. However, more complicated packages should be put in a separate file, typically in <filename>pkgs/development/perl-modules</filename>. Here is an example of the former:

     

       47
       47
       -
        <programlisting>

     

       48
       48
       -
        ClassC3 = buildPerlPackage rec {

     

       49
       49
       -
          name = "Class-C3-0.21";

     

       50
       50
       -
          src = fetchurl {

     

       51
       51
       -
            url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";

     

       52
       52
       -
            sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";

     

       53
       53
       -
          };

     

       54
       54
       -
        };

     

       55
       55
       -
        </programlisting>

     

       47
       47
       +
       <programlisting>

     

       48
       48
       +
       ClassC3 = buildPerlPackage rec {

     

       49
       49
       +
         name = "Class-C3-0.21";

     

       50
       50
       +
         src = fetchurl {

     

       51
       51
       +
           url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";

     

       52
       52
       +
           sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz";

     

       53
       53
       +
         };

     

       54
       54
       +
       };

     

       55
       55
       +
       </programlisting>

     

       56
       56
        
          Note the use of <literal>mirror://cpan/</literal>, and the <literal>${name}</literal> in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in <filename>all-packages.nix</filename> through the variable <varname>perlPackages</varname>. For instance, if you have a package that needs <varname>ClassC3</varname>, you would typically write

     

       57
       57
       -
        <programlisting>

     

       58
       58
       -
        foo = import ../path/to/foo.nix {

     

       59
       59
       -
          inherit stdenv fetchurl ...;

     

       60
       60
       -
          inherit (perlPackages) ClassC3;

     

       61
       61
       -
        };

     

       62
       62
       -
        </programlisting>

     

       57
       57
       +
       <programlisting>

     

       58
       58
       +
       foo = import ../path/to/foo.nix {

     

       59
       59
       +
         inherit stdenv fetchurl ...;

     

       60
       60
       +
         inherit (perlPackages) ClassC3;

     

       61
       61
       +
       };

     

       62
       62
       +
       </programlisting>

     

       63
       63
        
          in <filename>all-packages.nix</filename>. You can test building a Perl package as follows:

     

       64
       64
       -
        <screen>

     

       65
       65
       -
        <prompt>$ </prompt>nix-build -A perlPackages.ClassC3

     

       66
       66
       -
        </screen>

     

       64
       64
       +
       <screen>

     

       65
       65
       +
       <prompt>$ </prompt>nix-build -A perlPackages.ClassC3

     

       66
       66
       +
       </screen>

     

       67
       67
        
          <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the start of the name attribute, so the package above is actually called <literal>perl-Class-C3-0.21</literal>. So to install it, you can say:

     

       68
       68
       -
        <screen>

     

       69
       69
       -
        <prompt>$ </prompt>nix-env -i perl-Class-C3

     

       70
       70
       -
        </screen>

     

       68
       68
       +
       <screen>

     

       69
       69
       +
       <prompt>$ </prompt>nix-env -i perl-Class-C3

     

       70
       70
       +
       </screen>

     

       71
       71
        
          (Of course you can also install using the attribute name: <literal>nix-env -i -A perlPackages.ClassC3</literal>.)

     

       72
       72
        
         </para>

     

       73
       73
        
       

     
···

       94
       94
        
       

     

       95
       95
        
         <para>

     

       96
       96
        
          <varname>buildPerlPackage</varname> is built on top of <varname>stdenv</varname>, so everything can be customised in the usual way. For instance, the <literal>BerkeleyDB</literal> module has a <varname>preConfigure</varname> hook to generate a configuration file used by <filename>Makefile.PL</filename>:

     

       97
       97
       -
        <programlisting>

     

       98
       98
       -
        { buildPerlPackage, fetchurl, db }:

     

       97
       97
       +
       <programlisting>

     

       98
       98
       +
       { buildPerlPackage, fetchurl, db }:

     

       99
       99
        
       

     

       100
       100
       -
        buildPerlPackage rec {

     

       101
       101
       -
          name = "BerkeleyDB-0.36";

     

       100
       100
       +
       buildPerlPackage rec {

     

       101
       101
       +
         name = "BerkeleyDB-0.36";

     

       102
       102
        
       

     

       103
       103
       -
          src = fetchurl {

     

       104
       104
       -
            url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";

     

       105
       105
       -
            sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";

     

       106
       106
       -
          };

     

       103
       103
       +
         src = fetchurl {

     

       104
       104
       +
           url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";

     

       105
       105
       +
           sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";

     

       106
       106
       +
         };

     

       107
       107
        
       

     

       108
       108
       -
          preConfigure = ''

     

       109
       109
       -
            echo "LIB = ${db.out}/lib" > config.in

     

       110
       110
       -
            echo "INCLUDE = ${db.dev}/include" >> config.in

     

       111
       111
       -
          '';

     

       112
       112
       -
        }

     

       113
       113
       -
        </programlisting>

     

       108
       108
       +
         preConfigure = ''

     

       109
       109
       +
           echo "LIB = ${db.out}/lib" > config.in

     

       110
       110
       +
           echo "INCLUDE = ${db.dev}/include" >> config.in

     

       111
       111
       +
         '';

     

       112
       112
       +
       }

     

       113
       113
       +
       </programlisting>

     

       114
       114
        
         </para>

     

       115
       115
        
       

     

       116
       116
        
         <para>

     

       117
       117
        
          Dependencies on other Perl packages can be specified in the <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname> attributes. If something is exclusively a build-time dependency, use <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules:

     

       118
       118
       -
        <programlisting>

     

       119
       119
       -
        ClassC3Componentised = buildPerlPackage rec {

     

       120
       120
       -
          name = "Class-C3-Componentised-1.0004";

     

       121
       121
       -
          src = fetchurl {

     

       122
       122
       -
            url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";

     

       123
       123
       -
            sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";

     

       124
       124
       -
          };

     

       125
       125
       -
          propagatedBuildInputs = [

     

       126
       126
       -
            ClassC3 ClassInspector TestException MROCompat

     

       127
       127
       -
          ];

     

       128
       128
       -
        };

     

       129
       129
       -
        </programlisting>

     

       118
       118
       +
       <programlisting>

     

       119
       119
       +
       ClassC3Componentised = buildPerlPackage rec {

     

       120
       120
       +
         name = "Class-C3-Componentised-1.0004";

     

       121
       121
       +
         src = fetchurl {

     

       122
       122
       +
           url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz";

     

       123
       123
       +
           sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1";

     

       124
       124
       +
         };

     

       125
       125
       +
         propagatedBuildInputs = [

     

       126
       126
       +
           ClassC3 ClassInspector TestException MROCompat

     

       127
       127
       +
         ];

     

       128
       128
       +
       };

     

       129
       129
       +
       </programlisting>

     

       130
       130
        
         </para>

     

       131
       131
        
       

     

       132
       132
        
         <para>

     

       133
       133
        
          On Darwin, if a script has too many <literal>-I<replaceable>dir</replaceable></literal> flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the <literal>shortenPerlShebang</literal> function from the <literal>postInstall</literal> phase:

     

       134
       134
       -
        <programlisting>

     

       135
       135
       -
        { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:

     

       134
       134
       +
       <programlisting>

     

       135
       135
       +
       { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }:

     

       136
       136
        
       

     

       137
       137
       -
        ImageExifTool = buildPerlPackage {

     

       138
       138
       -
          pname = "Image-ExifTool";

     

       139
       139
       -
          version = "11.50";

     

       137
       137
       +
       ImageExifTool = buildPerlPackage {

     

       138
       138
       +
         pname = "Image-ExifTool";

     

       139
       139
       +
         version = "11.50";

     

       140
       140
        
       

     

       141
       141
       -
          src = fetchurl {

     

       142
       142
       -
            url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz";

     

       143
       143
       -
            sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3";

     

       144
       144
       -
          };

     

       141
       141
       +
         src = fetchurl {

     

       142
       142
       +
           url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz";

     

       143
       143
       +
           sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3";

     

       144
       144
       +
         };

     

       145
       145
        
       

     

       146
       146
       -
          buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;

     

       147
       147
       -
          postInstall = stdenv.lib.optional stdenv.isDarwin ''

     

       148
       148
       -
            shortenPerlShebang $out/bin/exiftool

     

       149
       149
       -
          '';

     

       150
       150
       -
        };

     

       151
       151
       -
        </programlisting>

     

       146
       146
       +
         buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;

     

       147
       147
       +
         postInstall = stdenv.lib.optional stdenv.isDarwin ''

     

       148
       148
       +
           shortenPerlShebang $out/bin/exiftool

     

       149
       149
       +
         '';

     

       150
       150
       +
       };

     

       151
       151
       +
       </programlisting>

     

       152
       152
        
          This will remove the <literal>-I</literal> flags from the shebang line, rewrite them in the <literal>use lib</literal> form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place.

     

       153
       153
        
         </para>

     

       154
       154
        
       

     
···

       159
       159
        
           Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program <command>nix-generate-from-cpan</command>, which can be installed as follows:

     

       160
       160
        
          </para>

     

       161
       161
        
       

     

       162
       162
       -
        <screen>

     

       163
       163
       -
        <prompt>$ </prompt>nix-env -i nix-generate-from-cpan

     

       164
       164
       -
        </screen>

     

       162
       162
       +
       <screen>

     

       163
       163
       +
       <prompt>$ </prompt>nix-env -i nix-generate-from-cpan

     

       164
       164
       +
       </screen>

     

       165
       165
        
       

     

       166
       166
        
          <para>

     

       167
       167
        
           This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example:

     

       168
       168
       -
        <screen>

     

       169
       169
       -
        <prompt>$ </prompt>nix-generate-from-cpan XML::Simple

     

       170
       170
       -
          XMLSimple = buildPerlPackage rec {

     

       171
       171
       -
            name = "XML-Simple-2.22";

     

       172
       172
       -
            src = fetchurl {

     

       173
       173
       -
              url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz";

     

       174
       174
       -
              sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49";

     

       175
       175
       -
            };

     

       176
       176
       -
            propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];

     

       177
       177
       -
            meta = {

     

       178
       178
       -
              description = "An API for simple XML files";

     

       179
       179
       -
              license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

     

       180
       180
       -
            };

     

       181
       181
       -
          };

     

       182
       182
       -
        </screen>

     

       168
       168
       +
       <screen>

     

       169
       169
       +
       <prompt>$ </prompt>nix-generate-from-cpan XML::Simple

     

       170
       170
       +
         XMLSimple = buildPerlPackage rec {

     

       171
       171
       +
           name = "XML-Simple-2.22";

     

       172
       172
       +
           src = fetchurl {

     

       173
       173
       +
             url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz";

     

       174
       174
       +
             sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49";

     

       175
       175
       +
           };

     

       176
       176
       +
           propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];

     

       177
       177
       +
           meta = {

     

       178
       178
       +
             description = "An API for simple XML files";

     

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

     

       180
       180
       +
           };

     

       181
       181
       +
         };

     

       182
       182
       +
       </screen>

     

       183
       183
        
           The output can be pasted into <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you need it.

     

       184
       184
        
          </para>

     

       185
       185
        
         </section>

+1 -1

doc/languages-frameworks/qt.xml

···

       18
       18
        
       

     

       19
       19
        
         buildInputs = [ qtbase ]; <co xml:id='qt-default-nix-co-3' />

     

       20
       20
        
       }

     

       21
       21
       -
          </programlisting>

     

       21
       21
       +
       </programlisting>

     

       22
       22
        
        </example>

     

       23
       23
        
       

     

       24
       24
        
        <calloutlist>

+12 -13

doc/languages-frameworks/ruby.xml

···

       12
       12
        
        </para>

     

       13
       13
        
       

     

       14
       14
        
       <screen>

     

       15
       15
       -
       <![CDATA[$ cd pkgs/servers/monitoring

     

       16
       16
       -
       $ mkdir sensu

     

       17
       17
       -
       $ cd sensu

     

       18
       18
       -
       $ cat > Gemfile

     

       15
       15
       +
       <prompt>$ </prompt>cd pkgs/servers/monitoring

     

       16
       16
       +
       <prompt>$ </prompt>mkdir sensu

     

       17
       17
       +
       <prompt>$ </prompt>cd sensu

     

       18
       18
       +
       <prompt>$ </prompt>cat > Gemfile

     

       19
       19
        
       source 'https://rubygems.org'

     

       20
       20
        
       gem 'sensu'

     

       21
       21
       -
       $ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic

     

       22
       22
       -
       $ cat > default.nix

     

       21
       21
       +
       <prompt>$ </prompt>$(nix-build '&lt;nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic

     

       22
       22
       +
       <prompt>$ </prompt>cat > default.nix

     

       23
       23
        
       { lib, bundlerEnv, ruby }:

     

       24
       24
        
       

     

       25
       25
        
       bundlerEnv rec {

     
···

       37
       37
        
           maintainers = with maintainers; [ theuni ];

     

       38
       38
        
           platforms   = platforms.unix;

     

       39
       39
        
         };

     

       40
       40
       -
       }]]>

     

       40
       40
       +
       }

     

       41
       41
        
       </screen>

     

       42
       42
        
       

     

       43
       43
        
        <para>

     
···

       49
       49
        
        </para>

     

       50
       50
        
       

     

       51
       51
        
       <screen>

     

       52
       52
       -
       <![CDATA[$ cd pkgs/servers/monitoring/sensu

     

       53
       53
       -
       $ nix-shell -p bundler --run 'bundle lock --update'

     

       54
       54
       -
       $ nix-shell -p bundix --run 'bundix'

     

       55
       55
       -
       ]]>

     

       52
       52
       +
       <prompt>$ </prompt>cd pkgs/servers/monitoring/sensu

     

       53
       53
       +
       <prompt>$ </prompt>nix-shell -p bundler --run 'bundle lock --update'

     

       54
       54
       +
       <prompt>$ </prompt>nix-shell -p bundix --run 'bundix'

     

       56
       55
        
       </screen>

     

       57
       56
        
       

     

       58
       57
        
        <para>

     

       59
       58
        
         For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example:

     

       60
       59
        
        </para>

     

       61
       60
        
       

     

       62
       62
       -
       <screen>

     

       61
       61
       +
       <programlisting>

     

       63
       62
        
       <![CDATA[{ lib, bundlerApp }:

     

       64
       63
        
       

     

       65
       64
        
       bundlerApp {

     
···

       75
       74
        
           platforms   = platforms.unix;

     

       76
       75
        
         };

     

       77
       76
        
       }]]>

     

       78
       78
       -
       </screen>

     

       77
       77
       +
       </programlisting>

     

       79
       78
        
       

     

       80
       79
        
        <para>

     

       81
       80
        
         The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages.

+5 -5

doc/languages-frameworks/texlive.xml

···

       44
       44
        
          <listitem>

     

       45
       45
        
           <para>

     

       46
       46
        
            You can list packages e.g. by <command>nix repl</command>.

     

       47
       47
       -
       <programlisting><![CDATA[

     

       48
       48
       -
       $ nix repl

     

       49
       49
       -
       nix-repl> :l <nixpkgs>

     

       50
       50
       -
       nix-repl> texlive.collection-<TAB>

     

       51
       51
       -
       ]]></programlisting>

     

       47
       47
       +
       <programlisting>

     

       48
       48
       +
       <prompt>$ </prompt>nix repl

     

       49
       49
       +
       <prompt>nix-repl> </prompt>:l &lt;nixpkgs>

     

       50
       50
       +
       <prompt>nix-repl> </prompt>texlive.collection-<keycap function="tab" />

     

       51
       51
       +
       </programlisting>

     

       52
       52
        
           </para>

     

       53
       53
        
          </listitem>

     

       54
       54
        
          <listitem>

+1 -1

doc/manual.xml

···

       1
       1
        
       <book xmlns="http://docbook.org/ns/docbook"

     

       2
       2
        
             xmlns:xi="http://www.w3.org/2001/XInclude">

     

       3
       3
        
        <info>

     

       4
       4
       -
         <title>Nixpkgs Users and Contributors Guide</title>

     

       4
       4
       +
         <title>Nixpkgs Manual</title>

     

       5
       5
        
         <subtitle>Version <xi:include href=".version" parse="text" />

     

       6
       6
        
         </subtitle>

     

       7
       7
        
        </info>

+1 -1

doc/stdenv/multiple-output.xml

···

       67
       67
        
           <para>

     

       68
       68
        
            <command>nix-env</command> silenty disregards the outputs selected by the user, and instead installs the outputs from <varname>meta.outputsToInstall</varname>. For example,

     

       69
       69
        
           </para>

     

       70
       70
       -
       <programlisting>$ nix-env -iA nixpkgs.coreutils.info</programlisting>

     

       70
       70
       +
       <screen><prompt>$ </prompt>nix-env -iA nixpkgs.coreutils.info</screen>

     

       71
       71
        
           <para>

     

       72
       72
        
            installs the <literal>"out"</literal> output (<varname>coreutils.meta.outputsToInstall</varname> is <literal>[ "out" ]</literal>) instead of the requested <literal>"info"</literal>.

     

       73
       73
        
           </para>

+4 -4

doc/using/configuration.xml

···

       66
       66
        
          <listitem>

     

       67
       67
        
           <para>

     

       68
       68
        
            For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools:

     

       69
       69
       -
       <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>

     

       69
       69
       +
       <screen><prompt>$ </prompt>export NIXPKGS_ALLOW_BROKEN=1</screen>

     

       70
       70
        
           </para>

     

       71
       71
        
          </listitem>

     

       72
       72
        
          <listitem>

     
···

       92
       92
        
          <listitem>

     

       93
       93
        
           <para>

     

       94
       94
        
            For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools:

     

       95
       95
       -
       <programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting>

     

       95
       95
       +
       <screen><prompt>$ </prompt>export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</screen>

     

       96
       96
        
           </para>

     

       97
       97
        
          </listitem>

     

       98
       98
        
          <listitem>

     
···

       122
       122
        
          <listitem>

     

       123
       123
        
           <para>

     

       124
       124
        
            To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools:

     

       125
       125
       -
       <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>

     

       125
       125
       +
       <screen><prompt>$ </prompt>export NIXPKGS_ALLOW_UNFREE=1</screen>

     

       126
       126
        
           </para>

     

       127
       127
        
          </listitem>

     

       128
       128
        
          <listitem>

     
···

       187
       187
        
          <listitem>

     

       188
       188
        
           <para>

     

       189
       189
        
            To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools:

     

       190
       190
       -
       <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>

     

       190
       190
       +
       <screen><prompt>$ </prompt>export NIXPKGS_ALLOW_INSECURE=1</screen>

     

       191
       191
        
           </para>

     

       192
       192
        
          </listitem>

     

       193
       193
        
          <listitem>

+5 -5

doc/using/overlays.xml

···

       240
       240
        
           lapackProvider = self.mkl;

     

       241
       241
        
         }

     

       242
       242
        
       }

     

       243
       243
       -
            </programlisting>

     

       243
       243
       +
       </programlisting>

     

       244
       244
        
            <para>

     

       245
       245
        
              This overlay uses Intel’s MKL library for both BLAS and LAPACK

     

       246
       246
        
              interfaces. Note that the same can be accomplished at runtime

     
···

       248
       248
        
              <literal>libblas.so.3</literal> and

     

       249
       249
        
              <literal>liblapack.so.3</literal>. For instance:

     

       250
       250
        
            </para>

     

       251
       251
       -
            <programlisting>

     

       252
       252
       -
       $ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave

     

       253
       253
       -
            </programlisting>

     

       251
       251
       +
       <screen>

     

       252
       252
       +
       <prompt>$ </prompt>LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave

     

       253
       253
       +
       </screen>

     

       254
       254
        
            <para>

     

       255
       255
        
              Intel MKL requires an <literal>openmp</literal> implementation

     

       256
       256
        
              when running with multiple processors. By default,

     
···

       288
       288
        
       stdenv.mkDerivation {

     

       289
       289
        
         ...

     

       290
       290
        
       }

     

       291
       291
       -
            </programlisting>

     

       291
       291
       +
       </programlisting>

     

       292
       292
        
          </section>

     

       293
       293
        
        </section>

     

       294
       294
        
       </chapter>

+10 -4

lib/modules.nix

···

       117
       117
        
               if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then

     

       118
       118
        
                 let

     

       119
       119
        
                   firstDef = head merged.unmatchedDefns;

     

       120
       120
       -
                   baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist.";

     

       120
       120
       +
                   baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}";

     

       121
       121
        
                 in

     

       122
       122
        
                   if attrNames options == [ "_module" ]

     

       123
       123
        
                     then throw ''

     
···

       449
       449
        
             # Handle properties, check types, and merge everything together.

     

       450
       450
        
             res =

     

       451
       451
        
               if opt.readOnly or false && length defs' > 1 then

     

       452
       452
       -
                 throw "The option `${showOption loc}' is read-only, but it's set multiple times."

     

       452
       452
       +
                 let

     

       453
       453
       +
                   # For a better error message, evaluate all readOnly definitions as

     

       454
       454
       +
                   # if they were the only definition.

     

       455
       455
       +
                   separateDefs = map (def: def // {

     

       456
       456
       +
                     value = (mergeDefinitions loc opt.type [ def ]).mergedValue;

     

       457
       457
       +
                   }) defs';

     

       458
       458
       +
                 in throw "The option `${showOption loc}' is read-only, but it's set multiple times. Definition values:${showDefs separateDefs}"

     

       453
       459
        
               else

     

       454
       460
        
                 mergeDefinitions loc opt.type defs';

     

       455
       461
        
       

     
···

       497
       503
        
           mergedValue =

     

       498
       504
        
             if isDefined then

     

       499
       505
        
               if all (def: type.check def.value) defsFinal then type.merge loc defsFinal

     

       500
       500
       -
               else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal;

     

       501
       501
       -
               in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'."

     

       506
       506
       +
               else let allInvalid = filter (def: ! type.check def.value) defsFinal;

     

       507
       507
       +
               in throw "A definition for option `${showOption loc}' is not of type `${type.description}'. Definition values:${showDefs allInvalid}"

     

       502
       508
        
             else

     

       503
       509
        
               # (nixos-option detects this specific error message and gives it special

     

       504
       510
        
               # handling.  If changed here, please change it there too.)

+24 -6

lib/options.nix

···

       96
       96
        
           else if all isBool list then foldl' lib.or false list

     

       97
       97
        
           else if all isString list then lib.concatStrings list

     

       98
       98
        
           else if all isInt list && all (x: x == head list) list then head list

     

       99
       99
       -
           else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";

     

       99
       99
       +
           else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}";

     

       100
       100
        
       

     

       101
       101
        
         mergeOneOption = loc: defs:

     

       102
       102
        
           if defs == [] then abort "This case should never happen."

     

       103
       103
        
           else if length defs != 1 then

     

       104
       104
       -
             throw "The unique option `${showOption loc}' is defined multiple times, in:\n - ${concatStringsSep "\n - " (getFiles defs)}."

     

       104
       104
       +
             throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}"

     

       105
       105
        
           else (head defs).value;

     

       106
       106
        
       

     

       107
       107
        
         /* "Merge" option definitions by checking that they all have the same value. */

     
···

       111
       111
        
           # This also makes it work for functions, because the foldl' below would try

     

       112
       112
        
           # to compare the first element with itself, which is false for functions

     

       113
       113
        
           else if length defs == 1 then (elemAt defs 0).value

     

       114
       114
       -
           else foldl' (val: def:

     

       115
       115
       -
             if def.value != val then

     

       116
       116
       -
               throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."

     

       114
       114
       +
           else (foldl' (first: def:

     

       115
       115
       +
             if def.value != first.value then

     

       116
       116
       +
               throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}"

     

       117
       117
        
             else

     

       118
       118
       -
               val) (head defs).value defs;

     

       118
       118
       +
               first) (head defs) defs).value;

     

       119
       119
        
       

     

       120
       120
        
         /* Extracts values of all "value" keys of the given list.

     

       121
       121
        
       

     
···

       213
       213
        
                else escaped;

     

       214
       214
        
           in (concatStringsSep ".") (map escapeOptionPart parts);

     

       215
       215
        
         showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files);

     

       216
       216
       +
       

     

       217
       217
       +
         showDefs = defs: concatMapStrings (def:

     

       218
       218
       +
           let

     

       219
       219
       +
             # Pretty print the value for display, if successful

     

       220
       220
       +
             prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value);

     

       221
       221
       +
             # Split it into its lines

     

       222
       222
       +
             lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value);

     

       223
       223
       +
             # Only display the first 5 lines, and indent them for better visibility

     

       224
       224
       +
             value = concatStringsSep "\n    " (take 5 lines ++ optional (length lines > 5) "...");

     

       225
       225
       +
             result =

     

       226
       226
       +
               # Don't print any value if evaluating the value strictly fails

     

       227
       227
       +
               if ! prettyEval.success then ""

     

       228
       228
       +
               # Put it on a new line if it consists of multiple

     

       229
       229
       +
               else if length lines > 1 then ":\n    " + value

     

       230
       230
       +
               else ": " + value;

     

       231
       231
       +
           in "\n- In `${def.file}'${result}"

     

       232
       232
       +
         ) defs;

     

       233
       233
       +
       

     

       216
       234
        
         unknownModule = "<unknown-file>";

     

       217
       235
        
       

     

       218
       236
        
       }

+13 -13

lib/tests/modules.sh

···

       49
       49
        
               reportFailure "$@"

     

       50
       50
        
               return 1

     

       51
       51
        
           else

     

       52
       52
       -
               if echo "$err" | grep --silent "$errorContains" ; then

     

       52
       52
       +
               if echo "$err" | grep -zP --silent "$errorContains" ; then

     

       53
       53
        
                   pass=$((pass + 1))

     

       54
       54
        
                   return 0;

     

       55
       55
        
               else

     
···

       62
       62
        
       

     

       63
       63
        
       # Check boolean option.

     

       64
       64
        
       checkConfigOutput "false" config.enable ./declare-enable.nix

     

       65
       65
       -
       checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix

     

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

     

       66
       66
        
       

     

       67
       67
        
       # Check integer types.

     

       68
       68
        
       # unsigned

     

       69
       69
        
       checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix

     

       70
       70
       -
       checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix

     

       70
       70
       +
       checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix

     

       71
       71
        
       # positive

     

       72
       72
       -
       checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix

     

       72
       72
       +
       checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix

     

       73
       73
        
       # between

     

       74
       74
        
       checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix

     

       75
       75
       -
       checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix

     

       75
       75
       +
       checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix

     

       76
       76
        
       

     

       77
       77
        
       # Check either types

     

       78
       78
        
       # types.either

     
···

       125
       125
        
       set -- config.enable ./define-enable.nix ./declare-enable.nix

     

       126
       126
        
       checkConfigOutput "true" "$@"

     

       127
       127
        
       checkConfigOutput "false" "$@" ./disable-define-enable.nix

     

       128
       128
       -
       checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix

     

       128
       128
       +
       checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix

     

       129
       129
        
       checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix

     

       130
       130
        
       checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix

     

       131
       131
        
       

     
···

       142
       142
        
       

     

       143
       143
        
       # Check _module.check.

     

       144
       144
        
       set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix

     

       145
       145
       -
       checkConfigError 'The option .* defined in .* does not exist.' "$@"

     

       145
       145
       +
       checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@"

     

       146
       146
        
       checkConfigOutput "true" "$@" ./define-module-check.nix

     

       147
       147
        
       

     

       148
       148
        
       # Check coerced value.

     

       149
       149
        
       checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix

     

       150
       150
        
       checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix

     

       151
       151
       -
       checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix

     

       151
       151
       +
       checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix

     

       152
       152
        
       

     

       153
       153
        
       # Check coerced value with unsound coercion

     

       154
       154
        
       checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix

     

       155
       155
       -
       checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix

     

       155
       155
       +
       checkConfigError 'A definition for option .* is not of type .*. Definition values:\n- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix

     

       156
       156
        
       checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix

     

       157
       157
        
       

     

       158
       158
        
       # Check mkAliasOptionModule.

     
···

       183
       183
        
       checkConfigOutput "true" config.enable ./disable-recursive/main.nix

     

       184
       184
        
       checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix}

     

       185
       185
        
       checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix}

     

       186
       186
       -
       checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}

     

       186
       186
       +
       checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}

     

       187
       187
        
       

     

       188
       188
        
       # Check that imports can depend on derivations

     

       189
       189
        
       checkConfigOutput "true" config.enable ./import-from-store.nix

     
···

       207
       207
        
       

     

       208
       208
        
       

     

       209
       209
        
       # Even with multiple assignments, a type error should be thrown if any of them aren't valid

     

       210
       210
       -
       checkConfigError 'The option value .* in .* is not of type .*' \

     

       210
       210
       +
       checkConfigError 'A definition for option .* is not of type .*' \

     

       211
       211
        
         config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix

     

       212
       212
        
       

     

       213
       213
        
       ## Freeform modules

     
···

       216
       216
        
       # No freeform assigments shouldn't make it error

     

       217
       217
        
       checkConfigOutput '{ }' config ./freeform-attrsOf.nix

     

       218
       218
        
       # but only if the type matches

     

       219
       219
       -
       checkConfigError 'The option value .* in .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix

     

       219
       219
       +
       checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix

     

       220
       220
        
       # and properties should be applied

     

       221
       221
        
       checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix

     

       222
       222
        
       # Options should still be declarable, and be able to have a type that doesn't match the freeform type

     
···

       251
       251
        
       checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix

     

       252
       252
        
       checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix

     

       253
       253
        
       # Functions can't be merged together

     

       254
       254
       -
       checkConfigError "The option .* has conflicting definitions" config.value.multiple-lambdas ./types-anything/functions.nix

     

       254
       254
       +
       checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix

     

       255
       255
        
       checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix

     

       256
       256
        
       # Check that all mk* modifiers are applied

     

       257
       257
        
       checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix

+8 -10

lib/types.nix

···

       299
       299
        
             check = isList;

     

       300
       300
        
             merge = loc: defs:

     

       301
       301
        
               map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def:

     

       302
       302
       -
                 if isList def.value then

     

       303
       303
       -
                   imap1 (m: def':

     

       304
       304
       -
                     (mergeDefinitions

     

       305
       305
       -
                       (loc ++ ["[definition ${toString n}-entry ${toString m}]"])

     

       306
       306
       -
                       elemType

     

       307
       307
       -
                       [{ inherit (def) file; value = def'; }]

     

       308
       308
       -
                     ).optionalValue

     

       309
       309
       -
                   ) def.value

     

       310
       310
       -
                 else

     

       311
       311
       -
                   throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs)));

     

       302
       302
       +
                 imap1 (m: def':

     

       303
       303
       +
                   (mergeDefinitions

     

       304
       304
       +
                     (loc ++ ["[definition ${toString n}-entry ${toString m}]"])

     

       305
       305
       +
                     elemType

     

       306
       306
       +
                     [{ inherit (def) file; value = def'; }]

     

       307
       307
       +
                   ).optionalValue

     

       308
       308
       +
                 ) def.value

     

       309
       309
       +
               ) defs)));

     

       312
       310
        
             emptyValue = { value = {}; };

     

       313
       311
        
             getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);

     

       314
       312
        
             getSubModules = elemType.getSubModules;

+12

maintainers/maintainer-list.nix

···

       3149
       3149
        
           githubId = 3217744;

     

       3150
       3150
        
           name = "Peter Ferenczy";

     

       3151
       3151
        
         };

     

       3152
       3152
       +
         ghuntley = {

     

       3153
       3153
       +
           email = "ghuntley@ghuntley.com";

     

       3154
       3154
       +
           github = "ghuntley";

     

       3155
       3155
       +
           githubId = 127353;

     

       3156
       3156
       +
           name = "Geoffrey Huntley";

     

       3157
       3157
       +
         };

     

       3152
       3158
        
         gila = {

     

       3153
       3159
        
           email = "jeffry.molanus@gmail.com";

     

       3154
       3160
        
           github = "gila";

     
···

       3738
       3744
        
           github = "jbaum98";

     

       3739
       3745
        
           githubId = 5283991;

     

       3740
       3746
        
           name = "Jake Waksbaum";

     

       3747
       3747
       +
         };

     

       3748
       3748
       +
         jamiemagee = {

     

       3749
       3749
       +
           email = "jamie.magee@gmail.com";

     

       3750
       3750
       +
           github = "JamieMagee";

     

       3751
       3751
       +
           githubId = 1358764;

     

       3752
       3752
       +
           name = "Jamie Magee";

     

       3741
       3753
        
         };

     

       3742
       3754
        
         jammerful = {

     

       3743
       3755
        
           email = "jammerful@gmail.com";

+16 -16

nixos/doc/manual/administration/imperative-containers.xml

···

       14
       14
        
        <para>

     

       15
       15
        
         You create a container with identifier <literal>foo</literal> as follows:

     

       16
       16
        
       <screen>

     

       17
       17
       -
       # nixos-container create foo

     

       17
       17
       +
       <prompt># </prompt>nixos-container create <replaceable>foo</replaceable>

     

       18
       18
        
       </screen>

     

       19
       19
        
         This creates the container’s root directory in

     

       20
       20
       -
         <filename>/var/lib/containers/foo</filename> and a small configuration file

     

       21
       21
       -
         in <filename>/etc/containers/foo.conf</filename>. It also builds the

     

       20
       20
       +
         <filename>/var/lib/containers/<replaceable>foo</replaceable></filename> and a small configuration file

     

       21
       21
       +
         in <filename>/etc/containers/<replaceable>foo</replaceable>.conf</filename>. It also builds the

     

       22
       22
        
         container’s initial system configuration and stores it in

     

       23
       23
       -
         <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can

     

       23
       23
       +
         <filename>/nix/var/nix/profiles/per-container/<replaceable>foo</replaceable>/system</filename>. You can

     

       24
       24
        
         modify the initial configuration of the container on the command line. For

     

       25
       25
        
         instance, to create a container that has <command>sshd</command> running,

     

       26
       26
        
         with the given public key for <literal>root</literal>:

     

       27
       27
        
       <screen>

     

       28
       28
       -
       # nixos-container create foo --config '

     

       28
       28
       +
       <prompt># </prompt>nixos-container create <replaceable>foo</replaceable> --config '

     

       29
       29
        
         <xref linkend="opt-services.openssh.enable"/> = true;

     

       30
       30
        
         <link linkend="opt-users.users._name_.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];

     

       31
       31
        
       '

     
···

       34
       34
        
         as container IP. This behavior can be altered by setting <literal>--host-address</literal> and

     

       35
       35
        
         <literal>--local-address</literal>:

     

       36
       36
        
       <screen>

     

       37
       37
       -
       # nixos-container create test --config-file test-container.nix \

     

       37
       37
       +
       <prompt># </prompt>nixos-container create test --config-file test-container.nix \

     

       38
       38
        
           --local-address 10.235.1.2 --host-address 10.235.1.1

     

       39
       39
        
       </screen>

     

       40
       40
        
        </para>

     
···

       42
       42
        
        <para>

     

       43
       43
        
         Creating a container does not start it. To start the container, run:

     

       44
       44
        
       <screen>

     

       45
       45
       -
       # nixos-container start foo

     

       45
       45
       +
       <prompt># </prompt>nixos-container start <replaceable>foo</replaceable>

     

       46
       46
        
       </screen>

     

       47
       47
        
         This command will return as soon as the container has booted and has reached

     

       48
       48
        
         <literal>multi-user.target</literal>. On the host, the container runs within

     
···

       51
       51
        
         Thus, if something went wrong, you can get status info using

     

       52
       52
        
         <command>systemctl</command>:

     

       53
       53
        
       <screen>

     

       54
       54
       -
       # systemctl status container@foo

     

       54
       54
       +
       <prompt># </prompt>systemctl status container@<replaceable>foo</replaceable>

     

       55
       55
        
       </screen>

     

       56
       56
        
        </para>

     

       57
       57
        
       

     
···

       59
       59
        
         If the container has started successfully, you can log in as root using the

     

       60
       60
        
         <command>root-login</command> operation:

     

       61
       61
        
       <screen>

     

       62
       62
       -
       # nixos-container root-login foo

     

       63
       63
       -
       [root@foo:~]#

     

       62
       62
       +
       <prompt># </prompt>nixos-container root-login <replaceable>foo</replaceable>

     

       63
       63
       +
       <prompt>[root@foo:~]#</prompt>

     

       64
       64
        
       </screen>

     

       65
       65
        
         Note that only root on the host can do this (since there is no

     

       66
       66
        
         authentication). You can also get a regular login prompt using the

     

       67
       67
        
         <command>login</command> operation, which is available to all users on the

     

       68
       68
        
         host:

     

       69
       69
        
       <screen>

     

       70
       70
       -
       # nixos-container login foo

     

       70
       70
       +
       <prompt># </prompt>nixos-container login <replaceable>foo</replaceable>

     

       71
       71
        
       foo login: alice

     

       72
       72
        
       Password: ***

     

       73
       73
        
       </screen>

     

       74
       74
        
         With <command>nixos-container run</command>, you can execute arbitrary

     

       75
       75
        
         commands in the container:

     

       76
       76
        
       <screen>

     

       77
       77
       -
       # nixos-container run foo -- uname -a

     

       77
       77
       +
       <prompt># </prompt>nixos-container run <replaceable>foo</replaceable> -- uname -a

     

       78
       78
        
       Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux

     

       79
       79
        
       </screen>

     

       80
       80
        
        </para>

     
···

       85
       85
        
         <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,

     

       86
       86
        
         and run

     

       87
       87
        
       <screen>

     

       88
       88
       -
       # nixos-container update foo

     

       88
       88
       +
       <prompt># </prompt>nixos-container update <replaceable>foo</replaceable>

     

       89
       89
        
       </screen>

     

       90
       90
        
         This will build and activate the new configuration. You can also specify a

     

       91
       91
        
         new configuration on the command line:

     

       92
       92
        
       <screen>

     

       93
       93
       -
       # nixos-container update foo --config '

     

       93
       93
       +
       <prompt># </prompt>nixos-container update <replaceable>foo</replaceable> --config '

     

       94
       94
        
         <xref linkend="opt-services.httpd.enable"/> = true;

     

       95
       95
        
         <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";

     

       96
       96
        
         <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];

     

       97
       97
        
       '

     

       98
       98
        
       

     

       99
       99
       -
       # curl http://$(nixos-container show-ip foo)/

     

       99
       99
       +
       <prompt># </prompt>curl http://$(nixos-container show-ip <replaceable>foo</replaceable>)/

     

       100
       100
        
       &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…

     

       101
       101
        
       </screen>

     

       102
       102
        
         However, note that this will overwrite the container’s

     
···

       117
       117
        
         by using <command>systemctl</command> on the container’s service unit. To

     

       118
       118
        
         destroy a container, including its file system, do

     

       119
       119
        
       <screen>

     

       120
       120
       -
       # nixos-container destroy foo

     

       120
       120
       +
       <prompt># </prompt>nixos-container destroy <replaceable>foo</replaceable>

     

       121
       121
        
       </screen>

     

       122
       122
        
        </para>

     

       123
       123
        
       </section>

+1 -1

nixos/doc/manual/administration/maintenance-mode.xml

···

       8
       8
        
        <para>

     

       9
       9
        
         You can enter rescue mode by running:

     

       10
       10
        
       <screen>

     

       11
       11
       -
       # systemctl rescue</screen>

     

       11
       11
       +
       <prompt># </prompt>systemctl rescue</screen>

     

       12
       12
        
         This will eventually give you a single-user root shell. Systemd will stop

     

       13
       13
        
         (almost) all system services. To get out of maintenance mode, just exit from

     

       14
       14
        
         the rescue shell.

+2 -2

nixos/doc/manual/administration/network-problems.xml

···

       16
       16
        
         disable the use of the binary cache by adding <option>--option

     

       17
       17
        
         use-binary-caches false</option>, e.g.

     

       18
       18
        
       <screen>

     

       19
       19
       -
       # nixos-rebuild switch --option use-binary-caches false

     

       19
       19
       +
       <prompt># </prompt>nixos-rebuild switch --option use-binary-caches false

     

       20
       20
        
       </screen>

     

       21
       21
        
         If you have an alternative binary cache at your disposal, you can use it

     

       22
       22
        
         instead:

     

       23
       23
        
       <screen>

     

       24
       24
       -
       # nixos-rebuild switch --option binary-caches http://my-cache.example.org/

     

       24
       24
       +
       <prompt># </prompt>nixos-rebuild switch --option binary-caches <replaceable>http://my-cache.example.org/</replaceable>

     

       25
       25
        
       </screen>

     

       26
       26
        
        </para>

     

       27
       27
        
       </section>

+3 -3

nixos/doc/manual/administration/rebooting.xml

···

       7
       7
        
        <para>

     

       8
       8
        
         The system can be shut down (and automatically powered off) by doing:

     

       9
       9
        
       <screen>

     

       10
       10
       -
       # shutdown

     

       10
       10
       +
       <prompt># </prompt>shutdown

     

       11
       11
        
       </screen>

     

       12
       12
        
         This is equivalent to running <command>systemctl poweroff</command>.

     

       13
       13
        
        </para>

     

       14
       14
        
        <para>

     

       15
       15
        
         To reboot the system, run

     

       16
       16
        
       <screen>

     

       17
       17
       -
       # reboot

     

       17
       17
       +
       <prompt># </prompt>reboot

     

       18
       18
        
       </screen>

     

       19
       19
        
         which is equivalent to <command>systemctl reboot</command>. Alternatively,

     

       20
       20
        
         you can quickly reboot the system using <literal>kexec</literal>, which

     

       21
       21
        
         bypasses the BIOS by directly loading the new kernel into memory:

     

       22
       22
        
       <screen>

     

       23
       23
       -
       # systemctl kexec

     

       23
       23
       +
       <prompt># </prompt>systemctl kexec

     

       24
       24
        
       </screen>

     

       25
       25
        
        </para>

     

       26
       26
        
        <para>

+3 -3

nixos/doc/manual/administration/rollback.xml

···

       20
       20
        
         has booted, you can make the selected configuration the default for

     

       21
       21
        
         subsequent boots:

     

       22
       22
        
       <screen>

     

       23
       23
       -
       # /run/current-system/bin/switch-to-configuration boot</screen>

     

       23
       23
       +
       <prompt># </prompt>/run/current-system/bin/switch-to-configuration boot</screen>

     

       24
       24
        
        </para>

     

       25
       25
        
       

     

       26
       26
        
        <para>

     

       27
       27
        
         Second, you can switch to the previous configuration in a running system:

     

       28
       28
        
       <screen>

     

       29
       29
       -
       # nixos-rebuild switch --rollback</screen>

     

       29
       29
       +
       <prompt># </prompt>nixos-rebuild switch --rollback</screen>

     

       30
       30
        
         This is equivalent to running:

     

       31
       31
        
       <screen>

     

       32
       32
       -
       # /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>

     

       32
       32
       +
       <prompt># </prompt>/nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>

     

       33
       33
        
         where <replaceable>N</replaceable> is the number of the NixOS system

     

       34
       34
        
         configuration. To get a list of the available configurations, do:

     

       35
       35
        
       <screen>

+3 -3

nixos/doc/manual/administration/service-mgmt.xml

···

       58
       58
        
        <para>

     

       59
       59
        
         Units can be stopped, started or restarted:

     

       60
       60
        
       <screen>

     

       61
       61
       -
       # systemctl stop postgresql.service

     

       62
       62
       -
       # systemctl start postgresql.service

     

       63
       63
       -
       # systemctl restart postgresql.service

     

       61
       61
       +
       <prompt># </prompt>systemctl stop postgresql.service

     

       62
       62
       +
       <prompt># </prompt>systemctl start postgresql.service

     

       63
       63
       +
       <prompt># </prompt>systemctl restart postgresql.service

     

       64
       64
        
       </screen>

     

       65
       65
        
         These operations are synchronous: they wait until the service has finished

     

       66
       66
        
         starting or stopping (or has failed). Starting a unit will cause the

+1 -1

nixos/doc/manual/administration/user-sessions.xml

···

       39
       39
        
         can terminate a session in a way that ensures that all the session’s

     

       40
       40
        
         processes are gone:

     

       41
       41
        
       <screen>

     

       42
       42
       -
       # loginctl terminate-session c3

     

       42
       42
       +
       <prompt># </prompt>loginctl terminate-session c3

     

       43
       43
        
       </screen>

     

       44
       44
        
        </para>

     

       45
       45
        
       </chapter>

+1 -1

nixos/doc/manual/configuration/adding-custom-packages.xml

···

       25
       25
        
         and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs

     

       26
       26
        
         tree:

     

       27
       27
        
       <screen>

     

       28
       28
       -
       # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>

     

       28
       28
       +
       <prompt># </prompt>nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>

     

       29
       29
        
        </para>

     

       30
       30
        
       

     

       31
       31
        
        <para>

+8 -8

nixos/doc/manual/configuration/linux-kernel.xml

···

       126
       126
        
          <literal>mellanox</literal> drivers.

     

       127
       127
        
         </para>

     

       128
       128
        
       

     

       129
       129
       -
       <screen><![CDATA[

     

       130
       130
       -
       $ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev

     

       131
       131
       -
       $ nix-shell '<nixpkgs>' -A linuxPackages.kernel

     

       132
       132
       -
       $ unpackPhase

     

       133
       133
       -
       $ cd linux-*

     

       134
       134
       -
       $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules

     

       135
       135
       -
       # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko

     

       136
       136
       -
       ]]></screen>

     

       129
       129
       +
       <screen>

     

       130
       130
       +
       <prompt>$ </prompt>nix-build '&lt;nixpkgs>' -A linuxPackages.kernel.dev

     

       131
       131
       +
       <prompt>$ </prompt>nix-shell '&lt;nixpkgs>' -A linuxPackages.kernel

     

       132
       132
       +
       <prompt>$ </prompt>unpackPhase

     

       133
       133
       +
       <prompt>$ </prompt>cd linux-*

     

       134
       134
       +
       <prompt>$ </prompt>make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules

     

       135
       135
       +
       <prompt># </prompt>insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko

     

       136
       136
       +
       </screen>

     

       137
       137
        
        </section>

     

       138
       138
        
       </chapter>

+10 -10

nixos/doc/manual/configuration/luks-file-systems.xml

···

       11
       11
        
         you create an encrypted Ext4 file system on the device

     

       12
       12
        
         <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:

     

       13
       13
        
       <screen>

     

       14
       14
       -
       # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d

     

       14
       14
       +
       <prompt># </prompt>cryptsetup luksFormat <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable>

     

       15
       15
        
       

     

       16
       16
        
       WARNING!

     

       17
       17
        
       ========

     
···

       21
       21
        
       Enter LUKS passphrase: ***

     

       22
       22
        
       Verify passphrase: ***

     

       23
       23
        
       

     

       24
       24
       -
       # cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted

     

       24
       24
       +
       <prompt># </prompt>cryptsetup luksOpen <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable> <replaceable>crypted</replaceable>

     

       25
       25
        
       Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***

     

       26
       26
        
       

     

       27
       27
       -
       # mkfs.ext4 /dev/mapper/crypted

     

       27
       27
       +
       <prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable>

     

       28
       28
        
       </screen>

     

       29
       29
        
         To ensure that this file system is automatically mounted at boot time as

     

       30
       30
        
         <filename>/</filename>, add the following to

     

       31
       31
        
         <filename>configuration.nix</filename>:

     

       32
       32
        
       <programlisting>

     

       33
       33
       -
       <link linkend="opt-boot.initrd.luks.devices._name_.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";

     

       34
       34
       -
       <xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";

     

       33
       33
       +
       <link linkend="opt-boot.initrd.luks.devices._name_.device">boot.initrd.luks.devices.crypted.device</link> = "<replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable>";

     

       34
       34
       +
       <xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/<replaceable>crypted</replaceable>";

     

       35
       35
        
       </programlisting>

     

       36
       36
        
         Should grub be used as bootloader, and <filename>/boot</filename> is located

     

       37
       37
        
         on an encrypted partition, it is necessary to add the following grub option:

     
···

       45
       45
        
          and add it as a new key to our existing device <filename>/dev/sda2</filename>:

     

       46
       46
        
       

     

       47
       47
        
          <screen>

     

       48
       48
       -
       # export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME"

     

       49
       49
       -
       # fido2luks credential "$FIDO2_LABEL"

     

       48
       48
       +
       <prompt># </prompt>export FIDO2_LABEL="<replaceable>/dev/sda2</replaceable> @ $HOSTNAME"

     

       49
       49
       +
       <prompt># </prompt>fido2luks credential "$FIDO2_LABEL"

     

       50
       50
        
       f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7

     

       51
       51
        
       

     

       52
       52
       -
       # fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7

     

       52
       52
       +
       <prompt># </prompt>fido2luks -i add-key <replaceable>/dev/sda2</replaceable> <replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable>

     

       53
       53
        
       Password:

     

       54
       54
        
       Password (again):

     

       55
       55
        
       Old password:

     
···

       60
       60
        
         To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to <filename>configuration.nix</filename>:

     

       61
       61
        
       <programlisting>

     

       62
       62
        
       <link linkend="opt-boot.initrd.luks.fido2Support">boot.initrd.luks.fido2Support</link> = true;

     

       63
       63
       -
       <link linkend="opt-boot.initrd.luks.devices._name_.fido2.credential">boot.initrd.luks.devices."/dev/sda2".fido2.credential</link> = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7";

     

       63
       63
       +
       <link linkend="opt-boot.initrd.luks.devices._name_.fido2.credential">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.credential</link> = "<replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable>";

     

       64
       64
        
       </programlisting>

     

       65
       65
        
       

     

       66
       66
        
         You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as <link xlink:href="https://trezor.io/">Trezor</link>.

     

       67
       67
        
       

     

       68
       68
        
       <programlisting>

     

       69
       69
       -
       <link linkend="opt-boot.initrd.luks.devices._name_.fido2.passwordLess">boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess</link> = true;

     

       69
       69
       +
       <link linkend="opt-boot.initrd.luks.devices._name_.fido2.passwordLess">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.passwordLess</link> = true;

     

       70
       70
        
       </programlisting>

     

       71
       71
        
         </para>

     

       72
       72
        
        </section>

+4 -4

nixos/doc/manual/configuration/user-mgmt.xml

···

       62
       62
        
         <command>useradd</command>, <command>groupmod</command> and so on. For

     

       63
       63
        
         instance, to create a user account named <literal>alice</literal>:

     

       64
       64
        
       <screen>

     

       65
       65
       -
       # useradd -m alice</screen>

     

       65
       65
       +
       <prompt># </prompt>useradd -m <replaceable>alice</replaceable></screen>

     

       66
       66
        
         To make all nix tools available to this new user use `su - USER` which opens

     

       67
       67
        
         a login shell (==shell that loads the profile) for given user. This will

     

       68
       68
        
         create the ~/.nix-defexpr symlink. So run:

     

       69
       69
        
       <screen>

     

       70
       70
       -
       # su - alice -c "true"</screen>

     

       70
       70
       +
       <prompt># </prompt>su - <replaceable>alice</replaceable> -c "true"</screen>

     

       71
       71
        
         The flag <option>-m</option> causes the creation of a home directory for the

     

       72
       72
        
         new user, which is generally what you want. The user does not have an initial

     

       73
       73
        
         password and therefore cannot log in. A password can be set using the

     

       74
       74
        
         <command>passwd</command> utility:

     

       75
       75
        
       <screen>

     

       76
       76
       -
       # passwd alice

     

       76
       76
       +
       <prompt># </prompt>passwd <replaceable>alice</replaceable>

     

       77
       77
        
       Enter new UNIX password: ***

     

       78
       78
        
       Retype new UNIX password: ***

     

       79
       79
        
       </screen>

     

       80
       80
        
         A user can be deleted using <command>userdel</command>:

     

       81
       81
        
       <screen>

     

       82
       82
       -
       # userdel -r alice</screen>

     

       82
       82
       +
       <prompt># </prompt>userdel -r <replaceable>alice</replaceable></screen>

     

       83
       83
        
         The flag <option>-r</option> deletes the user’s home directory. Accounts

     

       84
       84
        
         can be modified using <command>usermod</command>. Unix groups can be managed

     

       85
       85
        
         using <command>groupadd</command>, <command>groupmod</command> and

+1 -1

nixos/doc/manual/configuration/x-windows.xml

···

       58
       58
        
       </programlisting>

     

       59
       59
        
         The X server can then be started manually:

     

       60
       60
        
       <screen>

     

       61
       61
       -
       # systemctl start display-manager.service

     

       61
       61
       +
       <prompt># </prompt>systemctl start display-manager.service

     

       62
       62
        
       </screen>

     

       63
       63
        
        </para>

     

       64
       64
        
        <para>

+1 -1

nixos/doc/manual/development/meta-attributes.xml

···

       57
       57
        
             linkend="ch-configuration"/>. Changes to a module documentation

     

       58
       58
        
           have to be checked to not break building the NixOS manual:

     

       59
       59
        
          </para>

     

       60
       60
       -
       <programlisting>$ nix-build nixos/release.nix -A manual</programlisting>

     

       60
       60
       +
       <screen><prompt>$ </prompt>nix-build nixos/release.nix -A manual</screen>

     

       61
       61
        
         </callout>

     

       62
       62
        
        </calloutlist>

     

       63
       63
        
       </section>

+2 -2

nixos/doc/manual/development/writing-documentation.xml

···

       24
       24
        
         </para>

     

       25
       25
        
       

     

       26
       26
        
       <screen>

     

       27
       27
       -
         $ cd /path/to/nixpkgs/nixos/doc/manual

     

       28
       28
       -
         $ make

     

       27
       27
       +
       <prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual

     

       28
       28
       +
       <prompt>$ </prompt>make

     

       29
       29
        
       </screen>

     

       30
       30
        
       

     

       31
       31
        
         <para>

+7 -7

nixos/doc/manual/installation/installing-behind-a-proxy.xml

···

       27
       27
        
           Setup the proxy environment variables in the shell where you are running

     

       28
       28
        
           <literal>nixos-install</literal>.

     

       29
       29
        
          </para>

     

       30
       30
       -
       <programlisting>

     

       31
       31
       -
       # proxy_url=&quot;http://user:password@proxy:port/&quot;

     

       32
       32
       -
       # export http_proxy=&quot;$proxy_url&quot;

     

       33
       33
       -
       # export HTTP_PROXY=&quot;$proxy_url&quot;

     

       34
       34
       -
       # export https_proxy=&quot;$proxy_url&quot;

     

       35
       35
       -
       # export HTTPS_PROXY=&quot;$proxy_url&quot;

     

       36
       36
       -
       </programlisting>

     

       30
       30
       +
       <screen>

     

       31
       31
       +
       <prompt># </prompt>proxy_url=&quot;http://user:password@proxy:port/&quot;

     

       32
       32
       +
       <prompt># </prompt>export http_proxy=&quot;$proxy_url&quot;

     

       33
       33
       +
       <prompt># </prompt>export HTTP_PROXY=&quot;$proxy_url&quot;

     

       34
       34
       +
       <prompt># </prompt>export https_proxy=&quot;$proxy_url&quot;

     

       35
       35
       +
       <prompt># </prompt>export HTTPS_PROXY=&quot;$proxy_url&quot;

     

       36
       36
       +
       </screen>

     

       37
       37
        
         </listitem>

     

       38
       38
        
        </orderedlist>

     

       39
       39

+8 -8

nixos/doc/manual/installation/installing-from-other-distro.xml

···

       325
       325
        
           to boot on a USB rescue disk and do something along these lines:

     

       326
       326
        
          </para>

     

       327
       327
        
       <screen>

     

       328
       328
       -
       # mkdir root

     

       329
       329
       -
       # mount /dev/sdaX root

     

       330
       330
       -
       # mkdir root/nixos-root

     

       331
       331
       -
       # mv -v root/* root/nixos-root/

     

       332
       332
       -
       # mv -v root/nixos-root/old-root/* root/

     

       333
       333
       -
       # mv -v root/boot.bak root/boot  # We had renamed this by hand earlier

     

       334
       334
       -
       # umount root

     

       335
       335
       -
       # reboot</screen>

     

       328
       328
       +
       <prompt># </prompt>mkdir root

     

       329
       329
       +
       <prompt># </prompt>mount /dev/sdaX root

     

       330
       330
       +
       <prompt># </prompt>mkdir root/nixos-root

     

       331
       331
       +
       <prompt># </prompt>mv -v root/* root/nixos-root/

     

       332
       332
       +
       <prompt># </prompt>mv -v root/nixos-root/old-root/* root/

     

       333
       333
       +
       <prompt># </prompt>mv -v root/boot.bak root/boot  # We had renamed this by hand earlier

     

       334
       334
       +
       <prompt># </prompt>umount root

     

       335
       335
       +
       <prompt># </prompt>reboot</screen>

     

       336
       336
        
          <para>

     

       337
       337
        
           This may work as is or you might also need to reinstall the boot loader

     

       338
       338
        
          </para>

+6 -6

nixos/doc/manual/installation/upgrading.xml

···

       67
       67
        
         <literal>nixos-20.03</literal> channel. To see which NixOS channel you’re

     

       68
       68
        
         subscribed to, run the following as root:

     

       69
       69
        
       <screen>

     

       70
       70
       -
       # nix-channel --list | grep nixos

     

       70
       70
       +
       <prompt># </prompt>nix-channel --list | grep nixos

     

       71
       71
        
       nixos https://nixos.org/channels/nixos-unstable

     

       72
       72
        
       </screen>

     

       73
       73
        
         To switch to a different NixOS channel, do

     

       74
       74
        
       <screen>

     

       75
       75
       -
       # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos

     

       75
       75
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos

     

       76
       76
        
       </screen>

     

       77
       77
        
         (Be sure to include the <literal>nixos</literal> parameter at the end.) For

     

       78
       78
        
         instance, to use the NixOS 20.03 stable channel:

     

       79
       79
        
       <screen>

     

       80
       80
       -
       # nix-channel --add https://nixos.org/channels/nixos-20.03 nixos

     

       80
       80
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03 nixos

     

       81
       81
        
       </screen>

     

       82
       82
        
         If you have a server, you may want to use the “small” channel instead:

     

       83
       83
        
       <screen>

     

       84
       84
       -
       # nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos

     

       84
       84
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos

     

       85
       85
        
       </screen>

     

       86
       86
        
         And if you want to live on the bleeding edge:

     

       87
       87
        
       <screen>

     

       88
       88
       -
       # nix-channel --add https://nixos.org/channels/nixos-unstable nixos

     

       88
       88
       +
       <prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-unstable nixos

     

       89
       89
        
       </screen>

     

       90
       90
        
        </para>

     

       91
       91
        
        <para>

     

       92
       92
        
         You can then upgrade NixOS to the latest version in your chosen channel by

     

       93
       93
        
         running

     

       94
       94
        
       <screen>

     

       95
       95
       -
       # nixos-rebuild switch --upgrade

     

       95
       95
       +
       <prompt># </prompt>nixos-rebuild switch --upgrade

     

       96
       96
        
       </screen>

     

       97
       97
        
         which is equivalent to the more verbose <literal>nix-channel --update nixos;

     

       98
       98
        
         nixos-rebuild switch</literal>.

+2 -2

nixos/doc/manual/man-nixos-enter.xml

···

       136
       136
        
          <filename>/mnt</filename>:

     

       137
       137
        
         </para>

     

       138
       138
        
       <screen>

     

       139
       139
       -
       # nixos-enter --root /mnt

     

       139
       139
       +
       <prompt># </prompt>nixos-enter --root /mnt

     

       140
       140
        
       </screen>

     

       141
       141
        
         <para>

     

       142
       142
        
          Run a shell command:

     

       143
       143
        
         </para>

     

       144
       144
        
       <screen>

     

       145
       145
       -
       # nixos-enter -c 'ls -l /; cat /proc/mounts'

     

       145
       145
       +
       <prompt># </prompt>nixos-enter -c 'ls -l /; cat /proc/mounts'

     

       146
       146
        
       </screen>

     

       147
       147
        
         <para>

     

       148
       148
        
          Run a non-shell command:

+2 -2

nixos/doc/manual/man-nixos-version.xml

···

       33
       33
        
         <para>

     

       34
       34
        
          This command shows the version of the currently active NixOS configuration.

     

       35
       35
        
          For example:

     

       36
       36
       -
       <screen>$ nixos-version

     

       36
       36
       +
       <screen><prompt>$ </prompt>nixos-version

     

       37
       37
        
       16.03.1011.6317da4 (Emu)

     

       38
       38
        
       </screen>

     

       39
       39
        
          The version consists of the following elements:

     
···

       111
       111
        
            <para>

     

       112
       112
        
             Show the full SHA1 hash of the Git commit from which this configuration

     

       113
       113
        
             was built, e.g.

     

       114
       114
       -
       <screen>$ nixos-version --hash

     

       114
       114
       +
       <screen><prompt>$ </prompt>nixos-version --hash

     

       115
       115
        
       6317da40006f6bc2480c6781999c52d88dde2acf

     

       116
       116
        
       </screen>

     

       117
       117
        
            </para>

nixos/lib/utils.nix

···

       2
       2
        
       

     

       3
       3
        
       rec {

     

       4
       4
        
       

     

       5
       5
       +
         # Copy configuration files to avoid having the entire sources in the system closure

     

       6
       6
       +
         copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''

     

       7
       7
       +
           cp ${filePath} $out

     

       8
       8
       +
         '';

     

       9
       9
       +
       

     

       5
       10
        
         # Check whenever fileSystem is needed for boot.  NOTE: Make sure

     

       6
       11
        
         # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c

     

       7
       12
        
         # is in the list, put /a and /a/b in as well.

+56

nixos/modules/hardware/system-76.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         inherit (lib) mkOption mkEnableOption types mkIf mkMerge optional versionOlder;

     

       5
       5
       +
         cfg = config.hardware.system76;

     

       6
       6
       +
       

     

       7
       7
       +
         kpkgs = config.boot.kernelPackages;

     

       8
       8
       +
         modules = [ "system76" "system76-io" ] ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi");

     

       9
       9
       +
         modulePackages = map (m: kpkgs.${m}) modules;

     

       10
       10
       +
         moduleConfig = mkIf cfg.kernel-modules.enable {

     

       11
       11
       +
           boot.extraModulePackages = modulePackages;

     

       12
       12
       +
       

     

       13
       13
       +
           boot.kernelModules = modules;

     

       14
       14
       +
       

     

       15
       15
       +
           services.udev.packages = modulePackages;

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         firmware-pkg = pkgs.system76-firmware;

     

       19
       19
       +
         firmwareConfig = mkIf cfg.firmware-daemon.enable {

     

       20
       20
       +
           services.dbus.packages = [ firmware-pkg ];

     

       21
       21
       +
       

     

       22
       22
       +
           systemd.services.system76-firmware-daemon = {

     

       23
       23
       +
             description = "The System76 Firmware Daemon";

     

       24
       24
       +
       

     

       25
       25
       +
             serviceConfig = {

     

       26
       26
       +
               ExecStart = "${firmware-pkg}/bin/system76-firmware-daemon";

     

       27
       27
       +
       

     

       28
       28
       +
               Restart = "on-failure";

     

       29
       29
       +
             };

     

       30
       30
       +
       

     

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

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       in {

     

       35
       35
       +
         options = {

     

       36
       36
       +
           hardware.system76 = {

     

       37
       37
       +
             enableAll = mkEnableOption "all recommended configuration for system76 systems";

     

       38
       38
       +
       

     

       39
       39
       +
             firmware-daemon.enable = mkOption {

     

       40
       40
       +
               default = cfg.enableAll;

     

       41
       41
       +
               example = true;

     

       42
       42
       +
               description = "Whether to enable the system76 firmware daemon";

     

       43
       43
       +
               type = types.bool;

     

       44
       44
       +
             };

     

       45
       45
       +
       

     

       46
       46
       +
             kernel-modules.enable = mkOption {

     

       47
       47
       +
               default = cfg.enableAll;

     

       48
       48
       +
               example = true;

     

       49
       49
       +
               description = "Whether to make the system76 out-of-tree kernel modules available";

     

       50
       50
       +
               type = types.bool;

     

       51
       51
       +
             };

     

       52
       52
       +
           };

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         config = mkMerge [ moduleConfig firmwareConfig ];

     

       56
       56
       +
       }

nixos/modules/hardware/video/nvidia.nix

···

       16
       16
        
               kernelPackages.nvidia_x11

     

       17
       17
        
           else if elem "nvidiaBeta" drivers then

     

       18
       18
        
               kernelPackages.nvidia_x11_beta

     

       19
       19
       +
           else if elem "nvidiaVulkanBeta" drivers then

     

       20
       20
       +
               kernelPackages.nvidia_x11_vulkan_beta

     

       19
       21
        
           else if elem "nvidiaLegacy304" drivers then

     

       20
       22
        
             kernelPackages.nvidia_x11_legacy304

     

       21
       23
        
           else if elem "nvidiaLegacy340" drivers then

nixos/modules/module-list.nix

···

       60
       60
        
         ./hardware/printers.nix

     

       61
       61
        
         ./hardware/raid/hpsa.nix

     

       62
       62
        
         ./hardware/steam-hardware.nix

     

       63
       63
       +
         ./hardware/system-76.nix

     

       63
       64
        
         ./hardware/tuxedo-keyboard.nix

     

       64
       65
        
         ./hardware/usb-wwan.nix

     

       65
       66
        
         ./hardware/onlykey.nix

+4 -4

nixos/modules/services/backup/borgbackup.xml

···

       69
       69
        
           access this single repository. You need the output of the generate pub file.

     

       70
       70
        
         </para>

     

       71
       71
        
           <para>

     

       72
       72
       -
               <programlisting>

     

       73
       73
       -
       # sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo

     

       74
       74
       -
       # cat /run/keys/id_ed25519_my_borg_repo

     

       75
       75
       -
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos</programlisting>

     

       72
       72
       +
       <screen>

     

       73
       73
       +
       <prompt># </prompt>sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo

     

       74
       74
       +
       <prompt># </prompt>cat /run/keys/id_ed25519_my_borg_repo

     

       75
       75
       +
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos</screen>

     

       76
       76
        
           </para>

     

       77
       77
        
           <para>

     

       78
       78
        
             Add the following snippet to your NixOS configuration:

+38 -1

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

···

       877
       877
        
               description = "Configure the SAML integration.";

     

       878
       878
        
             };

     

       879
       879
        
           };

     

       880
       880
       +
       

     

       881
       881
       +
       

     

       882
       882
       +
           environmentFile = mkOption {

     

       883
       883
       +
             type = with types; nullOr path;

     

       884
       884
       +
             default = null;

     

       885
       885
       +
             example = "/var/lib/codimd/codimd.env";

     

       886
       886
       +
             description = ''

     

       887
       887
       +
               Environment file as defined in <citerefentry>

     

       888
       888
       +
               <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum>

     

       889
       889
       +
               </citerefentry>.

     

       890
       890
       +
       

     

       891
       891
       +
               Secrets may be passed to the service without adding them to the world-readable

     

       892
       892
       +
               Nix store, by specifying placeholder variables as the option value in Nix and

     

       893
       893
       +
               setting these variables accordingly in the environment file.

     

       894
       894
       +
       

     

       895
       895
       +
               <programlisting>

     

       896
       896
       +
                 # snippet of CodiMD-related config

     

       897
       897
       +
                 services.codimd.configuration.dbURL = "postgres://codimd:\''${DB_PASSWORD}@db-host:5432/codimddb";

     

       898
       898
       +
                 services.codimd.configuration.minio.secretKey = "$MINIO_SECRET_KEY";

     

       899
       899
       +
               </programlisting>

     

       900
       900
       +
       

     

       901
       901
       +
               <programlisting>

     

       902
       902
       +
                 # content of the environment file

     

       903
       903
       +
                 DB_PASSWORD=verysecretdbpassword

     

       904
       904
       +
                 MINIO_SECRET_KEY=verysecretminiokey

     

       905
       905
       +
               </programlisting>

     

       906
       906
       +
       

     

       907
       907
       +
               Note that this file needs to be available on the host on which

     

       908
       908
       +
               <literal>CodiMD</literal> is running.

     

       909
       909
       +
             '';

     

       910
       910
       +
           };

     

       880
       911
        
         };

     

       881
       912
        
       

     

       882
       913
        
         config = mkIf cfg.enable {

     
···

       900
       931
        
             description = "CodiMD Service";

     

       901
       932
        
             wantedBy = [ "multi-user.target" ];

     

       902
       933
        
             after = [ "networking.target" ];

     

       934
       934
       +
             preStart = ''

     

       935
       935
       +
               ${pkgs.envsubst}/bin/envsubst \

     

       936
       936
       +
                 -o ${cfg.workDir}/config.json \

     

       937
       937
       +
                 -i ${prettyJSON cfg.configuration}

     

       938
       938
       +
             '';

     

       903
       939
        
             serviceConfig = {

     

       904
       940
        
               WorkingDirectory = cfg.workDir;

     

       905
       941
        
               ExecStart = "${pkgs.codimd}/bin/codimd";

     

       942
       942
       +
               EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];

     

       906
       943
        
               Environment = [

     

       907
       907
       -
                 "CMD_CONFIG_FILE=${prettyJSON cfg.configuration}"

     

       944
       944
       +
                 "CMD_CONFIG_FILE=${cfg.workDir}/config.json"

     

       908
       945
        
                 "NODE_ENV=production"

     

       909
       946
        
               ];

     

       910
       947
        
               Restart = "always";

+3 -3

nixos/modules/system/activation/top-level.nix

···

       159
       159
        
               To switch to a specialised configuration

     

       160
       160
        
               (e.g. <literal>fewJobsManyCores</literal>) at runtime, run:

     

       161
       161
        
       

     

       162
       162
       -
               <programlisting>

     

       163
       163
       -
               # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test

     

       164
       164
       -
               </programlisting>

     

       162
       162
       +
               <screen>

     

       163
       163
       +
               <prompt># </prompt>sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test

     

       164
       164
       +
               </screen>

     

       165
       165
        
             '';

     

       166
       166
        
             type = types.attrsOf (types.submodule (

     

       167
       167
        
               { ... }: {

nixos/modules/system/boot/stage-1-init.sh

···

       218
       218
        
       # Create device nodes in /dev.

     

       219
       219
        
       @preDeviceCommands@

     

       220
       220
        
       echo "running udev..."

     

       221
       221
       +
       ln -sfn /proc/self/fd /dev/fd

     

       221
       222
        
       mkdir -p /etc/systemd

     

       222
       223
        
       ln -sfn @linkUnits@ /etc/systemd/network

     

       223
       224
        
       mkdir -p /etc/udev

+2 -6

nixos/modules/virtualisation/containers.nix

···

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

     

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

     

       2
       2
        
       let

     

       3
       3
        
         cfg = config.virtualisation.containers;

     

       4
       4
        
       

     
···

       13
       13
        
           json2toml "$valuePath" "$out"

     

       14
       14
        
         '';

     

       15
       15
        
       

     

       16
       16
       -
         # Copy configuration files to avoid having the entire sources in the system closure

     

       17
       17
       -
         copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''

     

       18
       18
       -
           cp ${filePath} $out

     

       19
       19
       -
         '';

     

       20
       16
        
       in

     

       21
       17
        
       {

     

       22
       18
        
         meta = {

     
···

       136
       132
        
       

     

       137
       133
        
           environment.etc."containers/policy.json".source =

     

       138
       134
        
             if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy)

     

       139
       139
       -
             else copyFile "${pkgs.skopeo.src}/default-policy.json";

     

       135
       135
       +
             else utils.copyFile "${pkgs.skopeo.src}/default-policy.json";

     

       140
       136
        
         };

     

       141
       137
        
       

     

       142
       138
        
       }

+12 -9

nixos/modules/virtualisation/cri-o.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
       -
       

     

       5
       4
        
       let

     

       6
       5
        
         cfg = config.virtualisation.cri-o;

     

       7
       6
        
       

     

       8
       7
        
         crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });

     

       9
       8
        
       

     

       10
       10
       -
         # Copy configuration files to avoid having the entire sources in the system closure

     

       11
       11
       -
         copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''

     

       12
       12
       -
           cp ${filePath} $out

     

       13
       13
       -
         '';

     

       14
       9
        
       in

     

       15
       10
        
       {

     

       16
       11
        
         imports = [

     
···

       78
       73
        
               The final CRI-O package (including extra packages).

     

       79
       74
        
             '';

     

       80
       75
        
           };

     

       76
       76
       +
       

     

       77
       77
       +
           networkDir = mkOption {

     

       78
       78
       +
             type = types.nullOr types.path;

     

       79
       79
       +
             default = null;

     

       80
       80
       +
             description = "Override the network_dir option.";

     

       81
       81
       +
             internal = true;

     

       82
       82
       +
           };

     

       81
       83
        
         };

     

       82
       84
        
       

     

       83
       85
        
         config = mkIf cfg.enable {

     

       84
       86
        
           environment.systemPackages = [ cfg.package pkgs.cri-tools ];

     

       85
       87
        
       

     

       86
       86
       -
           environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";

     

       88
       88
       +
           environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";

     

       87
       89
        
       

     

       88
       90
        
           environment.etc."crio/crio.conf.d/00-default.conf".text = ''

     

       89
       91
        
             [crio]

     
···

       95
       97
        
       

     

       96
       98
        
             [crio.network]

     

       97
       99
        
             plugin_dirs = ["${pkgs.cni-plugins}/bin/"]

     

       100
       100
       +
             ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''}

     

       98
       101
        
       

     

       99
       102
        
             [crio.runtime]

     

       100
       103
        
             cgroup_manager = "systemd"

     
···

       109
       112
        
             ''}

     

       110
       113
        
           '';

     

       111
       114
        
       

     

       112
       112
       -
           environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";

     

       113
       113
       -
           environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";

     

       115
       115
       +
           environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";

     

       116
       116
       +
           environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";

     

       114
       117
        
       

     

       115
       118
        
           # Enable common /etc/containers configuration

     

       116
       119
        
           virtualisation.containers.enable = true;

+2 -7

nixos/modules/virtualisation/podman.nix

···

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

     

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

     

       2
       2
        
       let

     

       3
       3
        
         cfg = config.virtualisation.podman;

     

       4
       4
        
       

     
···

       19
       19
        
             basename=$(basename $f | sed s/podman/docker/g)

     

       20
       20
        
             ln -s $f $man/share/man/man1/$basename

     

       21
       21
        
           done

     

       22
       22
       -
         '';

     

       23
       23
       -
       

     

       24
       24
       -
         # Copy configuration files to avoid having the entire sources in the system closure

     

       25
       25
       -
         copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} ''

     

       26
       26
       -
           cp ${filePath} $out

     

       27
       22
        
         '';

     

       28
       23
        
       

     

       29
       24
        
       in

     
···

       88
       83
        
           environment.systemPackages = [ cfg.package ]

     

       89
       84
        
             ++ lib.optional cfg.dockerCompat dockerCompat;

     

       90
       85
        
       

     

       91
       91
       -
           environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";

     

       86
       86
       +
           environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";

     

       92
       87
        
       

     

       93
       88
        
           # Enable common /etc/containers configuration

     

       94
       89
        
           virtualisation.containers.enable = true;

+9 -1

nixos/tests/codimd.nix

···

       21
       21
        
             services = {

     

       22
       22
        
               codimd = {

     

       23
       23
        
                 enable = true;

     

       24
       24
       -
                 configuration.dbURL = "postgres://codimd:snakeoilpassword@localhost:5432/codimddb";

     

       24
       24
       +
                 configuration.dbURL = "postgres://codimd:\${DB_PASSWORD}@localhost:5432/codimddb";

     

       25
       25
       +
       

     

       26
       26
       +
                 /*

     

       27
       27
       +
                  * Do not use pkgs.writeText for secrets as

     

       28
       28
       +
                  * they will end up in the world-readable Nix store.

     

       29
       29
       +
                  */

     

       30
       30
       +
                 environmentFile = pkgs.writeText "codimd-env" ''

     

       31
       31
       +
                   DB_PASSWORD=snakeoilpassword

     

       32
       32
       +
                 '';

     

       25
       33
        
               };

     

       26
       34
        
               postgresql = {

     

       27
       35
        
                 enable = true;

+4 -3

nixos/tests/magnetico.nix

···

       27
       27
        
             start_all()

     

       28
       28
        
             machine.wait_for_unit("magneticod")

     

       29
       29
        
             machine.wait_for_unit("magneticow")

     

       30
       30
       +
             machine.wait_for_open_port(${toString port})

     

       30
       31
        
             machine.succeed(

     

       31
       31
       -
                 "${pkgs.curl}/bin/curl "

     

       32
       32
       +
                 "${pkgs.curl}/bin/curl --fail "

     

       32
       33
        
                 + "-u user:password http://localhost:${toString port}"

     

       33
       34
        
             )

     

       34
       34
       -
             assert "Unauthorised." in machine.succeed(

     

       35
       35
       -
                 "${pkgs.curl}/bin/curl "

     

       35
       35
       +
             machine.fail(

     

       36
       36
       +
                 "${pkgs.curl}/bin/curl --fail "

     

       36
       37
        
                 + "-u user:wrongpwd http://localhost:${toString port}"

     

       37
       38
        
             )

     

       38
       39
        
             machine.shutdown()

+2 -2

pkgs/applications/audio/drumkv1/default.nix

···

       2
       2
        
       

     

       3
       3
        
       mkDerivation rec {

     

       4
       4
        
         pname = "drumkv1";

     

       5
       5
       -
         version = "0.9.15";

     

       5
       5
       +
         version = "0.9.16";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab";

     

       9
       9
       +
           sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

+3 -3

pkgs/applications/audio/fdkaac/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "fdkaac";

     

       5
       5
       -
         version = "1.0.0";

     

       5
       5
       +
         version = "1.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "nu774";

     

       9
       9
        
           repo = pname;

     

       10
       10
       -
           rev = version;

     

       11
       11
       -
           sha256 = "16iwqmwagnb929byz8kj79pmmr0anbyv26drbavhppmxhk7rrpgh";

     

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

     

       11
       11
       +
           sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook ];

+2 -2

pkgs/applications/audio/jamulus/default.nix

···

       3
       3
        
       

     

       4
       4
        
       mkDerivation rec {

     

       5
       5
        
         pname = "jamulus";

     

       6
       6
       -
         version = "3.5.9";

     

       6
       6
       +
         version = "3.5.10";

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "corrados";

     

       9
       9
        
           repo = "jamulus";

     

       10
       10
        
           rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";

     

       11
       11
       -
           sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460";

     

       11
       11
       +
           sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ pkg-config qmake ];

+52

pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch

···

       1
       1
       +
       From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Francesco Gazzetta <fgaz@fgaz.me>

     

       3
       3
       +
       Date: Wed, 19 Aug 2020 15:06:19 +0200

     

       4
       4
       +
       Subject: [PATCH 1/2] Remove coherency checks >:)

     

       5
       5
       +
       

     

       6
       6
       +
       As far as I can see, they are just to make sure that the types can fit

     

       7
       7
       +
       in the word length, but this check was written when 64 bits weren't a

     

       8
       8
       +
       possibility and didn't take that into account,

     

       9
       9
       +
       so although the types do fit, the checks fail.

     

       10
       10
       +
       Indeed, the program seems to work well on 64 bits.

     

       11
       11
       +
       More info here:

     

       12
       12
       +
       https://github.com/Mdashdotdashn/LittleGPTracker/issues/4

     

       13
       13
       +
       ---

     

       14
       14
       +
        sources/Externals/Soundfont/DATATYPE.H | 22 ----------------------

     

       15
       15
       +
        1 file changed, 22 deletions(-)

     

       16
       16
       +
       

     

       17
       17
       +
       diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H

     

       18
       18
       +
       index 762a724..f6b031f 100644

     

       19
       19
       +
       --- a/sources/Externals/Soundfont/DATATYPE.H

     

       20
       20
       +
       +++ b/sources/Externals/Soundfont/DATATYPE.H

     

       21
       21
       +
       @@ -123,28 +123,6 @@ typedef short               SHORT;     /* 16 bit signed value was: INT */

     

       22
       22
       +
        ********************************************************************/

     

       23
       23
       +
        typedef unsigned short        EMUSTAT;

     

       24
       24
       +
        

     

       25
       25
       +
       -/********************************************************************

     

       26
       26
       +
       -* Compare <limits.h> values with SoundFont Enabler limits.  Fail compile

     

       27
       27
       +
       -* if discrepency. If compile fails due to one of these errors, then

     

       28
       28
       +
       -* the SoundFont enabler will not work with your system or the state of your

     

       29
       29
       +
       -* development environment.

     

       30
       30
       +
       -********************************************************************/

     

       31
       31
       +
       -#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL)

     

       32
       32
       +
       -  #error <datatype.h>: char is out of range!

     

       33
       33
       +
       -#endif

     

       34
       34
       +
       -

     

       35
       35
       +
       -#if (SHRT_MAX != SHRT_MAXVAL)

     

       36
       36
       +
       -  #error <datatype.h>: short is out of range!

     

       37
       37
       +
       -#endif

     

       38
       38
       +
       -

     

       39
       39
       +
       -#if (LONG_MAX != LONG_MAXVAL)

     

       40
       40
       +
       -  #error <datatype.h>: long is out of range!

     

       41
       41
       +
       -#endif

     

       42
       42
       +
       -

     

       43
       43
       +
       -#if (ULONG_MAX != DWORD_MAXVAL)

     

       44
       44
       +
       -  #error <datatype.h>: unsigned long is out of range!

     

       45
       45
       +
       -#endif

     

       46
       46
       +
       -

     

       47
       47
       +
        #ifdef __BYTE_COHERENT

     

       48
       48
       +
        

     

       49
       49
       +
        /********************************************************************

     

       50
       50
       +
       -- 

     

       51
       51
       +
       2.25.4

     

       52
       52
       +

+27

pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch

···

       1
       1
       +
       From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Francesco Gazzetta <fgaz@fgaz.me>

     

       3
       3
       +
       Date: Wed, 19 Aug 2020 15:06:58 +0200

     

       4
       4
       +
       Subject: [PATCH 2/2] Set the initial directory to the current directory

     

       5
       5
       +
       

     

       6
       6
       +
       otherwise the user has to navigate from the nix store, which makes the program

     

       7
       7
       +
       crash due to its size

     

       8
       8
       +
       ---

     

       9
       9
       +
        sources/Adapters/DEB/System/DEBSystem.cpp | 2 +-

     

       10
       10
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       11
       11
       +
       

     

       12
       12
       +
       diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp

     

       13
       13
       +
       index 6e86693..65d2cdd 100644

     

       14
       14
       +
       --- a/sources/Adapters/DEB/System/DEBSystem.cpp

     

       15
       15
       +
       +++ b/sources/Adapters/DEB/System/DEBSystem.cpp

     

       16
       16
       +
       @@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) {

     

       17
       17
       +
        	}

     

       18
       18
       +
        	Path::SetAlias("bin",dirname(buff)) ;

     

       19
       19
       +
        

     

       20
       20
       +
       -	Path::SetAlias("root","bin:..") ;

     

       21
       21
       +
       +	Path::SetAlias("root",".") ;

     

       22
       22
       +
        

     

       23
       23
       +
        #ifdef _DEBUG

     

       24
       24
       +
          Trace::GetInstance()->SetLogger(*(new StdOutLogger()));

     

       25
       25
       +
       -- 

     

       26
       26
       +
       2.25.4

     

       27
       27
       +

+72

pkgs/applications/audio/littlegptracker/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , SDL

     

       4
       4
       +
       , jack2

     

       5
       5
       +
       , Foundation

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation rec {

     

       9
       9
       +
         pname = "littlegptracker";

     

       10
       10
       +
         version = "unstable-2019-04-14";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchFromGitHub {

     

       13
       13
       +
           owner = "Mdashdotdashn";

     

       14
       14
       +
           repo = "littlegptracker";

     

       15
       15
       +
           rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891";

     

       16
       16
       +
           sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b";

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         buildInputs = [

     

       20
       20
       +
           SDL

     

       21
       21
       +
         ]

     

       22
       22
       +
         ++ stdenv.lib.optional stdenv.isDarwin Foundation

     

       23
       23
       +
         ++ stdenv.lib.optional stdenv.isLinux jack2;

     

       24
       24
       +
       

     

       25
       25
       +
         patches = [

     

       26
       26
       +
           # Remove outdated (pre-64bit) checks that would fail on modern platforms

     

       27
       27
       +
           # (see description in patch file)

     

       28
       28
       +
           ./0001-Remove-coherency-checks.patch

     

       29
       29
       +
           # Set starting directory to cwd, default is in /nix/store and causes a crash

     

       30
       30
       +
           # (see description in patch file)

     

       31
       31
       +
           ./0002-Set-the-initial-directory-to-the-current-directory.patch

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       34
       34
       +
         preBuild = "cd projects";

     

       35
       35
       +
       

     

       36
       36
       +
         makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]

     

       37
       37
       +
           ++ stdenv.lib.optionals stdenv.isLinux  [ "PLATFORM=DEB" ]

     

       38
       38
       +
           ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ];

     

       39
       39
       +
       

     

       40
       40
       +
         NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++

     

       41
       41
       +
           stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing";

     

       42
       42
       +
       

     

       43
       43
       +
         NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation";

     

       44
       44
       +
       

     

       45
       45
       +
         installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe";

     

       46
       46
       +
           in "install -Dm555 lgpt.${extension} $out/bin/lgpt";

     

       47
       47
       +
       

     

       48
       48
       +
         meta = with stdenv.lib; {

     

       49
       49
       +
           description = "A music tracker similar to lsdj optimised to run on portable game consoles";

     

       50
       50
       +
           longDescription = ''

     

       51
       51
       +
             LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised

     

       52
       52
       +
             to run on portable game consoles. It is currently running on Game Park's

     

       53
       53
       +
             GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian).

     

       54
       54
       +
       

     

       55
       55
       +
             It implements the user interface of littlesounddj, a very famous tracker

     

       56
       56
       +
             for the Gameboy platform that has been tried and tested by many users over

     

       57
       57
       +
             the years, leading to a little complex but yet extremely efficent way of

     

       58
       58
       +
             working.

     

       59
       59
       +
       

     

       60
       60
       +
             Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback

     

       61
       61
       +
             channels. Additionally, the program can drive MIDI instruments (with the

     

       62
       62
       +
             gp32 and gp2x a custom MIDI interface is required).

     

       63
       63
       +
           '';

     

       64
       64
       +
           homepage = "http://www.littlegptracker.com/";

     

       65
       65
       +
           downloadPage = "http://www.littlegptracker.com/download.php";

     

       66
       66
       +
           license = licenses.bsd3;

     

       67
       67
       +
           maintainers = with maintainers; [ fgaz ];

     

       68
       68
       +
           platforms = platforms.all;

     

       69
       69
       +
           # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821

     

       70
       70
       +
           broken = stdenv.isDarwin;

     

       71
       71
       +
         };

     

       72
       72
       +
       }

+24 -2

pkgs/applications/audio/mpg123/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
       -
       , fetchurl, alsaLib

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       , makeWrapper

     

       4
       4
       +
       

     

       5
       5
       +
       , alsaLib

     

       6
       6
       +
       , perl

     

       3
       7
        
       }:

     

       4
       8
        
       

     

       5
       9
        
       stdenv.mkDerivation rec {

     
···

       10
       14
        
           sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h";

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       13
       -
         buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

     

       17
       17
       +
         outputs = [ "out" "conplay" ];

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ makeWrapper ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

     

       14
       22
        
       

     

       15
       23
        
         configureFlags = stdenv.lib.optional

     

       16
       24
        
           (stdenv.hostPlatform ? mpg123)

     

       17
       25
        
           "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}";

     

       26
       26
       +
       

     

       27
       27
       +
         postInstall = ''

     

       28
       28
       +
           mkdir -p $conplay/bin

     

       29
       29
       +
           mv scripts/conplay $conplay/bin/

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         preFixup = ''

     

       33
       33
       +
           patchShebangs $conplay/bin/conplay

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         postFixup = ''

     

       37
       37
       +
           wrapProgram $conplay/bin/conplay \

     

       38
       38
       +
             --prefix PATH : $out/bin

     

       39
       39
       +
         '';

     

       18
       40
        
       

     

       19
       41
        
         meta = {

     

       20
       42
        
           description = "Fast console MPEG Audio Player and decoder library";

+2 -2

pkgs/applications/audio/picard/default.nix

···

       12
       12
        
         ;

     

       13
       13
        
       in pythonPackages.buildPythonApplication rec {

     

       14
       14
        
         pname = "picard";

     

       15
       15
       -
         version = "2.4.2";

     

       15
       15
       +
         version = "2.4.4";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "metabrainz";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = "release-${version}";

     

       21
       21
       -
           sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah";

     

       21
       21
       +
           sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]

+4 -4

pkgs/applications/blockchains/wasabibackend/deps.nix

···

       770
       770
        
         })

     

       771
       771
        
         (fetchNuGet {

     

       772
       772
        
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       773
       773
       -
           version = "3.1.2";

     

       774
       774
       -
           sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9";

     

       773
       773
       +
           version = "3.1.8";

     

       774
       774
       +
           sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";

     

       775
       775
        
         })

     

       776
       776
        
         (fetchNuGet {

     

       777
       777
        
           name = "Microsoft.NETCore.App.Runtime.linux-x64";

     

       778
       778
       -
           version = "3.1.2";

     

       779
       779
       -
           sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";

     

       778
       778
       +
           version = "3.1.8";

     

       779
       779
       +
           sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";

     

       780
       780
        
         })

     

       781
       781
        
         (fetchNuGet {

     

       782
       782
        
           name = "Microsoft.CSharp";

+3 -3

pkgs/applications/editors/vscode/vscode.nix

···

       11
       11
        
         archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

     

       12
       12
        
       

     

       13
       13
        
         sha256 = {

     

       14
       14
       -
           x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr";

     

       15
       15
       -
           x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn";

     

       14
       14
       +
           x86_64-linux = "1kgvwcwkdvywsiyg86srfzcq6jcas6hyi9ds4qvndsnd64j0fgkn";

     

       15
       15
       +
           x86_64-darwin = "03jci05psxkknpjrrgjpdxsii2xyf5cfpkhrp5nnfafb5acfvs1x";

     

       16
       16
        
         }.${system};

     

       17
       17
        
       in

     

       18
       18
        
         callPackage ./generic.nix rec {

     
···

       21
       21
        
       

     

       22
       22
        
           # Please backport all compatible updates to the stable release.

     

       23
       23
        
           # This is important for the extension ecosystem.

     

       24
       24
       -
           version = "1.48.2";

     

       24
       24
       +
           version = "1.49.1";

     

       25
       25
        
           pname = "vscode";

     

       26
       26
        
       

     

       27
       27
        
           executableName = "code" + lib.optionalString isInsiders "-insiders";

+4 -4

pkgs/applications/misc/1password/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "1password";

     

       5
       5
       -
         version = "1.1.1";

     

       5
       5
       +
         version = "1.7.0";

     

       6
       6
        
         src =

     

       7
       7
        
           if stdenv.isLinux then fetchzip {

     

       8
       8
        
             url = {

     
···

       10
       10
        
               "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";

     

       11
       11
        
             }.${stdenv.hostPlatform.system};

     

       12
       12
        
             sha256 = {

     

       13
       13
       -
               "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0";

     

       14
       14
       -
               "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g";

     

       13
       13
       +
               "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw";

     

       14
       14
       +
               "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran";

     

       15
       15
        
             }.${stdenv.hostPlatform.system};

     

       16
       16
        
             stripRoot = false;

     

       17
       17
        
           } else fetchurl {

     

       18
       18
        
             url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg";

     

       19
       19
       -
             sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm";

     

       19
       19
       +
             sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn";

     

       20
       20
        
           };

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ];

+2 -2

pkgs/applications/misc/fetchmail/default.nix

···

       1
       1
        
       { stdenv, fetchurl, openssl }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "6.4.8";

     

       4
       4
       +
         version = "6.4.12";

     

       5
       5
        
       in

     

       6
       6
        
       stdenv.mkDerivation {

     

       7
       7
        
         pname = "fetchmail";

     
···

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";

     

       12
       12
       -
           sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96";

     

       12
       12
       +
           sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         buildInputs = [ openssl ];

+2 -2

pkgs/applications/misc/go-jira/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "go-jira";

     

       5
       5
       -
         version = "1.0.23";

     

       5
       5
       +
         version = "1.0.24";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

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

     

       9
       9
        
           owner = "go-jira";

     

       10
       10
        
           repo = "jira";

     

       11
       11
       -
           sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b";

     

       11
       11
       +
           sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18";

+2 -2

pkgs/applications/misc/grip/default.nix

···

       2
       2
        
       , curl, cdparanoia, libid3tag, ncurses, libtool }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "grip-4.1.1";

     

       5
       5
       +
         name = "grip-4.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://sourceforge/grip/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs";

     

       9
       9
       +
           sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+39 -32

pkgs/applications/misc/weather/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pythonPackages }:

     

       1
       1
       +
       { stdenv, fetchurl, pythonPackages, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
           version = "2.4.1";

     

       5
       5
       -
           pname = "weather";

     

       4
       4
       +
         version = "2.4.1";

     

       5
       5
       +
         pname = "weather";

     

       6
       6
        
       

     

       7
       7
       -
           src = fetchurl {

     

       8
       8
       -
               url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";

     

       9
       9
       -
               sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys";

     

       10
       10
       -
           };

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz";

     

       9
       9
       +
           sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys";

     

       10
       10
       +
         };

     

       11
       11
        
       

     

       12
       12
       -
           nativeBuildInputs = [ pythonPackages.wrapPython ];

     

       12
       12
       +
         nativeBuildInputs = [

     

       13
       13
       +
           installShellFiles

     

       14
       14
       +
           pythonPackages.wrapPython

     

       15
       15
       +
         ];

     

       13
       16
        
       

     

       14
       14
       -
           buildInputs = [ pythonPackages.python ];

     

       17
       17
       +
         dontConfigure = true;

     

       18
       18
       +
         dontBuild = true;

     

       19
       19
       +
       

     

       20
       20
       +
         # Upstream doesn't provide a setup.py or alike, so we follow:

     

       21
       21
       +
         # http://fungi.yuggoth.org/weather/doc/install.rst#id3

     

       22
       22
       +
         installPhase = ''

     

       23
       23
       +
           site_packages=$out/${pythonPackages.python.sitePackages}

     

       24
       24
       +
           install -Dt $out/bin -m 755 weather

     

       25
       25
       +
           install -Dt $site_packages weather.py

     

       26
       26
       +
           install -Dt $out/share/weather-util \

     

       27
       27
       +
             airports overrides.{conf,log} places slist stations \

     

       28
       28
       +
             zctas zlist zones

     

       29
       29
       +
           install -Dt $out/etc weatherrc

     

       30
       30
       +
       

     

       31
       31
       +
           sed -i \

     

       32
       32
       +
             -e "s|/etc|$out/etc|g" \

     

       33
       33
       +
             -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \

     

       34
       34
       +
             $site_packages/weather.py

     

       15
       35
        
       

     

       16
       16
       -
           phases = [ "unpackPhase" "installPhase" ];

     

       36
       36
       +
           wrapPythonPrograms

     

       17
       37
        
       

     

       18
       18
       -
           installPhase = ''

     

       19
       19
       -
               site_packages=$out/${pythonPackages.python.sitePackages}

     

       20
       20
       -
               mkdir -p $out/{share/{man,weather-util},bin,etc} $site_packages

     

       21
       21
       -
               cp weather $out/bin/

     

       22
       22
       -
               cp weather.py $site_packages/

     

       23
       23
       -
               chmod +x $out/bin/weather

     

       24
       24
       -
               cp airports overrides.{conf,log} places slist stations zctas zlist zones $out/share/weather-util/

     

       25
       25
       -
               cp weatherrc $out/etc

     

       26
       26
       -
               cp weather.1 weatherrc.5 $out/share/man/

     

       27
       27
       -
               sed -i \

     

       28
       28
       -
                 -e "s|/etc|$out/etc|g" \

     

       29
       29
       -
                 -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \

     

       30
       30
       -
                 $site_packages/weather.py

     

       31
       31
       -
               wrapPythonPrograms

     

       32
       32
       -
           '';

     

       38
       38
       +
           installManPage weather.1 weatherrc.5

     

       39
       39
       +
         '';

     

       33
       40
        
       

     

       34
       34
       -
           meta = with stdenv.lib; {

     

       35
       35
       -
               homepage = "http://fungi.yuggoth.org/weather";

     

       36
       36
       -
               description = "Quick access to current weather conditions and forecasts";

     

       37
       37
       -
               license = licenses.isc;

     

       38
       38
       -
               maintainers = [ maintainers.matthiasbeyer ];

     

       39
       39
       -
               platforms = platforms.linux ++ platforms.darwin;

     

       40
       40
       -
           };

     

       41
       41
       +
         meta = with stdenv.lib; {

     

       42
       42
       +
           homepage = "http://fungi.yuggoth.org/weather";

     

       43
       43
       +
           description = "Quick access to current weather conditions and forecasts";

     

       44
       44
       +
           license = licenses.isc;

     

       45
       45
       +
           maintainers = [ maintainers.matthiasbeyer ];

     

       46
       46
       +
           platforms = platforms.unix;

     

       47
       47
       +
         };

     

       41
       48
        
       }

+9 -9

pkgs/applications/networking/browsers/chromium/upstream-info.json

···

       1
       1
        
       {

     

       2
       2
        
         "stable": {

     

       3
       3
       -
           "version": "85.0.4183.102",

     

       4
       4
       -
           "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a",

     

       5
       5
       -
           "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm"

     

       3
       3
       +
           "version": "85.0.4183.121",

     

       4
       4
       +
           "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670",

     

       5
       5
       +
           "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca"

     

       6
       6
        
         },

     

       7
       7
        
         "beta": {

     

       8
       8
       -
           "version": "86.0.4240.30",

     

       9
       9
       -
           "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl",

     

       10
       10
       -
           "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa"

     

       8
       8
       +
           "version": "86.0.4240.42",

     

       9
       9
       +
           "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa",

     

       10
       10
       +
           "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj"

     

       11
       11
        
         },

     

       12
       12
        
         "dev": {

     

       13
       13
       -
           "version": "87.0.4252.0",

     

       14
       14
       -
           "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y",

     

       15
       15
       -
           "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw"

     

       13
       13
       +
           "version": "87.0.4263.3",

     

       14
       14
       +
           "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk",

     

       15
       15
       +
           "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m"

     

       16
       16
        
         }

     

       17
       17
        
       }

+385 -385

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix

···

       1
       1
        
       {

     

       2
       2
       -
         version = "80.0.1";

     

       2
       2
       +
         version = "81.0";

     

       3
       3
        
         sources = [

     

       4
       4
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ach/firefox-80.0.1.tar.bz2";

     

       4
       4
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ach/firefox-81.0.tar.bz2";

     

       5
       5
        
             locale = "ach";

     

       6
       6
        
             arch = "linux-x86_64";

     

       7
       7
       -
             sha256 = "d3297316b481d6fa10cf71e7d1331f407e6167fbd1b6a854fc39fe2aca466250";

     

       7
       7
       +
             sha256 = "7ff2b7ec6f3f55fccfb7988d7a42bc9cbe572af6edc64ac9b42ea15aaed9cd4c";

     

       8
       8
        
           }

     

       9
       9
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/af/firefox-80.0.1.tar.bz2";

     

       9
       9
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/af/firefox-81.0.tar.bz2";

     

       10
       10
        
             locale = "af";

     

       11
       11
        
             arch = "linux-x86_64";

     

       12
       12
       -
             sha256 = "464726f6cf660a8f5d6059ee85fdd0b87cd97c51abf578fdb851a181c94b110a";

     

       12
       12
       +
             sha256 = "c1a29b1473583d28f87c764c8ccf67f7cba874fd85e5820f968230c9ce29670b";

     

       13
       13
        
           }

     

       14
       14
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/an/firefox-80.0.1.tar.bz2";

     

       14
       14
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/an/firefox-81.0.tar.bz2";

     

       15
       15
        
             locale = "an";

     

       16
       16
        
             arch = "linux-x86_64";

     

       17
       17
       -
             sha256 = "3fcc891f53ed5986554c5f595fa75631402ae35eb484ae22c15cdcf3d1885311";

     

       17
       17
       +
             sha256 = "bddab1deeaf3c6474586beb41ad9c720ed6e84f9e999a856b17bb4e7c9d97991";

     

       18
       18
        
           }

     

       19
       19
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ar/firefox-80.0.1.tar.bz2";

     

       19
       19
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ar/firefox-81.0.tar.bz2";

     

       20
       20
        
             locale = "ar";

     

       21
       21
        
             arch = "linux-x86_64";

     

       22
       22
       -
             sha256 = "d30299d7e707c7528a87d3094612bff6013bf135f4ca5e2cc2105bcd434baddf";

     

       22
       22
       +
             sha256 = "3c4e339627fc94df273ba7e1e1c150188033331def09678b2e0abb54e52f2120";

     

       23
       23
        
           }

     

       24
       24
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ast/firefox-80.0.1.tar.bz2";

     

       24
       24
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ast/firefox-81.0.tar.bz2";

     

       25
       25
        
             locale = "ast";

     

       26
       26
        
             arch = "linux-x86_64";

     

       27
       27
       -
             sha256 = "c766b9c3fc2b63e0e61e113678afa783efabb96620d1715fb72bd17f4a93188d";

     

       27
       27
       +
             sha256 = "e421c32fefef657287ad52dc11f2f3166e549ef9d54065099f84e5f35c8a52af";

     

       28
       28
        
           }

     

       29
       29
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/az/firefox-80.0.1.tar.bz2";

     

       29
       29
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/az/firefox-81.0.tar.bz2";

     

       30
       30
        
             locale = "az";

     

       31
       31
        
             arch = "linux-x86_64";

     

       32
       32
       -
             sha256 = "49264b6f35bc0cc5198782fd2fa62a0388e04141b1580a44f71c48e6b44853df";

     

       32
       32
       +
             sha256 = "e1099ab7b028d8124446a21056e55dc4b87d1f20972dea60125347b1b099e35d";

     

       33
       33
        
           }

     

       34
       34
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/be/firefox-80.0.1.tar.bz2";

     

       34
       34
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/be/firefox-81.0.tar.bz2";

     

       35
       35
        
             locale = "be";

     

       36
       36
        
             arch = "linux-x86_64";

     

       37
       37
       -
             sha256 = "391f9423e7211790509e03822a4186117320da8f660a1e3b44ff44712235762e";

     

       37
       37
       +
             sha256 = "a216a2cd652905d946aff1cb3a0fc8738a1e3d5746d080dd863d34be244a2a50";

     

       38
       38
        
           }

     

       39
       39
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bg/firefox-80.0.1.tar.bz2";

     

       39
       39
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bg/firefox-81.0.tar.bz2";

     

       40
       40
        
             locale = "bg";

     

       41
       41
        
             arch = "linux-x86_64";

     

       42
       42
       -
             sha256 = "45e04e624329abe7704242581599a11e177ff3418adc49cd5bd59f45b2f0d517";

     

       42
       42
       +
             sha256 = "68a8a4ec3d0c1fb8a174a7466abbfb6c806bb8a263ab852b15dfdd15c35487aa";

     

       43
       43
        
           }

     

       44
       44
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bn/firefox-80.0.1.tar.bz2";

     

       44
       44
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bn/firefox-81.0.tar.bz2";

     

       45
       45
        
             locale = "bn";

     

       46
       46
        
             arch = "linux-x86_64";

     

       47
       47
       -
             sha256 = "36c1ce02ae8b4ed1dd78ade3dadfb24042c6fe7d942c9e3be6b9c94dd7fa96df";

     

       47
       47
       +
             sha256 = "3eaae9060b690391cbc63aacdb1d833b2895c7aaf6da36c32cb117e7994d94d2";

     

       48
       48
        
           }

     

       49
       49
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/br/firefox-80.0.1.tar.bz2";

     

       49
       49
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/br/firefox-81.0.tar.bz2";

     

       50
       50
        
             locale = "br";

     

       51
       51
        
             arch = "linux-x86_64";

     

       52
       52
       -
             sha256 = "83c0b3ec0fcf7d26a45c7e59a7c467c64fbc7d9fcce5358451e51828aa57acde";

     

       52
       52
       +
             sha256 = "806b366419eb6edab57c8f3af9f0465d3547e3e28047983af7cb2f08ad822a8d";

     

       53
       53
        
           }

     

       54
       54
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bs/firefox-80.0.1.tar.bz2";

     

       54
       54
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bs/firefox-81.0.tar.bz2";

     

       55
       55
        
             locale = "bs";

     

       56
       56
        
             arch = "linux-x86_64";

     

       57
       57
       -
             sha256 = "d1c1dbb0060ab256ca932f1ae2a8df8e8b130242c8a1d9014a047eae79d95687";

     

       57
       57
       +
             sha256 = "025a79c350f35f8bba1a5fdd894d0eb237d22be8ee5825e6a657f18b0c99bd87";

     

       58
       58
        
           }

     

       59
       59
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca-valencia/firefox-80.0.1.tar.bz2";

     

       59
       59
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca-valencia/firefox-81.0.tar.bz2";

     

       60
       60
        
             locale = "ca-valencia";

     

       61
       61
        
             arch = "linux-x86_64";

     

       62
       62
       -
             sha256 = "8b4b1b7bb92287b4049712335c6da52f7bd825490996a48e4b376a3811700790";

     

       62
       62
       +
             sha256 = "806f26efe0a6317cb5dd1b631f8b96bceeaa6e8fced624d15ac334d0d2d78dc8";

     

       63
       63
        
           }

     

       64
       64
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca/firefox-80.0.1.tar.bz2";

     

       64
       64
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca/firefox-81.0.tar.bz2";

     

       65
       65
        
             locale = "ca";

     

       66
       66
        
             arch = "linux-x86_64";

     

       67
       67
       -
             sha256 = "34a48e1d85e7557b318590faccf621fd4c32e51060dc5d06f40ec933599ac4b6";

     

       67
       67
       +
             sha256 = "dfa651a556e024d2d27a27d97eec87750d8f4e692345a0f4e12c7a3480ac1d20";

     

       68
       68
        
           }

     

       69
       69
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cak/firefox-80.0.1.tar.bz2";

     

       69
       69
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cak/firefox-81.0.tar.bz2";

     

       70
       70
        
             locale = "cak";

     

       71
       71
        
             arch = "linux-x86_64";

     

       72
       72
       -
             sha256 = "8db14d21c578d8e238b3a0882bcce70bb48d66fe60fc74053acf5bcf212fd243";

     

       72
       72
       +
             sha256 = "7225d8cf7a529d8688aa7386fe14e50e4e208d55732523d5407690f63b6ab775";

     

       73
       73
        
           }

     

       74
       74
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cs/firefox-80.0.1.tar.bz2";

     

       74
       74
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cs/firefox-81.0.tar.bz2";

     

       75
       75
        
             locale = "cs";

     

       76
       76
        
             arch = "linux-x86_64";

     

       77
       77
       -
             sha256 = "361414fede99694a9b8f31076b1a9d7c871d857870cfe0ef01cb3e02a5be0b3f";

     

       77
       77
       +
             sha256 = "17d22031176a4604d498743eea242fe257c74620ac8ab88f8f197d57f8615663";

     

       78
       78
        
           }

     

       79
       79
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cy/firefox-80.0.1.tar.bz2";

     

       79
       79
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cy/firefox-81.0.tar.bz2";

     

       80
       80
        
             locale = "cy";

     

       81
       81
        
             arch = "linux-x86_64";

     

       82
       82
       -
             sha256 = "bde481d7acfca3e0c33c63d7dffd9772adbd11c252dc4e92367476c5fc347cd5";

     

       82
       82
       +
             sha256 = "82581e54dc72e188a5d4976bed58bcb8ba4153e72854fc439d3a903a5f60e6e9";

     

       83
       83
        
           }

     

       84
       84
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/da/firefox-80.0.1.tar.bz2";

     

       84
       84
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/da/firefox-81.0.tar.bz2";

     

       85
       85
        
             locale = "da";

     

       86
       86
        
             arch = "linux-x86_64";

     

       87
       87
       -
             sha256 = "bca4e7d4690cb950d9fa87623da30b93f54d0efd005e440b1af9acb06833baf2";

     

       87
       87
       +
             sha256 = "87a600d73b3fb74ff8aaf26e1d915afa52692501ce67f13e308a7c9af63e6853";

     

       88
       88
        
           }

     

       89
       89
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/de/firefox-80.0.1.tar.bz2";

     

       89
       89
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/de/firefox-81.0.tar.bz2";

     

       90
       90
        
             locale = "de";

     

       91
       91
        
             arch = "linux-x86_64";

     

       92
       92
       -
             sha256 = "e4deb64c304ec7b5c06c0f8ec8299d6c513def1e0524cb93dba2fb3e22fca8e4";

     

       92
       92
       +
             sha256 = "a15fdfafe598fe5e2d5c5854755e316844518eb1b4634aad6cbe99fefc3e5986";

     

       93
       93
        
           }

     

       94
       94
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/dsb/firefox-80.0.1.tar.bz2";

     

       94
       94
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/dsb/firefox-81.0.tar.bz2";

     

       95
       95
        
             locale = "dsb";

     

       96
       96
        
             arch = "linux-x86_64";

     

       97
       97
       -
             sha256 = "809080cde0646ed2e4a64e2e70beb25aa3dcc47f7f749f2722c898f8efd9271b";

     

       97
       97
       +
             sha256 = "abb71f8df0de953ab2c27e50c9b49a69c012fbe52a0d6eb66744b03754d494ba";

     

       98
       98
        
           }

     

       99
       99
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/el/firefox-80.0.1.tar.bz2";

     

       99
       99
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/el/firefox-81.0.tar.bz2";

     

       100
       100
        
             locale = "el";

     

       101
       101
        
             arch = "linux-x86_64";

     

       102
       102
       -
             sha256 = "7f5abfb89c70187b9b8e954c21b566da9b28781f1de80634da6c47d149363cff";

     

       102
       102
       +
             sha256 = "ed3782c6e619f9e0e59b2eb1f36e5c94a92e2f7b617b2ef87e0a2da0c4e65032";

     

       103
       103
        
           }

     

       104
       104
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-CA/firefox-80.0.1.tar.bz2";

     

       104
       104
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-CA/firefox-81.0.tar.bz2";

     

       105
       105
        
             locale = "en-CA";

     

       106
       106
        
             arch = "linux-x86_64";

     

       107
       107
       -
             sha256 = "61d6a1cf59a89d2e690423f38779dc7c776757ed39a1fd66b9bfa6b5e63e68b4";

     

       107
       107
       +
             sha256 = "5c5ae0e8345f13c346e2b756a57f465776e8d5a1ea62dd00dc6fe5a3b7c904fc";

     

       108
       108
        
           }

     

       109
       109
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-GB/firefox-80.0.1.tar.bz2";

     

       109
       109
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-GB/firefox-81.0.tar.bz2";

     

       110
       110
        
             locale = "en-GB";

     

       111
       111
        
             arch = "linux-x86_64";

     

       112
       112
       -
             sha256 = "75b1808a6d5ea0b70df3bbb7d9b8890418069c5fa9bd8a5dce6b0f18f5e3b2de";

     

       112
       112
       +
             sha256 = "3ed2a11824c00fd157b9b3d02dcde95ae8347b6add687f4bbc3284601360c1a2";

     

       113
       113
        
           }

     

       114
       114
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-US/firefox-80.0.1.tar.bz2";

     

       114
       114
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-US/firefox-81.0.tar.bz2";

     

       115
       115
        
             locale = "en-US";

     

       116
       116
        
             arch = "linux-x86_64";

     

       117
       117
       -
             sha256 = "3ac0c9c4454647ce986bbe6f3567b0e1de5c0719ed6b6627344292c581a2afd3";

     

       117
       117
       +
             sha256 = "689d75035303b47266a3819e8aa3bb9026559b819aec2f6e95faa67b86888ce0";

     

       118
       118
        
           }

     

       119
       119
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eo/firefox-80.0.1.tar.bz2";

     

       119
       119
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eo/firefox-81.0.tar.bz2";

     

       120
       120
        
             locale = "eo";

     

       121
       121
        
             arch = "linux-x86_64";

     

       122
       122
       -
             sha256 = "5c61e9348fe69bbd32d9501730b9cc12c14b55746b5b670379ab0c463f2d71c2";

     

       122
       122
       +
             sha256 = "cbebf5a97e5b2fb58c187553c8fcfd6474dae4a911c97cd8730977b8bee6c6cc";

     

       123
       123
        
           }

     

       124
       124
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-AR/firefox-80.0.1.tar.bz2";

     

       124
       124
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-AR/firefox-81.0.tar.bz2";

     

       125
       125
        
             locale = "es-AR";

     

       126
       126
        
             arch = "linux-x86_64";

     

       127
       127
       -
             sha256 = "0203caa38c1526c8c3df9c315e205770b43594f222364f9bebb3e89485a1803d";

     

       127
       127
       +
             sha256 = "e664214c7b2809919b672426c5d35e467eadf69fcbf43d20e00f379e5ab6f558";

     

       128
       128
        
           }

     

       129
       129
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-CL/firefox-80.0.1.tar.bz2";

     

       129
       129
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-CL/firefox-81.0.tar.bz2";

     

       130
       130
        
             locale = "es-CL";

     

       131
       131
        
             arch = "linux-x86_64";

     

       132
       132
       -
             sha256 = "c2b7e09dce573ef945379a7a5f7691d877efa14e226bcd20ad48a3dedba1d1d2";

     

       132
       132
       +
             sha256 = "10b07cafb315ef4497d9b2caaac0a83c86701506adab2f0e154a7873f39b3066";

     

       133
       133
        
           }

     

       134
       134
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-ES/firefox-80.0.1.tar.bz2";

     

       134
       134
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-ES/firefox-81.0.tar.bz2";

     

       135
       135
        
             locale = "es-ES";

     

       136
       136
        
             arch = "linux-x86_64";

     

       137
       137
       -
             sha256 = "0653d855ff0e04b6f6a6e44de558de69fac582996c7b944dec043810c8faa704";

     

       137
       137
       +
             sha256 = "aeb7d0af26b7fa4be27eb0b82da4051ab57ee1406eb20d3b5d12ec5d32d0104b";

     

       138
       138
        
           }

     

       139
       139
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-MX/firefox-80.0.1.tar.bz2";

     

       139
       139
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-MX/firefox-81.0.tar.bz2";

     

       140
       140
        
             locale = "es-MX";

     

       141
       141
        
             arch = "linux-x86_64";

     

       142
       142
       -
             sha256 = "9c6f7b6208b390a73dfe778ac0a798b4999abe93840b4224a5852143f3588f2a";

     

       142
       142
       +
             sha256 = "c515c089afe6e4ef46df7ace24260118ed464a62146f59cce064ca465bb7affe";

     

       143
       143
        
           }

     

       144
       144
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/et/firefox-80.0.1.tar.bz2";

     

       144
       144
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/et/firefox-81.0.tar.bz2";

     

       145
       145
        
             locale = "et";

     

       146
       146
        
             arch = "linux-x86_64";

     

       147
       147
       -
             sha256 = "786495f0ef9af4475755378d9ae3095041c4f329e9cbca197eaff0199d6bdf02";

     

       147
       147
       +
             sha256 = "930c174be085acb50b18b4ee5b20b158c9a790ca19232cc25a1e34628a7b4346";

     

       148
       148
        
           }

     

       149
       149
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eu/firefox-80.0.1.tar.bz2";

     

       149
       149
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eu/firefox-81.0.tar.bz2";

     

       150
       150
        
             locale = "eu";

     

       151
       151
        
             arch = "linux-x86_64";

     

       152
       152
       -
             sha256 = "91c9baea255e46ebc3ef8702eb8e233b395cd39c9c092c0812adcdcb60f5f3ae";

     

       152
       152
       +
             sha256 = "2f0e39cece971b12f6f5c325277e77e5a3f053ab57cdc2a2905d9f7f3e739fe8";

     

       153
       153
        
           }

     

       154
       154
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fa/firefox-80.0.1.tar.bz2";

     

       154
       154
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fa/firefox-81.0.tar.bz2";

     

       155
       155
        
             locale = "fa";

     

       156
       156
        
             arch = "linux-x86_64";

     

       157
       157
       -
             sha256 = "1baf78177598c3e0fa6714ed85a305b6a811baa26b1d0c6d7d6d05c8bb8b8595";

     

       157
       157
       +
             sha256 = "98029d664de21403cb54276a30d650a124e5b5250939c7e315a0435ebcc2bf26";

     

       158
       158
        
           }

     

       159
       159
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ff/firefox-80.0.1.tar.bz2";

     

       159
       159
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ff/firefox-81.0.tar.bz2";

     

       160
       160
        
             locale = "ff";

     

       161
       161
        
             arch = "linux-x86_64";

     

       162
       162
       -
             sha256 = "20e44b613633e84c8808c76ccd61a78bb8dce1a09bdaa1d6aa95dae1eacaafc6";

     

       162
       162
       +
             sha256 = "097747294c73df707c7652c239330c106c69f77868fad65d490d1b896f90e689";

     

       163
       163
        
           }

     

       164
       164
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fi/firefox-80.0.1.tar.bz2";

     

       164
       164
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fi/firefox-81.0.tar.bz2";

     

       165
       165
        
             locale = "fi";

     

       166
       166
        
             arch = "linux-x86_64";

     

       167
       167
       -
             sha256 = "d6f634e7aa109d368bb2b7e8b3c3682117d350ad7630d6283006f8d22f98201c";

     

       167
       167
       +
             sha256 = "c915afc5e73f837e1e09ac0d14510271602ef5527ebf270b399be880c183b5a5";

     

       168
       168
        
           }

     

       169
       169
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fr/firefox-80.0.1.tar.bz2";

     

       169
       169
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fr/firefox-81.0.tar.bz2";

     

       170
       170
        
             locale = "fr";

     

       171
       171
        
             arch = "linux-x86_64";

     

       172
       172
       -
             sha256 = "a0c7326670acb7b097c17905b23410819429b2357534eade971a9c3b22b268ba";

     

       172
       172
       +
             sha256 = "775fee38f2033be70e4d68d985602bce3df69f9106d1c427a06b3f8233e7c30f";

     

       173
       173
        
           }

     

       174
       174
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fy-NL/firefox-80.0.1.tar.bz2";

     

       174
       174
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fy-NL/firefox-81.0.tar.bz2";

     

       175
       175
        
             locale = "fy-NL";

     

       176
       176
        
             arch = "linux-x86_64";

     

       177
       177
       -
             sha256 = "f28ae560003555ded4590f0640a89090cbe0e732449973aa2b42d530e3829b73";

     

       177
       177
       +
             sha256 = "49efc463dfe6b7b7a8dc0bf351cc903160bef3e1886c8faee6f11cca3abd3e90";

     

       178
       178
        
           }

     

       179
       179
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ga-IE/firefox-80.0.1.tar.bz2";

     

       179
       179
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ga-IE/firefox-81.0.tar.bz2";

     

       180
       180
        
             locale = "ga-IE";

     

       181
       181
        
             arch = "linux-x86_64";

     

       182
       182
       -
             sha256 = "04b260885b755f9c7fe93a82ad10855abfbd14706ec81f0fe38c96c2355c833d";

     

       182
       182
       +
             sha256 = "6dcf0be88e5fad96c79ccd4b6a612d721b792099d9f1bc029ff5b592c4004922";

     

       183
       183
        
           }

     

       184
       184
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gd/firefox-80.0.1.tar.bz2";

     

       184
       184
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gd/firefox-81.0.tar.bz2";

     

       185
       185
        
             locale = "gd";

     

       186
       186
        
             arch = "linux-x86_64";

     

       187
       187
       -
             sha256 = "b8f4529a7970906654a6df2f91a5687d49dccf8f1438ed86bcc4d9608a2f26fc";

     

       187
       187
       +
             sha256 = "924d9190a1d5dc85abcb1f23aacffb98c0116c5cbd430ec04c5275317639772e";

     

       188
       188
        
           }

     

       189
       189
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gl/firefox-80.0.1.tar.bz2";

     

       189
       189
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gl/firefox-81.0.tar.bz2";

     

       190
       190
        
             locale = "gl";

     

       191
       191
        
             arch = "linux-x86_64";

     

       192
       192
       -
             sha256 = "234c4f3ddb6e5a59f8eaae2b58d8a1dc302f66a5e7edc6337d9b1e6e1e1dab24";

     

       192
       192
       +
             sha256 = "256c1b81294bc262770c655e2fdb5e36684286f4eb1857d6d38b87beba2b3d3d";

     

       193
       193
        
           }

     

       194
       194
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gn/firefox-80.0.1.tar.bz2";

     

       194
       194
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gn/firefox-81.0.tar.bz2";

     

       195
       195
        
             locale = "gn";

     

       196
       196
        
             arch = "linux-x86_64";

     

       197
       197
       -
             sha256 = "0c7688233efc95bcbefa8b2faaced313d69c0fb246a91564b3629ec24026843b";

     

       197
       197
       +
             sha256 = "2d9d55f4755f372e18a7d07786d64f09a4b4f76e6a80d8904e06188bc6edff41";

     

       198
       198
        
           }

     

       199
       199
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gu-IN/firefox-80.0.1.tar.bz2";

     

       199
       199
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gu-IN/firefox-81.0.tar.bz2";

     

       200
       200
        
             locale = "gu-IN";

     

       201
       201
        
             arch = "linux-x86_64";

     

       202
       202
       -
             sha256 = "12c45963b4b7e4976f656b60e9c4964ad871f96cefeb5e898c3a830c85d92d78";

     

       202
       202
       +
             sha256 = "86a64d446efcaa014fbbb05787223a025d99947ae4aa8e704661f1236c08bbcd";

     

       203
       203
        
           }

     

       204
       204
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/he/firefox-80.0.1.tar.bz2";

     

       204
       204
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/he/firefox-81.0.tar.bz2";

     

       205
       205
        
             locale = "he";

     

       206
       206
        
             arch = "linux-x86_64";

     

       207
       207
       -
             sha256 = "8e0c8c06f5e9665a7bc9733e3afe514620c2b6071451c9ca05f0a1fa9b953c58";

     

       207
       207
       +
             sha256 = "64b1fcd9c454d1248eb1f2d02877f964e50dce38ffbdd93ca4c367246121eed2";

     

       208
       208
        
           }

     

       209
       209
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hi-IN/firefox-80.0.1.tar.bz2";

     

       209
       209
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hi-IN/firefox-81.0.tar.bz2";

     

       210
       210
        
             locale = "hi-IN";

     

       211
       211
        
             arch = "linux-x86_64";

     

       212
       212
       -
             sha256 = "008d5f194b9572ecee09ea67481ed1fa91f6a7987105d90c53924fd9d8e7ec7b";

     

       212
       212
       +
             sha256 = "5d5f52e34c735df3ec5571e03e834919001fe3417a4190515f86f1e479690ace";

     

       213
       213
        
           }

     

       214
       214
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hr/firefox-80.0.1.tar.bz2";

     

       214
       214
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hr/firefox-81.0.tar.bz2";

     

       215
       215
        
             locale = "hr";

     

       216
       216
        
             arch = "linux-x86_64";

     

       217
       217
       -
             sha256 = "2ce4d27f389f2f4137d8f8487c4f4d32bf6833870592755e13694f48ab6966f2";

     

       217
       217
       +
             sha256 = "e6085effe2607a416e80a310ace23381fcdd752bba8e58ad7611f05885e01e11";

     

       218
       218
        
           }

     

       219
       219
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hsb/firefox-80.0.1.tar.bz2";

     

       219
       219
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hsb/firefox-81.0.tar.bz2";

     

       220
       220
        
             locale = "hsb";

     

       221
       221
        
             arch = "linux-x86_64";

     

       222
       222
       -
             sha256 = "2c540fc55a0bebe2886123e3edcaaedf793e022eb0244c2eead9e1fba337d129";

     

       222
       222
       +
             sha256 = "6a35c1657d78cfa843a24bea346fd98aeae041fdeb65297693f89b012f0c3786";

     

       223
       223
        
           }

     

       224
       224
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hu/firefox-80.0.1.tar.bz2";

     

       224
       224
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hu/firefox-81.0.tar.bz2";

     

       225
       225
        
             locale = "hu";

     

       226
       226
        
             arch = "linux-x86_64";

     

       227
       227
       -
             sha256 = "8f2c14860f0a97c2aea13b262a7f4ba62efbf643eb285f2282ba3467d7aa59c3";

     

       227
       227
       +
             sha256 = "3717f43d3d771cbf4dee43889e0bfac3eb60dff8989c06496cbf14ace5753ca3";

     

       228
       228
        
           }

     

       229
       229
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hy-AM/firefox-80.0.1.tar.bz2";

     

       229
       229
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hy-AM/firefox-81.0.tar.bz2";

     

       230
       230
        
             locale = "hy-AM";

     

       231
       231
        
             arch = "linux-x86_64";

     

       232
       232
       -
             sha256 = "c003e6572b150a9c0f33f1fe0d2d2e537e1d5bd901b937663cbdb8c50a0b2639";

     

       232
       232
       +
             sha256 = "c376e1f35c8067b41415175bcb597c331b5f5352d4262f5a38d08296a307343d";

     

       233
       233
        
           }

     

       234
       234
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ia/firefox-80.0.1.tar.bz2";

     

       234
       234
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ia/firefox-81.0.tar.bz2";

     

       235
       235
        
             locale = "ia";

     

       236
       236
        
             arch = "linux-x86_64";

     

       237
       237
       -
             sha256 = "b8da547a7236c08b681d33d405f6ddf3f17a5342f8354a3565c6dfc39d3cabd4";

     

       237
       237
       +
             sha256 = "99e0aafd820a965cd85fe9094b7465d700f8e62cbba86ef9746a44445e5bba2d";

     

       238
       238
        
           }

     

       239
       239
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/id/firefox-80.0.1.tar.bz2";

     

       239
       239
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/id/firefox-81.0.tar.bz2";

     

       240
       240
        
             locale = "id";

     

       241
       241
        
             arch = "linux-x86_64";

     

       242
       242
       -
             sha256 = "7c3adc7ec426b3f8a2da36fba744d07774037fa8dbadbf727eae3fdbb19a3bf7";

     

       242
       242
       +
             sha256 = "ada432c2d6a04fe928416980b0f3575e2a42668c7298f68c32071ae2c4f5bb8d";

     

       243
       243
        
           }

     

       244
       244
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/is/firefox-80.0.1.tar.bz2";

     

       244
       244
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/is/firefox-81.0.tar.bz2";

     

       245
       245
        
             locale = "is";

     

       246
       246
        
             arch = "linux-x86_64";

     

       247
       247
       -
             sha256 = "57bbfd97596d9d2c557186d729ea74f233bc50833d8a1d768402cf6d25cb8dd7";

     

       247
       247
       +
             sha256 = "df304bee0b2235222c97e49e0ad8bc0e3fe1cbe3ec0ffbf1b996902a6817d863";

     

       248
       248
        
           }

     

       249
       249
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/it/firefox-80.0.1.tar.bz2";

     

       249
       249
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/it/firefox-81.0.tar.bz2";

     

       250
       250
        
             locale = "it";

     

       251
       251
        
             arch = "linux-x86_64";

     

       252
       252
       -
             sha256 = "0de8a984c4a328020d351edfefe717325d4c50403f126b8c211b2798062c854c";

     

       252
       252
       +
             sha256 = "8c35e143b73d3019b284a006501f93aa2550b32688d7d3285e56f92703df959d";

     

       253
       253
        
           }

     

       254
       254
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ja/firefox-80.0.1.tar.bz2";

     

       254
       254
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ja/firefox-81.0.tar.bz2";

     

       255
       255
        
             locale = "ja";

     

       256
       256
        
             arch = "linux-x86_64";

     

       257
       257
       -
             sha256 = "5a718d304fd3dd30abb9b9b5f6a54aca5c9a6cd1c9ccc3bd5859773112432f8a";

     

       257
       257
       +
             sha256 = "39c23321100cee799e7024ac27d547a6cd7672485f07125d02c75dcd8e38f268";

     

       258
       258
        
           }

     

       259
       259
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ka/firefox-80.0.1.tar.bz2";

     

       259
       259
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ka/firefox-81.0.tar.bz2";

     

       260
       260
        
             locale = "ka";

     

       261
       261
        
             arch = "linux-x86_64";

     

       262
       262
       -
             sha256 = "2422236d92428e2a0f921433f6bbcb87505aac7110cacc6ca61173a28555ba35";

     

       262
       262
       +
             sha256 = "b40137c85d1783ee9a8a11fbd72e33bb9a2d3baa4bc2cc9f31a0c0bf020c2233";

     

       263
       263
        
           }

     

       264
       264
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kab/firefox-80.0.1.tar.bz2";

     

       264
       264
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kab/firefox-81.0.tar.bz2";

     

       265
       265
        
             locale = "kab";

     

       266
       266
        
             arch = "linux-x86_64";

     

       267
       267
       -
             sha256 = "ab81137395002af2626e534e5133b455d4b50f441cf71f9a11b8f92444221535";

     

       267
       267
       +
             sha256 = "61dab84674aef3fd91db859900de4709744816f621fecdb3df46a63f4426289b";

     

       268
       268
        
           }

     

       269
       269
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kk/firefox-80.0.1.tar.bz2";

     

       269
       269
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kk/firefox-81.0.tar.bz2";

     

       270
       270
        
             locale = "kk";

     

       271
       271
        
             arch = "linux-x86_64";

     

       272
       272
       -
             sha256 = "daba81c27dc36bcd267a0c77255b8333b8ab0f3e0e338a74eb17a36cd83af7db";

     

       272
       272
       +
             sha256 = "a9e8e32cd7441a4b78c5c7b9ea7943c756f5b362a9e6a9028e20dfcb461bb056";

     

       273
       273
        
           }

     

       274
       274
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/km/firefox-80.0.1.tar.bz2";

     

       274
       274
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/km/firefox-81.0.tar.bz2";

     

       275
       275
        
             locale = "km";

     

       276
       276
        
             arch = "linux-x86_64";

     

       277
       277
       -
             sha256 = "021f7787bfe87ccc8bc33ed6668196f4a7d528672ba14eff1ca4fa4efe0c2768";

     

       277
       277
       +
             sha256 = "f003c7a5eab166f29c37aaaf2c5cc4669d90fff33854d43e157130f606011820";

     

       278
       278
        
           }

     

       279
       279
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kn/firefox-80.0.1.tar.bz2";

     

       279
       279
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kn/firefox-81.0.tar.bz2";

     

       280
       280
        
             locale = "kn";

     

       281
       281
        
             arch = "linux-x86_64";

     

       282
       282
       -
             sha256 = "973259c5b54672b0f5aedbb5c2126716cc7b8792f3b2c6f9d6d745eb9e6d9529";

     

       282
       282
       +
             sha256 = "f23a998f16c3a93c210b7f08337bb3e739311ada223e85ac4599819b89bf7110";

     

       283
       283
        
           }

     

       284
       284
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ko/firefox-80.0.1.tar.bz2";

     

       284
       284
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ko/firefox-81.0.tar.bz2";

     

       285
       285
        
             locale = "ko";

     

       286
       286
        
             arch = "linux-x86_64";

     

       287
       287
       -
             sha256 = "3bda308c8bce3b00250827d7b505c9cbe9574cd7809dd866ffe7a230dbdbb7bb";

     

       287
       287
       +
             sha256 = "b6748a4a86fe9864a3378e32357c0fbc542846308ae8ac8005460d40f4f869b9";

     

       288
       288
        
           }

     

       289
       289
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lij/firefox-80.0.1.tar.bz2";

     

       289
       289
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lij/firefox-81.0.tar.bz2";

     

       290
       290
        
             locale = "lij";

     

       291
       291
        
             arch = "linux-x86_64";

     

       292
       292
       -
             sha256 = "c57dccdb4f9281b31c1b359bd2a07b3376a693f3f37c513223029fa854b61644";

     

       292
       292
       +
             sha256 = "267633fa63849ae002ebffd892ea3f520d59bace0a7dafe1f92dcbbfcaa7cf00";

     

       293
       293
        
           }

     

       294
       294
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lt/firefox-80.0.1.tar.bz2";

     

       294
       294
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lt/firefox-81.0.tar.bz2";

     

       295
       295
        
             locale = "lt";

     

       296
       296
        
             arch = "linux-x86_64";

     

       297
       297
       -
             sha256 = "ce04853033bb00b760c4814b436a67e151f54842ab736b440f118c44945e53d1";

     

       297
       297
       +
             sha256 = "a985da29e6d91efed407bc9d898e8bd8f68d42cd4673b6ea163b99d8bb9cd642";

     

       298
       298
        
           }

     

       299
       299
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lv/firefox-80.0.1.tar.bz2";

     

       299
       299
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lv/firefox-81.0.tar.bz2";

     

       300
       300
        
             locale = "lv";

     

       301
       301
        
             arch = "linux-x86_64";

     

       302
       302
       -
             sha256 = "79b71529569df018e86925e8df25dae43cc54629eee50035fe515c9299d2664f";

     

       302
       302
       +
             sha256 = "05a05361cd3b5772c30c2a8cef03e8753311245caea3ee94e03fbb3b5b6ae9ed";

     

       303
       303
        
           }

     

       304
       304
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mk/firefox-80.0.1.tar.bz2";

     

       304
       304
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mk/firefox-81.0.tar.bz2";

     

       305
       305
        
             locale = "mk";

     

       306
       306
        
             arch = "linux-x86_64";

     

       307
       307
       -
             sha256 = "3a015b82f1f966e1ecc49af369ff80bd922dd1dd4d93a642c9b7bb8f9ea078bd";

     

       307
       307
       +
             sha256 = "0433579dfaa3dff715129cc45e72d83f93b7dc3a928b65744dece0a5b5687916";

     

       308
       308
        
           }

     

       309
       309
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mr/firefox-80.0.1.tar.bz2";

     

       309
       309
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mr/firefox-81.0.tar.bz2";

     

       310
       310
        
             locale = "mr";

     

       311
       311
        
             arch = "linux-x86_64";

     

       312
       312
       -
             sha256 = "4fbf77e82ac6739eb4f557ef9fbf2d86574c50260d2661964ee01b99d496a10b";

     

       312
       312
       +
             sha256 = "38177842df2df76fda10791eaa518d30b92f03016705eb555630fa356992416f";

     

       313
       313
        
           }

     

       314
       314
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ms/firefox-80.0.1.tar.bz2";

     

       314
       314
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ms/firefox-81.0.tar.bz2";

     

       315
       315
        
             locale = "ms";

     

       316
       316
        
             arch = "linux-x86_64";

     

       317
       317
       -
             sha256 = "c6e07a8f1eff5239ee19eec7d4828ca175535656fd130fcb72552e4585e1d9e8";

     

       317
       317
       +
             sha256 = "34b724fc82f330d897b1073fd4383f5fbfaec9d312cc7991f395d37d98416da1";

     

       318
       318
        
           }

     

       319
       319
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/my/firefox-80.0.1.tar.bz2";

     

       319
       319
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/my/firefox-81.0.tar.bz2";

     

       320
       320
        
             locale = "my";

     

       321
       321
        
             arch = "linux-x86_64";

     

       322
       322
       -
             sha256 = "a98a72b72665fda08f2b834af3a7c060d07cd638a69cad4f165f9af4730b642e";

     

       322
       322
       +
             sha256 = "a527914488954bdf8aea31a6ab406791cc723b88c11a5a27f161aef970e00d6b";

     

       323
       323
        
           }

     

       324
       324
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nb-NO/firefox-80.0.1.tar.bz2";

     

       324
       324
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nb-NO/firefox-81.0.tar.bz2";

     

       325
       325
        
             locale = "nb-NO";

     

       326
       326
        
             arch = "linux-x86_64";

     

       327
       327
       -
             sha256 = "948454e67ed57e47f3879c866c9ef72245b552066689d1e5d7e95431c06c72ac";

     

       327
       327
       +
             sha256 = "ccfa39917b8b0c2704a011bd41b0cfe4e890b0c1bc14bbbf641b7add2bf0750b";

     

       328
       328
        
           }

     

       329
       329
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ne-NP/firefox-80.0.1.tar.bz2";

     

       329
       329
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ne-NP/firefox-81.0.tar.bz2";

     

       330
       330
        
             locale = "ne-NP";

     

       331
       331
        
             arch = "linux-x86_64";

     

       332
       332
       -
             sha256 = "280857446256df49b901eae8d64f4255fb279dae7f67ff83beefd59d227ea466";

     

       332
       332
       +
             sha256 = "a3deb02b843fa9ff7a12590ad86195a9deb1be1eae055b493c34614fb361edf9";

     

       333
       333
        
           }

     

       334
       334
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nl/firefox-80.0.1.tar.bz2";

     

       334
       334
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nl/firefox-81.0.tar.bz2";

     

       335
       335
        
             locale = "nl";

     

       336
       336
        
             arch = "linux-x86_64";

     

       337
       337
       -
             sha256 = "6e50983c69ac40ddb403c1e2a5b6ac1fb713bd1d169d8dd402516f827907d457";

     

       337
       337
       +
             sha256 = "864ab1ee8d70e0968570fabc1e110bd97c86d27ce5d8106a70a31c6843e16db3";

     

       338
       338
        
           }

     

       339
       339
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nn-NO/firefox-80.0.1.tar.bz2";

     

       339
       339
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nn-NO/firefox-81.0.tar.bz2";

     

       340
       340
        
             locale = "nn-NO";

     

       341
       341
        
             arch = "linux-x86_64";

     

       342
       342
       -
             sha256 = "27178fe7b5bf19c4b9fdc42c90651f4c53379996ba67b743485decce0fd9e18d";

     

       342
       342
       +
             sha256 = "46d109379dba5dd3e5c9c413e54ff2578117960ac3c85ca937b48baf08bcdb76";

     

       343
       343
        
           }

     

       344
       344
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/oc/firefox-80.0.1.tar.bz2";

     

       344
       344
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/oc/firefox-81.0.tar.bz2";

     

       345
       345
        
             locale = "oc";

     

       346
       346
        
             arch = "linux-x86_64";

     

       347
       347
       -
             sha256 = "aa517e0e68aff16ccd693a7a282ee8aef1df8486b68b546af166bf39ef67baba";

     

       347
       347
       +
             sha256 = "71638cc84a7eccb4a563b7640c84557bc203cbb91114e433e1400554a16b2c1d";

     

       348
       348
        
           }

     

       349
       349
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pa-IN/firefox-80.0.1.tar.bz2";

     

       349
       349
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pa-IN/firefox-81.0.tar.bz2";

     

       350
       350
        
             locale = "pa-IN";

     

       351
       351
        
             arch = "linux-x86_64";

     

       352
       352
       -
             sha256 = "cb5ea9559d416f44c0830cb1bc85fffd3ee02a63697ffed7c0d5ec9bee8bf1e8";

     

       352
       352
       +
             sha256 = "8fb76633497115f927ce2be5064f6c6bb70d552c53491ccd6558df163941ef52";

     

       353
       353
        
           }

     

       354
       354
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pl/firefox-80.0.1.tar.bz2";

     

       354
       354
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pl/firefox-81.0.tar.bz2";

     

       355
       355
        
             locale = "pl";

     

       356
       356
        
             arch = "linux-x86_64";

     

       357
       357
       -
             sha256 = "36d0b84933e689b36701b50c1145b6f64e8f09af4ab8a7aafa53e1d33d8148f2";

     

       357
       357
       +
             sha256 = "e6d38535433cc0a0c4aa07ab9aa33bad4d019041d4a2b30ccfc5553a10579a8e";

     

       358
       358
        
           }

     

       359
       359
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-BR/firefox-80.0.1.tar.bz2";

     

       359
       359
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-BR/firefox-81.0.tar.bz2";

     

       360
       360
        
             locale = "pt-BR";

     

       361
       361
        
             arch = "linux-x86_64";

     

       362
       362
       -
             sha256 = "24093debf351c29812350c5feb68f741fd0d05cadad962ec5acb5ea0d9450bec";

     

       362
       362
       +
             sha256 = "399ef81afd3b05dbcb43553cdd36a2fd95e681296a21e7476cfa0c64c0c13ae4";

     

       363
       363
        
           }

     

       364
       364
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-PT/firefox-80.0.1.tar.bz2";

     

       364
       364
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-PT/firefox-81.0.tar.bz2";

     

       365
       365
        
             locale = "pt-PT";

     

       366
       366
        
             arch = "linux-x86_64";

     

       367
       367
       -
             sha256 = "bac0a7f9f902ec3a1006a45a330b52520377b43c61aba4b6fb3a45eb126379ef";

     

       367
       367
       +
             sha256 = "d6d87228f6a46237583ad8520c6758fd53d778e1905d019978a8da5fe0819cfc";

     

       368
       368
        
           }

     

       369
       369
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/rm/firefox-80.0.1.tar.bz2";

     

       369
       369
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/rm/firefox-81.0.tar.bz2";

     

       370
       370
        
             locale = "rm";

     

       371
       371
        
             arch = "linux-x86_64";

     

       372
       372
       -
             sha256 = "e86c79a49f0c980ff4ad60f151e9350e66df0ecf8b9bfcd08586cbae9abad957";

     

       372
       372
       +
             sha256 = "46dd4f4ddc69d82964289463baf67c05eab92a4500ad17f691a06fa0ea72830e";

     

       373
       373
        
           }

     

       374
       374
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ro/firefox-80.0.1.tar.bz2";

     

       374
       374
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ro/firefox-81.0.tar.bz2";

     

       375
       375
        
             locale = "ro";

     

       376
       376
        
             arch = "linux-x86_64";

     

       377
       377
       -
             sha256 = "32d089bfa4ebed3c6938abea0e16a9527cf303f6b9c5fd68e3adb2cd967ac3b2";

     

       377
       377
       +
             sha256 = "8720bf2abd57615d098360e7ddb384c0d570d4422f18d509c8b2b7759dd84550";

     

       378
       378
        
           }

     

       379
       379
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ru/firefox-80.0.1.tar.bz2";

     

       379
       379
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ru/firefox-81.0.tar.bz2";

     

       380
       380
        
             locale = "ru";

     

       381
       381
        
             arch = "linux-x86_64";

     

       382
       382
       -
             sha256 = "75a470c503f19282b3b1730cfc1bfef450634f1166d094b4e4f30a8f872da1ff";

     

       382
       382
       +
             sha256 = "6a8db970a3be16e8a0524c2bb576e4c368d33f8bd874ae201d000d112f86282f";

     

       383
       383
        
           }

     

       384
       384
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/si/firefox-80.0.1.tar.bz2";

     

       384
       384
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/si/firefox-81.0.tar.bz2";

     

       385
       385
        
             locale = "si";

     

       386
       386
        
             arch = "linux-x86_64";

     

       387
       387
       -
             sha256 = "f919ae9b3f2b6e1df1d073e3e7556091bc3586584c39a8dcbe91b8c29a4396d4";

     

       387
       387
       +
             sha256 = "1ee0f867be47f5a7884577caf08778152d8ee08d8fd1b25440a69fe8bb0d1174";

     

       388
       388
        
           }

     

       389
       389
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sk/firefox-80.0.1.tar.bz2";

     

       389
       389
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sk/firefox-81.0.tar.bz2";

     

       390
       390
        
             locale = "sk";

     

       391
       391
        
             arch = "linux-x86_64";

     

       392
       392
       -
             sha256 = "de6b476f015fad31e80a504c29c05d60c95c0dce18309765a3108ab27c926900";

     

       392
       392
       +
             sha256 = "97bc401f7c3c48b62fb66b3b5ea759345641874a46eb001ec1570ce53b610764";

     

       393
       393
        
           }

     

       394
       394
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sl/firefox-80.0.1.tar.bz2";

     

       394
       394
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sl/firefox-81.0.tar.bz2";

     

       395
       395
        
             locale = "sl";

     

       396
       396
        
             arch = "linux-x86_64";

     

       397
       397
       -
             sha256 = "9cba9b423bfda5788a76692e78310d961db70cc870e0797bcfc4020dc63e2019";

     

       397
       397
       +
             sha256 = "5b5dbd25fc83048de4fdeaef13126701b01e070740345838c29b8aeba65934e6";

     

       398
       398
        
           }

     

       399
       399
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/son/firefox-80.0.1.tar.bz2";

     

       399
       399
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/son/firefox-81.0.tar.bz2";

     

       400
       400
        
             locale = "son";

     

       401
       401
        
             arch = "linux-x86_64";

     

       402
       402
       -
             sha256 = "4423551873bfee1d1d4c7acdeaed8a133df3d467e711d4b2ffdcfe4dcecf434f";

     

       402
       402
       +
             sha256 = "99a2c222c6e14f511dda1f5cbbef2effd2aec7d169893024e25f2dc8f4900e39";

     

       403
       403
        
           }

     

       404
       404
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sq/firefox-80.0.1.tar.bz2";

     

       404
       404
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sq/firefox-81.0.tar.bz2";

     

       405
       405
        
             locale = "sq";

     

       406
       406
        
             arch = "linux-x86_64";

     

       407
       407
       -
             sha256 = "739918066fae4e5b20093540a2ea6e527878991ffab59ecbbd264aba5a13eabf";

     

       407
       407
       +
             sha256 = "7ff0ec6837ed3536f73aacc8295b5439aa0e18cdd80f2882bf2b644f5e7a1637";

     

       408
       408
        
           }

     

       409
       409
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sr/firefox-80.0.1.tar.bz2";

     

       409
       409
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sr/firefox-81.0.tar.bz2";

     

       410
       410
        
             locale = "sr";

     

       411
       411
        
             arch = "linux-x86_64";

     

       412
       412
       -
             sha256 = "5fe944b1fcb260fdbd747b9009ce05708d6ac82ae9f501d6a7efefc87d95fbfe";

     

       412
       412
       +
             sha256 = "274b86c7dbdffcd11453e8103feeaf6e98931c7224ca2336d231cf885c809f21";

     

       413
       413
        
           }

     

       414
       414
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sv-SE/firefox-80.0.1.tar.bz2";

     

       414
       414
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sv-SE/firefox-81.0.tar.bz2";

     

       415
       415
        
             locale = "sv-SE";

     

       416
       416
        
             arch = "linux-x86_64";

     

       417
       417
       -
             sha256 = "3f0ba11adce493f8ab6a771a362ada50abe442f60a2d910a36339ee19889b152";

     

       417
       417
       +
             sha256 = "0fc7edddf1a3aa812664e08e94cf5967c69a5f4821616400a8144c3bdda9860b";

     

       418
       418
        
           }

     

       419
       419
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ta/firefox-80.0.1.tar.bz2";

     

       419
       419
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ta/firefox-81.0.tar.bz2";

     

       420
       420
        
             locale = "ta";

     

       421
       421
        
             arch = "linux-x86_64";

     

       422
       422
       -
             sha256 = "7fdcfb26091269bbda4f81991d3dff20fcbfba534be9e9ae315459306aef0d17";

     

       422
       422
       +
             sha256 = "20121341b05c91142bd8fb4a0a2195693e78a89691b02651f6d6c3ac9f848a4f";

     

       423
       423
        
           }

     

       424
       424
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/te/firefox-80.0.1.tar.bz2";

     

       424
       424
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/te/firefox-81.0.tar.bz2";

     

       425
       425
        
             locale = "te";

     

       426
       426
        
             arch = "linux-x86_64";

     

       427
       427
       -
             sha256 = "54fbdcd804f4d2dec3096a041927e65ed999126f21a748a7f0b36091c4c4c7b3";

     

       427
       427
       +
             sha256 = "bc306272b6bd53e312dfab3f404f1f92199945be9f74e1d87d19b58e7ae2ee95";

     

       428
       428
        
           }

     

       429
       429
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/th/firefox-80.0.1.tar.bz2";

     

       429
       429
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/th/firefox-81.0.tar.bz2";

     

       430
       430
        
             locale = "th";

     

       431
       431
        
             arch = "linux-x86_64";

     

       432
       432
       -
             sha256 = "ebccb1cfdc0394889e7c67a5ef9be54dd87818c8f326e89ac6a97fcd9865c721";

     

       432
       432
       +
             sha256 = "52c8825f27f78624a81271a01c3b522cf6617030046a38734611ee741215658d";

     

       433
       433
        
           }

     

       434
       434
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tl/firefox-80.0.1.tar.bz2";

     

       434
       434
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tl/firefox-81.0.tar.bz2";

     

       435
       435
        
             locale = "tl";

     

       436
       436
        
             arch = "linux-x86_64";

     

       437
       437
       -
             sha256 = "7585a169f7975bbaa752caacf1863a2bd3ac9eeb17a031492a7cea5dd1b24efe";

     

       437
       437
       +
             sha256 = "c87f99419608a06d79bec67f54bafec6650dbcbed7fb52bda058bfe68d0ea102";

     

       438
       438
        
           }

     

       439
       439
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tr/firefox-80.0.1.tar.bz2";

     

       439
       439
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tr/firefox-81.0.tar.bz2";

     

       440
       440
        
             locale = "tr";

     

       441
       441
        
             arch = "linux-x86_64";

     

       442
       442
       -
             sha256 = "a475825fb5f0125f16edc895921d3839393fa806a12b3bf2f296321853cb66ff";

     

       442
       442
       +
             sha256 = "a030a15ce1424717b8fd0787f1a0d13ad8e050f0f5b4cd679d6c2686fe81e0c7";

     

       443
       443
        
           }

     

       444
       444
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/trs/firefox-80.0.1.tar.bz2";

     

       444
       444
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/trs/firefox-81.0.tar.bz2";

     

       445
       445
        
             locale = "trs";

     

       446
       446
        
             arch = "linux-x86_64";

     

       447
       447
       -
             sha256 = "4dedb4d60db089358b9371a828165f6fa7e329af5deb1177d090730c22323b9e";

     

       447
       447
       +
             sha256 = "762f7e33307811f6ec18c198b4f524526a085828af2621885b276ecd8bac6dd9";

     

       448
       448
        
           }

     

       449
       449
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uk/firefox-80.0.1.tar.bz2";

     

       449
       449
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uk/firefox-81.0.tar.bz2";

     

       450
       450
        
             locale = "uk";

     

       451
       451
        
             arch = "linux-x86_64";

     

       452
       452
       -
             sha256 = "5a2a6f9234db28e79c8472206d40f1d403af05de2f9f4e1b6253bf3e912386e6";

     

       452
       452
       +
             sha256 = "a698aa0d0599b97c7e9791547573d0afdc5e1bf0e5e644069752686d50644564";

     

       453
       453
        
           }

     

       454
       454
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ur/firefox-80.0.1.tar.bz2";

     

       454
       454
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ur/firefox-81.0.tar.bz2";

     

       455
       455
        
             locale = "ur";

     

       456
       456
        
             arch = "linux-x86_64";

     

       457
       457
       -
             sha256 = "30f3516680ef54d1e3636e858b8000aac4ac462e3fe6e20db16fbb0d037c2394";

     

       457
       457
       +
             sha256 = "7d1759bd2f0b746be76471ebc3c0da2fa224f4550a787e72ebe52b6356fb9370";

     

       458
       458
        
           }

     

       459
       459
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uz/firefox-80.0.1.tar.bz2";

     

       459
       459
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uz/firefox-81.0.tar.bz2";

     

       460
       460
        
             locale = "uz";

     

       461
       461
        
             arch = "linux-x86_64";

     

       462
       462
       -
             sha256 = "84a6ed8eed48ebf993ebf779c623472ea3d2bee84457fdc4e1968c013c8b8383";

     

       462
       462
       +
             sha256 = "51c21a2cf377633a46c35b2bf9096b97f5acab1bf7f8014122c96668d14c6d95";

     

       463
       463
        
           }

     

       464
       464
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/vi/firefox-80.0.1.tar.bz2";

     

       464
       464
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/vi/firefox-81.0.tar.bz2";

     

       465
       465
        
             locale = "vi";

     

       466
       466
        
             arch = "linux-x86_64";

     

       467
       467
       -
             sha256 = "eb58bad9266d0e46b55d4815212083609197acc4c8a7cd3a1ee9901adca7dae2";

     

       467
       467
       +
             sha256 = "e1f3cc7866b19e60b8c368b0633bb0603d7176a87ebc910fe4c4a7575a98be7c";

     

       468
       468
        
           }

     

       469
       469
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/xh/firefox-80.0.1.tar.bz2";

     

       469
       469
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/xh/firefox-81.0.tar.bz2";

     

       470
       470
        
             locale = "xh";

     

       471
       471
        
             arch = "linux-x86_64";

     

       472
       472
       -
             sha256 = "d478b199b9096b264f92f793f713b3e1cb42fb7c5f017ac0f1b82eea33434cbf";

     

       472
       472
       +
             sha256 = "cce6577abd88d3b34ad3e83577bbb82b6df8754679fc4cdd8a34c9ec9d59acae";

     

       473
       473
        
           }

     

       474
       474
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-CN/firefox-80.0.1.tar.bz2";

     

       474
       474
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-CN/firefox-81.0.tar.bz2";

     

       475
       475
        
             locale = "zh-CN";

     

       476
       476
        
             arch = "linux-x86_64";

     

       477
       477
       -
             sha256 = "b91d7637a20ebd8dc3200d222f98ac2d065a3633988ef0d17591cc8e72efac03";

     

       477
       477
       +
             sha256 = "e042d66ae743d1889d6d8ce13ef3510644098efa0943d332656b7e361b976da3";

     

       478
       478
        
           }

     

       479
       479
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-TW/firefox-80.0.1.tar.bz2";

     

       479
       479
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-TW/firefox-81.0.tar.bz2";

     

       480
       480
        
             locale = "zh-TW";

     

       481
       481
        
             arch = "linux-x86_64";

     

       482
       482
       -
             sha256 = "42bbf8d38c417fbf0d6de21e4fb4f3090096e0bcc2820504b8ea69f057d50a91";

     

       482
       482
       +
             sha256 = "07c6ac6268b54caefc44654bbc68d19dbe8e6e15fb768c921a8030e179ec8ef4";

     

       483
       483
        
           }

     

       484
       484
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ach/firefox-80.0.1.tar.bz2";

     

       484
       484
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ach/firefox-81.0.tar.bz2";

     

       485
       485
        
             locale = "ach";

     

       486
       486
        
             arch = "linux-i686";

     

       487
       487
       -
             sha256 = "1d39224b647c9a18c6a5021366775c05bf704bf316d6329f170cc4eb59c05a10";

     

       487
       487
       +
             sha256 = "bdd0995ca7d73be587ef1a9bd0395b869ec4f7f90a93ec854a5bbd1c18060ea0";

     

       488
       488
        
           }

     

       489
       489
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/af/firefox-80.0.1.tar.bz2";

     

       489
       489
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/af/firefox-81.0.tar.bz2";

     

       490
       490
        
             locale = "af";

     

       491
       491
        
             arch = "linux-i686";

     

       492
       492
       -
             sha256 = "a4b998c95454270fa98c59cb94dcad6e5db2da8a92f9cd75e8d0e30041eccc5b";

     

       492
       492
       +
             sha256 = "f662391298377d8d7f38f90c31b90bf705e61b1c3df5e1a7ed7e6c705ac700e6";

     

       493
       493
        
           }

     

       494
       494
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/an/firefox-80.0.1.tar.bz2";

     

       494
       494
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/an/firefox-81.0.tar.bz2";

     

       495
       495
        
             locale = "an";

     

       496
       496
        
             arch = "linux-i686";

     

       497
       497
       -
             sha256 = "ff786a29ef12215fdc8bc057f596ef9ab1ef207fbe84910504a314e27fa54c79";

     

       497
       497
       +
             sha256 = "46ca1495a74861429af6cf33eb791738abcfb5fa29c23060c7b9d307fc6a1b5c";

     

       498
       498
        
           }

     

       499
       499
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ar/firefox-80.0.1.tar.bz2";

     

       499
       499
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ar/firefox-81.0.tar.bz2";

     

       500
       500
        
             locale = "ar";

     

       501
       501
        
             arch = "linux-i686";

     

       502
       502
       -
             sha256 = "498ecc3042b4ccfbb155e632531df9ab75f7e3225820f0fe6929f80a91a91660";

     

       502
       502
       +
             sha256 = "1b781b56560f0bad0d67f155d68da1b5b759051434c76095c8ff884837595866";

     

       503
       503
        
           }

     

       504
       504
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ast/firefox-80.0.1.tar.bz2";

     

       504
       504
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ast/firefox-81.0.tar.bz2";

     

       505
       505
        
             locale = "ast";

     

       506
       506
        
             arch = "linux-i686";

     

       507
       507
       -
             sha256 = "1174347fac624e8c4573bf80ce0867ec8e94694bb0cd623de86949fab0780044";

     

       507
       507
       +
             sha256 = "eae1a5378babbeb88c6b000dc6500bfccbbe8337eeb32d7bfdc9bab67448d8ae";

     

       508
       508
        
           }

     

       509
       509
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/az/firefox-80.0.1.tar.bz2";

     

       509
       509
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/az/firefox-81.0.tar.bz2";

     

       510
       510
        
             locale = "az";

     

       511
       511
        
             arch = "linux-i686";

     

       512
       512
       -
             sha256 = "ddd0856d036f9f3eb87874440bcd6e85106f7391f03e76cd1f1d5428a69b8374";

     

       512
       512
       +
             sha256 = "4ba58be6ffb171c843ac5d267e97bf8ad219b4d1058a96b18f08ac4dd83c6b0c";

     

       513
       513
        
           }

     

       514
       514
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/be/firefox-80.0.1.tar.bz2";

     

       514
       514
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/be/firefox-81.0.tar.bz2";

     

       515
       515
        
             locale = "be";

     

       516
       516
        
             arch = "linux-i686";

     

       517
       517
       -
             sha256 = "23a8c4cb1c4d9e0e0b5a5924119670a4224ded0595d8326ae500a7bbafdd49a8";

     

       517
       517
       +
             sha256 = "b7cbd330b3b261e8b57134c27a291348219105cbd8cc685917ccf8e03099f2e7";

     

       518
       518
        
           }

     

       519
       519
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bg/firefox-80.0.1.tar.bz2";

     

       519
       519
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bg/firefox-81.0.tar.bz2";

     

       520
       520
        
             locale = "bg";

     

       521
       521
        
             arch = "linux-i686";

     

       522
       522
       -
             sha256 = "a0fdc2f520e251f624ae19a169ee7f1349017a8af87b9c149ea731e32054ef4e";

     

       522
       522
       +
             sha256 = "e6354feae56c656365fc4604bf394c4038399ea3a7ee503fd38610e1525d6539";

     

       523
       523
        
           }

     

       524
       524
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bn/firefox-80.0.1.tar.bz2";

     

       524
       524
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bn/firefox-81.0.tar.bz2";

     

       525
       525
        
             locale = "bn";

     

       526
       526
        
             arch = "linux-i686";

     

       527
       527
       -
             sha256 = "553e9a0704e4984e091716d41fb040f3b93bb192fa292cd7453ede137b170b74";

     

       527
       527
       +
             sha256 = "280d01e9dbfb09a08264e36c01b5fecef97831fc2c9d99e2f5e0ed498bbf427a";

     

       528
       528
        
           }

     

       529
       529
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/br/firefox-80.0.1.tar.bz2";

     

       529
       529
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/br/firefox-81.0.tar.bz2";

     

       530
       530
        
             locale = "br";

     

       531
       531
        
             arch = "linux-i686";

     

       532
       532
       -
             sha256 = "dd82f29c768befcbcc691a1665a5fe2e519f94558c331ed29c368c005e764d25";

     

       532
       532
       +
             sha256 = "a223fec4d16418befd75ce455f470cdc831afcecb6fb4c36139fd2f7c2588337";

     

       533
       533
        
           }

     

       534
       534
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bs/firefox-80.0.1.tar.bz2";

     

       534
       534
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bs/firefox-81.0.tar.bz2";

     

       535
       535
        
             locale = "bs";

     

       536
       536
        
             arch = "linux-i686";

     

       537
       537
       -
             sha256 = "59fca5c16258a5f5e3f8725ae1da886381fc78963fc6174762c9b74e6a83b01f";

     

       537
       537
       +
             sha256 = "ed7910663750af303d197ab3919f54d2a108ed691e016696e4c9a6254fe74003";

     

       538
       538
        
           }

     

       539
       539
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca-valencia/firefox-80.0.1.tar.bz2";

     

       539
       539
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca-valencia/firefox-81.0.tar.bz2";

     

       540
       540
        
             locale = "ca-valencia";

     

       541
       541
        
             arch = "linux-i686";

     

       542
       542
       -
             sha256 = "d75878b8d573a96a65fe320cd00208733f46984b88f44a3ab571bbbec17f2fb2";

     

       542
       542
       +
             sha256 = "19d4244b6711d3378835fd00715d7db17052de0345dd9b33b013169920f388c7";

     

       543
       543
        
           }

     

       544
       544
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca/firefox-80.0.1.tar.bz2";

     

       544
       544
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca/firefox-81.0.tar.bz2";

     

       545
       545
        
             locale = "ca";

     

       546
       546
        
             arch = "linux-i686";

     

       547
       547
       -
             sha256 = "f89d8655184f74f3218510d8e44b8bf4fe9840fc3555d4a4ca59dab8b77f8a46";

     

       547
       547
       +
             sha256 = "bcfa0b1785d3aeec8e5ea25b472da288c3ebced8661a70c21db08741e9ed5c67";

     

       548
       548
        
           }

     

       549
       549
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cak/firefox-80.0.1.tar.bz2";

     

       549
       549
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cak/firefox-81.0.tar.bz2";

     

       550
       550
        
             locale = "cak";

     

       551
       551
        
             arch = "linux-i686";

     

       552
       552
       -
             sha256 = "31008fdaf9a7ff5a3051b936dbd4253da76770da2e59fd97707378b4c9cae4c2";

     

       552
       552
       +
             sha256 = "cbf0745604bd3f757851cb4772eaac212d16288c7279634d470610ea280b7884";

     

       553
       553
        
           }

     

       554
       554
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cs/firefox-80.0.1.tar.bz2";

     

       554
       554
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cs/firefox-81.0.tar.bz2";

     

       555
       555
        
             locale = "cs";

     

       556
       556
        
             arch = "linux-i686";

     

       557
       557
       -
             sha256 = "7e8ed50ec696cf3fa98aa2ec0d2755e0064dd285c43f17fc4f58adfb427cbb3b";

     

       557
       557
       +
             sha256 = "1e91a12e484a2a41d87de5e60c0b3f455f81669025ceaec0c7adbb447446c367";

     

       558
       558
        
           }

     

       559
       559
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cy/firefox-80.0.1.tar.bz2";

     

       559
       559
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cy/firefox-81.0.tar.bz2";

     

       560
       560
        
             locale = "cy";

     

       561
       561
        
             arch = "linux-i686";

     

       562
       562
       -
             sha256 = "64b5cda8d4a0febaa96c778a3b45c380903835b7eb27ff375cb24c7ab3c56813";

     

       562
       562
       +
             sha256 = "c48491eadec23c78f071f4bedd23ac02235ef090375dd0bcb190e0b1d94fe94a";

     

       563
       563
        
           }

     

       564
       564
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/da/firefox-80.0.1.tar.bz2";

     

       564
       564
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/da/firefox-81.0.tar.bz2";

     

       565
       565
        
             locale = "da";

     

       566
       566
        
             arch = "linux-i686";

     

       567
       567
       -
             sha256 = "b7ba473e03fb0bd3efc7f00882270e65e2f74d12e4a150221519e9fefed6f470";

     

       567
       567
       +
             sha256 = "81a1fc46b7f92b2375edb20d3464c4d7facb493a07aa4471947f8b8b84cc3054";

     

       568
       568
        
           }

     

       569
       569
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/de/firefox-80.0.1.tar.bz2";

     

       569
       569
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/de/firefox-81.0.tar.bz2";

     

       570
       570
        
             locale = "de";

     

       571
       571
        
             arch = "linux-i686";

     

       572
       572
       -
             sha256 = "4ff6aa86a82b4466c5809fb192021fcacefe3309f73cbcbb8d4f952c066e4307";

     

       572
       572
       +
             sha256 = "719db056506ca0b908d121cd3e7785b1d8739610c7728723e650ca35b99ce26f";

     

       573
       573
        
           }

     

       574
       574
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/dsb/firefox-80.0.1.tar.bz2";

     

       574
       574
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/dsb/firefox-81.0.tar.bz2";

     

       575
       575
        
             locale = "dsb";

     

       576
       576
        
             arch = "linux-i686";

     

       577
       577
       -
             sha256 = "8ff130011dd318c45d7c85f26137a73f2abdd90eeb21ff4e29f45eb786e24541";

     

       577
       577
       +
             sha256 = "1ef45291cecb8727951808d20df4469c1f0d731b0d3442283fa1f45f39c0e3c4";

     

       578
       578
        
           }

     

       579
       579
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/el/firefox-80.0.1.tar.bz2";

     

       579
       579
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/el/firefox-81.0.tar.bz2";

     

       580
       580
        
             locale = "el";

     

       581
       581
        
             arch = "linux-i686";

     

       582
       582
       -
             sha256 = "c2c7f0d40a3c32896678cffce276a8d71613b09eda6fa715d10f156c13a1f6e6";

     

       582
       582
       +
             sha256 = "b0cbd8c13a40116779b1dca51191fcc0a8b203327b568f8467f6864e4f5db9ad";

     

       583
       583
        
           }

     

       584
       584
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-CA/firefox-80.0.1.tar.bz2";

     

       584
       584
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-CA/firefox-81.0.tar.bz2";

     

       585
       585
        
             locale = "en-CA";

     

       586
       586
        
             arch = "linux-i686";

     

       587
       587
       -
             sha256 = "b06db042a7429c1743f4b0488e403a5051acfa1be556e07769880345b72f5cf1";

     

       587
       587
       +
             sha256 = "4e4e204fb9ed3ed167fb9e3a9af2727384d09e37f1d5262bba05e296a8cb4a16";

     

       588
       588
        
           }

     

       589
       589
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-GB/firefox-80.0.1.tar.bz2";

     

       589
       589
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-GB/firefox-81.0.tar.bz2";

     

       590
       590
        
             locale = "en-GB";

     

       591
       591
        
             arch = "linux-i686";

     

       592
       592
       -
             sha256 = "435e24ff0665065a2eef6efbd8ea86e5c7e2752f44c420e94a7b0fdd503ea5b8";

     

       592
       592
       +
             sha256 = "7533f99bc58783e5779b4fbbfc77b96a6c04958c0e752d71b1f57387824faa74";

     

       593
       593
        
           }

     

       594
       594
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-US/firefox-80.0.1.tar.bz2";

     

       594
       594
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-US/firefox-81.0.tar.bz2";

     

       595
       595
        
             locale = "en-US";

     

       596
       596
        
             arch = "linux-i686";

     

       597
       597
       -
             sha256 = "fc1d7b798644f41a0da9e2dccc1e8fda86cd12e2f2dd3808ccbc247084221648";

     

       597
       597
       +
             sha256 = "68bebc780f225d5694506c4cdc6a7c31c779d2f1feffa792e599f99d0b2e58cd";

     

       598
       598
        
           }

     

       599
       599
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eo/firefox-80.0.1.tar.bz2";

     

       599
       599
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eo/firefox-81.0.tar.bz2";

     

       600
       600
        
             locale = "eo";

     

       601
       601
        
             arch = "linux-i686";

     

       602
       602
       -
             sha256 = "e5504a7bf75e2eba860f61fc3fdd979b2a766a4299b3652bf62d5a46526e50eb";

     

       602
       602
       +
             sha256 = "ab08e50d0a5e5d6d02a8daf1c6a428ce9ae19b3a343bf0838739adc9a4170bb5";

     

       603
       603
        
           }

     

       604
       604
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-AR/firefox-80.0.1.tar.bz2";

     

       604
       604
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-AR/firefox-81.0.tar.bz2";

     

       605
       605
        
             locale = "es-AR";

     

       606
       606
        
             arch = "linux-i686";

     

       607
       607
       -
             sha256 = "b53c9605b8798c6ecea9f1f47b0a1590a788c12f2fa9c09293a05ffbf4b22d53";

     

       607
       607
       +
             sha256 = "837f5cff13186af4f38c0c21410f20c57f28a3b5293ec986a449fdcb3358ddc6";

     

       608
       608
        
           }

     

       609
       609
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-CL/firefox-80.0.1.tar.bz2";

     

       609
       609
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-CL/firefox-81.0.tar.bz2";

     

       610
       610
        
             locale = "es-CL";

     

       611
       611
        
             arch = "linux-i686";

     

       612
       612
       -
             sha256 = "a2fd6bfce565cebfae759dcbb7b3cc3f504f0bee5324849a63a39fc65c36724c";

     

       612
       612
       +
             sha256 = "1f73cb2ab7eb1b7cd8198113941fc71c17972227365edfd5cad73680d30a9c6a";

     

       613
       613
        
           }

     

       614
       614
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-ES/firefox-80.0.1.tar.bz2";

     

       614
       614
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-ES/firefox-81.0.tar.bz2";

     

       615
       615
        
             locale = "es-ES";

     

       616
       616
        
             arch = "linux-i686";

     

       617
       617
       -
             sha256 = "c15751d3f0dc389d2a2e9cd40e8da88f1710a6f64999d106bee1dcab09daed5b";

     

       617
       617
       +
             sha256 = "1e95337b4607808c3c3b319343e253d575a07fbe48f7ae8d8346f92a3d9c70e0";

     

       618
       618
        
           }

     

       619
       619
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-MX/firefox-80.0.1.tar.bz2";

     

       619
       619
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-MX/firefox-81.0.tar.bz2";

     

       620
       620
        
             locale = "es-MX";

     

       621
       621
        
             arch = "linux-i686";

     

       622
       622
       -
             sha256 = "070a68c0893d63c5663252e52664cbeabbbf0d31542499575507644e003664ef";

     

       622
       622
       +
             sha256 = "cefb685c2da73fe485ff0817901a19c609a73befbb82fec151765e889e4c2d91";

     

       623
       623
        
           }

     

       624
       624
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/et/firefox-80.0.1.tar.bz2";

     

       624
       624
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/et/firefox-81.0.tar.bz2";

     

       625
       625
        
             locale = "et";

     

       626
       626
        
             arch = "linux-i686";

     

       627
       627
       -
             sha256 = "2eecd4ff182a25ba4e1a1edb78a8a9b1881321cea2740207795351700af1f4a2";

     

       627
       627
       +
             sha256 = "95dbe912beb0ee6196e3bbd169093388c22fb1ed0981a7827fee4bbdbb774316";

     

       628
       628
        
           }

     

       629
       629
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eu/firefox-80.0.1.tar.bz2";

     

       629
       629
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eu/firefox-81.0.tar.bz2";

     

       630
       630
        
             locale = "eu";

     

       631
       631
        
             arch = "linux-i686";

     

       632
       632
       -
             sha256 = "5fa2531712b5dff1d9931a369e774dfe15d2fc74078ed65ced0196b80faf2c8e";

     

       632
       632
       +
             sha256 = "44047e7f01fb086c099db0ddda6e1d6641e33e038a4e658b3a57ce331ce61523";

     

       633
       633
        
           }

     

       634
       634
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fa/firefox-80.0.1.tar.bz2";

     

       634
       634
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fa/firefox-81.0.tar.bz2";

     

       635
       635
        
             locale = "fa";

     

       636
       636
        
             arch = "linux-i686";

     

       637
       637
       -
             sha256 = "c22c673516a9837fe3d454bdecf0a59efd3b18f1e7cec51a6e742a343367aaed";

     

       637
       637
       +
             sha256 = "252f1e06b2faac3c3f94d1a1f9f52f566c84efffca8a3147c32ee6f109feaad2";

     

       638
       638
        
           }

     

       639
       639
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ff/firefox-80.0.1.tar.bz2";

     

       639
       639
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ff/firefox-81.0.tar.bz2";

     

       640
       640
        
             locale = "ff";

     

       641
       641
        
             arch = "linux-i686";

     

       642
       642
       -
             sha256 = "64de30cf7241daa09cbf7b027017c6411fbe01aa84c8bcb62d4cfac0eb86b540";

     

       642
       642
       +
             sha256 = "1bd050b8d4840a17d12f042a27295b71a4a62ebdac4153ffec843230b1cc0b25";

     

       643
       643
        
           }

     

       644
       644
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fi/firefox-80.0.1.tar.bz2";

     

       644
       644
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fi/firefox-81.0.tar.bz2";

     

       645
       645
        
             locale = "fi";

     

       646
       646
        
             arch = "linux-i686";

     

       647
       647
       -
             sha256 = "549743b069385b594c78f8732f28cdae1a73324d3662f671e9721b566629ea01";

     

       647
       647
       +
             sha256 = "6582223e393876a91ab0250c976b1aeac0559722b17e198e05925863e53d81d1";

     

       648
       648
        
           }

     

       649
       649
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fr/firefox-80.0.1.tar.bz2";

     

       649
       649
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fr/firefox-81.0.tar.bz2";

     

       650
       650
        
             locale = "fr";

     

       651
       651
        
             arch = "linux-i686";

     

       652
       652
       -
             sha256 = "abfb9e7c89fed1a4553bdd7cdbaab84f7f5221d31df404af0143bed0e6b817c4";

     

       652
       652
       +
             sha256 = "b96dc92220680f3c87d6c7cfe79f071382f8183856967133b6fcb6783a60ae6a";

     

       653
       653
        
           }

     

       654
       654
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fy-NL/firefox-80.0.1.tar.bz2";

     

       654
       654
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fy-NL/firefox-81.0.tar.bz2";

     

       655
       655
        
             locale = "fy-NL";

     

       656
       656
        
             arch = "linux-i686";

     

       657
       657
       -
             sha256 = "97accf68261aa9b04cbbcf424afeb7a3aea92853c70a4f0a52d10fc408d5e83d";

     

       657
       657
       +
             sha256 = "4a90cf75ab890ebef3517db701bcdd065e42c2fd8055121ea9b97897be299543";

     

       658
       658
        
           }

     

       659
       659
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ga-IE/firefox-80.0.1.tar.bz2";

     

       659
       659
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ga-IE/firefox-81.0.tar.bz2";

     

       660
       660
        
             locale = "ga-IE";

     

       661
       661
        
             arch = "linux-i686";

     

       662
       662
       -
             sha256 = "61f830ff111c0de73a229d12705ef6b3cc1b597abe668488c8f8ba3bf5dde217";

     

       662
       662
       +
             sha256 = "56491146a39eae10e9f8fb4ef1fe303a6bead300b680571427e6a410766d0069";

     

       663
       663
        
           }

     

       664
       664
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gd/firefox-80.0.1.tar.bz2";

     

       664
       664
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gd/firefox-81.0.tar.bz2";

     

       665
       665
        
             locale = "gd";

     

       666
       666
        
             arch = "linux-i686";

     

       667
       667
       -
             sha256 = "cd4904d29ba8f649f3a960953e99a5a8ea12375d2cbe651d1bf09210a08e6400";

     

       667
       667
       +
             sha256 = "0d9f9ad6563e31fd0ead7ec35e594e033f7f1ad0b4c94f0a5cc01cf515fea5ab";

     

       668
       668
        
           }

     

       669
       669
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gl/firefox-80.0.1.tar.bz2";

     

       669
       669
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gl/firefox-81.0.tar.bz2";

     

       670
       670
        
             locale = "gl";

     

       671
       671
        
             arch = "linux-i686";

     

       672
       672
       -
             sha256 = "0589a2465fff938d88a248f4175d9c3c0ccd4602b317f403ed3b7966b1d1cdc1";

     

       672
       672
       +
             sha256 = "8100b774f3bb3a1c3551b9f2c4751ee9e184b04c61489652dbdc81b1fc0b6bcd";

     

       673
       673
        
           }

     

       674
       674
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gn/firefox-80.0.1.tar.bz2";

     

       674
       674
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gn/firefox-81.0.tar.bz2";

     

       675
       675
        
             locale = "gn";

     

       676
       676
        
             arch = "linux-i686";

     

       677
       677
       -
             sha256 = "64f4f44b7b6b07970fe0c2f73b9e8afc5df75125a8c84f4c56b839c47899ee5f";

     

       677
       677
       +
             sha256 = "a0002b17f1133194c9f0a0b2b3c56c6ae0d4cd981d5325193a2c96d4b5ec78b2";

     

       678
       678
        
           }

     

       679
       679
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gu-IN/firefox-80.0.1.tar.bz2";

     

       679
       679
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gu-IN/firefox-81.0.tar.bz2";

     

       680
       680
        
             locale = "gu-IN";

     

       681
       681
        
             arch = "linux-i686";

     

       682
       682
       -
             sha256 = "46ac00838fe4775ad83a4cf6a510c7a80a6106896060bc3d6c2a94ae91004202";

     

       682
       682
       +
             sha256 = "6ef49394aec077569251eed4dc7631130be41991022672f477989f5202ac4d1e";

     

       683
       683
        
           }

     

       684
       684
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/he/firefox-80.0.1.tar.bz2";

     

       684
       684
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/he/firefox-81.0.tar.bz2";

     

       685
       685
        
             locale = "he";

     

       686
       686
        
             arch = "linux-i686";

     

       687
       687
       -
             sha256 = "563abdb4e26b3bf628f14bd5ef0cb3fe326b3e0a0bd65aba67fece4460b434aa";

     

       687
       687
       +
             sha256 = "07e11a9d1a4ef6e3c87e09227d070f75098697a89e057946bb71c1336429d9bb";

     

       688
       688
        
           }

     

       689
       689
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hi-IN/firefox-80.0.1.tar.bz2";

     

       689
       689
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hi-IN/firefox-81.0.tar.bz2";

     

       690
       690
        
             locale = "hi-IN";

     

       691
       691
        
             arch = "linux-i686";

     

       692
       692
       -
             sha256 = "828c6e01a4f2db95d36e1f8826fde98c8d762ea0e0aaff0abd50a9ade5638b8e";

     

       692
       692
       +
             sha256 = "39e6c7eab9945a7b9e8d500d8e0dfd416a7a915498683a4966732d8e09183e2c";

     

       693
       693
        
           }

     

       694
       694
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hr/firefox-80.0.1.tar.bz2";

     

       694
       694
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hr/firefox-81.0.tar.bz2";

     

       695
       695
        
             locale = "hr";

     

       696
       696
        
             arch = "linux-i686";

     

       697
       697
       -
             sha256 = "6cffbcc579f3c489e6d3e8da4bff44189851565cbe196b6f8f3e1a864ebf15d7";

     

       697
       697
       +
             sha256 = "8946ba5a92d73500cee5c379a796e18cf1b50fe0df4c1867040794850ba0df04";

     

       698
       698
        
           }

     

       699
       699
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hsb/firefox-80.0.1.tar.bz2";

     

       699
       699
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hsb/firefox-81.0.tar.bz2";

     

       700
       700
        
             locale = "hsb";

     

       701
       701
        
             arch = "linux-i686";

     

       702
       702
       -
             sha256 = "c2a744f2115d1e67d430dbbfc7388043a740840dbbdbc40bb34b6d7c8feda525";

     

       702
       702
       +
             sha256 = "9d87edfdb5498c16a279f0f262855c4e6f822760cf6d90281cf6c38e65c325f1";

     

       703
       703
        
           }

     

       704
       704
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hu/firefox-80.0.1.tar.bz2";

     

       704
       704
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hu/firefox-81.0.tar.bz2";

     

       705
       705
        
             locale = "hu";

     

       706
       706
        
             arch = "linux-i686";

     

       707
       707
       -
             sha256 = "cb382f9253652ed6109f8ab1b90eddcb3f7a5bb56aa3b4d99faa755b09dd197a";

     

       707
       707
       +
             sha256 = "9f515b6b8267b97efec1046c0c2329c5871337b95d7a3b4fdee310699c63b265";

     

       708
       708
        
           }

     

       709
       709
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hy-AM/firefox-80.0.1.tar.bz2";

     

       709
       709
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hy-AM/firefox-81.0.tar.bz2";

     

       710
       710
        
             locale = "hy-AM";

     

       711
       711
        
             arch = "linux-i686";

     

       712
       712
       -
             sha256 = "f298f1a9a427ba647d99f082a40e39be2e80dfa2388b731ed7e27a6da4efbd8c";

     

       712
       712
       +
             sha256 = "1de03462f87b629033b99bb014042d774a52404e279b625f20448809399af44d";

     

       713
       713
        
           }

     

       714
       714
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ia/firefox-80.0.1.tar.bz2";

     

       714
       714
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ia/firefox-81.0.tar.bz2";

     

       715
       715
        
             locale = "ia";

     

       716
       716
        
             arch = "linux-i686";

     

       717
       717
       -
             sha256 = "d823238dd340f45f776d73710c0cd77edca6be241aab189618f6def9d46f60e3";

     

       717
       717
       +
             sha256 = "fdcbf5cc522e20587cbac0b4979d77589532ba683ca811e27a7b499f37fe1841";

     

       718
       718
        
           }

     

       719
       719
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/id/firefox-80.0.1.tar.bz2";

     

       719
       719
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/id/firefox-81.0.tar.bz2";

     

       720
       720
        
             locale = "id";

     

       721
       721
        
             arch = "linux-i686";

     

       722
       722
       -
             sha256 = "667ec59c3743f707d4b3084a19ba09aac625794d2c7a240a04f9d932ffba9046";

     

       722
       722
       +
             sha256 = "e3cafaff6d65ca2da4513d27949b85b2fb8a1ab154d736e980df0ba8caf898be";

     

       723
       723
        
           }

     

       724
       724
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/is/firefox-80.0.1.tar.bz2";

     

       724
       724
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/is/firefox-81.0.tar.bz2";

     

       725
       725
        
             locale = "is";

     

       726
       726
        
             arch = "linux-i686";

     

       727
       727
       -
             sha256 = "bfa3be98edd904965d65c1094a9b83807633867c802b605bb93dda031e979a22";

     

       727
       727
       +
             sha256 = "21fba4796f2ee43a3662c3f493879d4d656ec710e46369f6da92f757e24ee706";

     

       728
       728
        
           }

     

       729
       729
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/it/firefox-80.0.1.tar.bz2";

     

       729
       729
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/it/firefox-81.0.tar.bz2";

     

       730
       730
        
             locale = "it";

     

       731
       731
        
             arch = "linux-i686";

     

       732
       732
       -
             sha256 = "198aef68d51404fd37ad602e1f450afa8dd439d4ebcacffe1e920d4629593da9";

     

       732
       732
       +
             sha256 = "c8775280055d5b8eb251253e72465149da165b7295cb4c8f400a5286a16168bb";

     

       733
       733
        
           }

     

       734
       734
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ja/firefox-80.0.1.tar.bz2";

     

       734
       734
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ja/firefox-81.0.tar.bz2";

     

       735
       735
        
             locale = "ja";

     

       736
       736
        
             arch = "linux-i686";

     

       737
       737
       -
             sha256 = "4a443e7b2d8169871b789ad90ca23ef8a01e7578fcf6b1af6ceccd4af93fdadf";

     

       737
       737
       +
             sha256 = "8870d59360577f8247be0fa51ad33afcc7ebaa2b7d6c8cd5bc100199c5436399";

     

       738
       738
        
           }

     

       739
       739
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ka/firefox-80.0.1.tar.bz2";

     

       739
       739
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ka/firefox-81.0.tar.bz2";

     

       740
       740
        
             locale = "ka";

     

       741
       741
        
             arch = "linux-i686";

     

       742
       742
       -
             sha256 = "8884da1d0c2cd6fa7aace95a8be04c8fd691b24428207eb62ffd3e7509494eb6";

     

       742
       742
       +
             sha256 = "394edc1246d9cb08587a67069b27dfe3fb1a92f4ff4a58d314b55128c39d2bd9";

     

       743
       743
        
           }

     

       744
       744
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kab/firefox-80.0.1.tar.bz2";

     

       744
       744
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kab/firefox-81.0.tar.bz2";

     

       745
       745
        
             locale = "kab";

     

       746
       746
        
             arch = "linux-i686";

     

       747
       747
       -
             sha256 = "328ca68297bf281c573e6059f3cedb872396f0a7474e92caf78906d4d4089531";

     

       747
       747
       +
             sha256 = "e30a08d4427fe896b528beb93b08b1bdc96a38a0817739faa63cd15c2f3014b4";

     

       748
       748
        
           }

     

       749
       749
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kk/firefox-80.0.1.tar.bz2";

     

       749
       749
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kk/firefox-81.0.tar.bz2";

     

       750
       750
        
             locale = "kk";

     

       751
       751
        
             arch = "linux-i686";

     

       752
       752
       -
             sha256 = "f632d1f23c5936bd498b695de562935a968e592013ffdfaf878516b94db9f149";

     

       752
       752
       +
             sha256 = "f1b807647ea9deaf7d44e9bfb56403b9a27205c19c3b9f07ba4cfa174b6532c1";

     

       753
       753
        
           }

     

       754
       754
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/km/firefox-80.0.1.tar.bz2";

     

       754
       754
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/km/firefox-81.0.tar.bz2";

     

       755
       755
        
             locale = "km";

     

       756
       756
        
             arch = "linux-i686";

     

       757
       757
       -
             sha256 = "8f7a5370f6108b6b7ac28c35a845378ae67929accafba911cca34c2e67dd6da8";

     

       757
       757
       +
             sha256 = "650ad04c9b0c4d461ba28fab7e591453aaf75fe5bddce3c6b8993389814be589";

     

       758
       758
        
           }

     

       759
       759
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kn/firefox-80.0.1.tar.bz2";

     

       759
       759
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kn/firefox-81.0.tar.bz2";

     

       760
       760
        
             locale = "kn";

     

       761
       761
        
             arch = "linux-i686";

     

       762
       762
       -
             sha256 = "395311e396a7267baa31f74dd30cb2e2721784de4ebdaba72c44bb384e4a6aa7";

     

       762
       762
       +
             sha256 = "459ec332671ff0e51e110ebb0e8b10e67743fb4b717e5fa165b5dae80054ffe1";

     

       763
       763
        
           }

     

       764
       764
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ko/firefox-80.0.1.tar.bz2";

     

       764
       764
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ko/firefox-81.0.tar.bz2";

     

       765
       765
        
             locale = "ko";

     

       766
       766
        
             arch = "linux-i686";

     

       767
       767
       -
             sha256 = "40e0ca4c3380213a902ed08e0f7cb7feab7d45f9ac035467ac0a50cc99af771c";

     

       767
       767
       +
             sha256 = "266849f41f7aa820ba459740becfbbbcb4a551140bf8e76b1eaafc63a6f9d2da";

     

       768
       768
        
           }

     

       769
       769
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lij/firefox-80.0.1.tar.bz2";

     

       769
       769
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lij/firefox-81.0.tar.bz2";

     

       770
       770
        
             locale = "lij";

     

       771
       771
        
             arch = "linux-i686";

     

       772
       772
       -
             sha256 = "35ed355715f7d6263ba90a563f573a3cd6ac186727b6e982692458720dfaedb2";

     

       772
       772
       +
             sha256 = "b429ef6b085822fd3ea0fb14fd501a894b96a3f4af8fc34944fdc9ed1c82853b";

     

       773
       773
        
           }

     

       774
       774
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lt/firefox-80.0.1.tar.bz2";

     

       774
       774
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lt/firefox-81.0.tar.bz2";

     

       775
       775
        
             locale = "lt";

     

       776
       776
        
             arch = "linux-i686";

     

       777
       777
       -
             sha256 = "0d0df39e1552a6e310d279f53384a8f8f8298df2f590fdb2683012499e599152";

     

       777
       777
       +
             sha256 = "7b3c089719e901d12c8ad9153a582d229958db035badd4b94b5b496a2ab545d1";

     

       778
       778
        
           }

     

       779
       779
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lv/firefox-80.0.1.tar.bz2";

     

       779
       779
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lv/firefox-81.0.tar.bz2";

     

       780
       780
        
             locale = "lv";

     

       781
       781
        
             arch = "linux-i686";

     

       782
       782
       -
             sha256 = "41905b366ba007d226c07064c90b104eba01be85397541e50ec7858e72c444df";

     

       782
       782
       +
             sha256 = "3efd9d52bc61076208cedef303396c066ec260f7aa5fcccec5b072f2935d89de";

     

       783
       783
        
           }

     

       784
       784
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mk/firefox-80.0.1.tar.bz2";

     

       784
       784
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mk/firefox-81.0.tar.bz2";

     

       785
       785
        
             locale = "mk";

     

       786
       786
        
             arch = "linux-i686";

     

       787
       787
       -
             sha256 = "3461c717fb3c1560ee383c044423874244c5fba95edbd2b8ab0ffd6223c03b10";

     

       787
       787
       +
             sha256 = "f0b1dd701cd7e068d938ec4771fba8f4c3f04e906f575e64dca1dee640fdce22";

     

       788
       788
        
           }

     

       789
       789
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mr/firefox-80.0.1.tar.bz2";

     

       789
       789
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mr/firefox-81.0.tar.bz2";

     

       790
       790
        
             locale = "mr";

     

       791
       791
        
             arch = "linux-i686";

     

       792
       792
       -
             sha256 = "3453bbf846392782d902217a331e1b74aaa93475131a866661e233ecdb4e108f";

     

       792
       792
       +
             sha256 = "bd5adc1fa68f82a9d2fa54b74b74bdc170f4ead9bed5a79ec1ebf1bd12781a07";

     

       793
       793
        
           }

     

       794
       794
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ms/firefox-80.0.1.tar.bz2";

     

       794
       794
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ms/firefox-81.0.tar.bz2";

     

       795
       795
        
             locale = "ms";

     

       796
       796
        
             arch = "linux-i686";

     

       797
       797
       -
             sha256 = "7e3f92a4429eea8f3d79dd105164461b6e218842c3131e8a186cda71504ca3d7";

     

       797
       797
       +
             sha256 = "dd106a1944d8ac9e49df16b3c67a86010be1ee62e3a780ad9c725f2335779131";

     

       798
       798
        
           }

     

       799
       799
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/my/firefox-80.0.1.tar.bz2";

     

       799
       799
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/my/firefox-81.0.tar.bz2";

     

       800
       800
        
             locale = "my";

     

       801
       801
        
             arch = "linux-i686";

     

       802
       802
       -
             sha256 = "bb4ef9a5ea013aed6a85aad02211f744b8cbce62ae94ac815b6880b986503b9a";

     

       802
       802
       +
             sha256 = "86e45fb6f490ad0cd66564a36e40c6d23169d69d1875022027aed09a1cad3d50";

     

       803
       803
        
           }

     

       804
       804
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nb-NO/firefox-80.0.1.tar.bz2";

     

       804
       804
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nb-NO/firefox-81.0.tar.bz2";

     

       805
       805
        
             locale = "nb-NO";

     

       806
       806
        
             arch = "linux-i686";

     

       807
       807
       -
             sha256 = "e0e6524cfc56b09bb37501acf0ba2074c8fd2d1b3e9130e8c223b0156a02ee2d";

     

       807
       807
       +
             sha256 = "ef6d5320470da9619f5668e13edae553038a53f80593b5d8392b3678dd8c1d5b";

     

       808
       808
        
           }

     

       809
       809
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ne-NP/firefox-80.0.1.tar.bz2";

     

       809
       809
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ne-NP/firefox-81.0.tar.bz2";

     

       810
       810
        
             locale = "ne-NP";

     

       811
       811
        
             arch = "linux-i686";

     

       812
       812
       -
             sha256 = "ed13d6e6826b14efe1e7d322e7c93243c413277cc360c2f2f6389975e8a234a7";

     

       812
       812
       +
             sha256 = "8607d4c024fb1d71068b73fb528bfbe42ee69bb12f9703343deb6a7e340c29f2";

     

       813
       813
        
           }

     

       814
       814
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nl/firefox-80.0.1.tar.bz2";

     

       814
       814
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nl/firefox-81.0.tar.bz2";

     

       815
       815
        
             locale = "nl";

     

       816
       816
        
             arch = "linux-i686";

     

       817
       817
       -
             sha256 = "08e06314f3633a93363c79a4470fd78ae7fadb1421140da81ddf82f2cd8a1a87";

     

       817
       817
       +
             sha256 = "a3ea133034cd0014f34c186d9c2fafc902bd51b5314429bb9b7c06e77447fd22";

     

       818
       818
        
           }

     

       819
       819
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nn-NO/firefox-80.0.1.tar.bz2";

     

       819
       819
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nn-NO/firefox-81.0.tar.bz2";

     

       820
       820
        
             locale = "nn-NO";

     

       821
       821
        
             arch = "linux-i686";

     

       822
       822
       -
             sha256 = "ca2cc7cd99ae698e48bc75274811ca2e0cf92e34fead87fa4b3450d5cfeac522";

     

       822
       822
       +
             sha256 = "09bff657619d23af40014b2e3bc845e6901abee241dfd28f4b5ef8f90c211c30";

     

       823
       823
        
           }

     

       824
       824
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/oc/firefox-80.0.1.tar.bz2";

     

       824
       824
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/oc/firefox-81.0.tar.bz2";

     

       825
       825
        
             locale = "oc";

     

       826
       826
        
             arch = "linux-i686";

     

       827
       827
       -
             sha256 = "2136473ae8be4213aa16f542014a3c2671d538792ed87d06ab205be9d3ef2bf0";

     

       827
       827
       +
             sha256 = "6eb63b7f50acf894e33fe9ea98c11b4133b7fb521e23e2fdd6bf9788570b4c78";

     

       828
       828
        
           }

     

       829
       829
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pa-IN/firefox-80.0.1.tar.bz2";

     

       829
       829
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pa-IN/firefox-81.0.tar.bz2";

     

       830
       830
        
             locale = "pa-IN";

     

       831
       831
        
             arch = "linux-i686";

     

       832
       832
       -
             sha256 = "8bcb5f76cab4a7c9635eb456ea05697c32e2eb22a4f81ff91142e0a92c9f358f";

     

       832
       832
       +
             sha256 = "df15da9ff35e192b587ffdaea4d47d368a054148061117bb8f4222e5da6c82a2";

     

       833
       833
        
           }

     

       834
       834
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pl/firefox-80.0.1.tar.bz2";

     

       834
       834
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pl/firefox-81.0.tar.bz2";

     

       835
       835
        
             locale = "pl";

     

       836
       836
        
             arch = "linux-i686";

     

       837
       837
       -
             sha256 = "445021b7e78eb046bafe176abd466679c296ddf2795deefb2c1e325388db0876";

     

       837
       837
       +
             sha256 = "b12bd00b3de180f77f80e80622a8631ff37c32b45362856a64122ad54abf07d2";

     

       838
       838
        
           }

     

       839
       839
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-BR/firefox-80.0.1.tar.bz2";

     

       839
       839
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-BR/firefox-81.0.tar.bz2";

     

       840
       840
        
             locale = "pt-BR";

     

       841
       841
        
             arch = "linux-i686";

     

       842
       842
       -
             sha256 = "65212c864d33f04ad6e5250fdf674c274c696ee8d7c13a0c91f38d204b9dacda";

     

       842
       842
       +
             sha256 = "0296501261b2c55e9acd14fff125f40f8a84fe0508004ea9fda03d2ff69f238c";

     

       843
       843
        
           }

     

       844
       844
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-PT/firefox-80.0.1.tar.bz2";

     

       844
       844
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-PT/firefox-81.0.tar.bz2";

     

       845
       845
        
             locale = "pt-PT";

     

       846
       846
        
             arch = "linux-i686";

     

       847
       847
       -
             sha256 = "9e1664031ca29e5f0f9cab5bd0cddfe3a053a0737d5fae82ce42d8c4a89c3044";

     

       847
       847
       +
             sha256 = "6a5a8328dcd10ad2da9bd45658bd43fca9ae58cc331546305594ce5d84f35017";

     

       848
       848
        
           }

     

       849
       849
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/rm/firefox-80.0.1.tar.bz2";

     

       849
       849
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/rm/firefox-81.0.tar.bz2";

     

       850
       850
        
             locale = "rm";

     

       851
       851
        
             arch = "linux-i686";

     

       852
       852
       -
             sha256 = "7ee02dc6ae964991e4aed47bd47fdea644cf6ab98a541f59c7f72eb175a04c57";

     

       852
       852
       +
             sha256 = "41b5bd2e52f0d57475179c46c089ce36c3e1441b5751c670f6fbb6406853aab8";

     

       853
       853
        
           }

     

       854
       854
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ro/firefox-80.0.1.tar.bz2";

     

       854
       854
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ro/firefox-81.0.tar.bz2";

     

       855
       855
        
             locale = "ro";

     

       856
       856
        
             arch = "linux-i686";

     

       857
       857
       -
             sha256 = "932a7723262b8c3c1ee54e9e06f4301b8996eb590c6c52030b42804d18f1cbdc";

     

       857
       857
       +
             sha256 = "40a2e53b6b7dcdbd9380d3ede3e425178b670db2205b5a5066d0c4e93a3297c3";

     

       858
       858
        
           }

     

       859
       859
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ru/firefox-80.0.1.tar.bz2";

     

       859
       859
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ru/firefox-81.0.tar.bz2";

     

       860
       860
        
             locale = "ru";

     

       861
       861
        
             arch = "linux-i686";

     

       862
       862
       -
             sha256 = "36727824ef047330a2448ea1c8a436dc074de60d64eec981d4cc52c3f3f6a4d9";

     

       862
       862
       +
             sha256 = "b8f7ecf4a5d8f034e57672d19254cda671f213ce04914995260f6b5f97181edc";

     

       863
       863
        
           }

     

       864
       864
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/si/firefox-80.0.1.tar.bz2";

     

       864
       864
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/si/firefox-81.0.tar.bz2";

     

       865
       865
        
             locale = "si";

     

       866
       866
        
             arch = "linux-i686";

     

       867
       867
       -
             sha256 = "8bbda31d0e2a7cc46740b2c0545c725c881f482c300efd9baa6fb4e2e7103d0d";

     

       867
       867
       +
             sha256 = "19d29defd33580089317b72bc6209749727a53978d48294950feba3226839135";

     

       868
       868
        
           }

     

       869
       869
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sk/firefox-80.0.1.tar.bz2";

     

       869
       869
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sk/firefox-81.0.tar.bz2";

     

       870
       870
        
             locale = "sk";

     

       871
       871
        
             arch = "linux-i686";

     

       872
       872
       -
             sha256 = "2ac41667c392735f11b21c149b7a1f29122c4528eed7863180c5f9a3528bc6b3";

     

       872
       872
       +
             sha256 = "4e57b3bdba217d1550fa1ec847b825d66e2d5211d6d0f5342c50ccbab33bf464";

     

       873
       873
        
           }

     

       874
       874
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sl/firefox-80.0.1.tar.bz2";

     

       874
       874
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sl/firefox-81.0.tar.bz2";

     

       875
       875
        
             locale = "sl";

     

       876
       876
        
             arch = "linux-i686";

     

       877
       877
       -
             sha256 = "4f60048b39306e9da94a5205a89dcaed1a30927fe1865ce6934a1ef0b0050a71";

     

       877
       877
       +
             sha256 = "cf89ee419f552622fb9eccf8a28c15f6647afd06de27af0635ab74bfd9aa9619";

     

       878
       878
        
           }

     

       879
       879
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/son/firefox-80.0.1.tar.bz2";

     

       879
       879
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/son/firefox-81.0.tar.bz2";

     

       880
       880
        
             locale = "son";

     

       881
       881
        
             arch = "linux-i686";

     

       882
       882
       -
             sha256 = "3c83ccf6b9a037af11f9431423afada70c979cdd8d12117f0256576e56600b1b";

     

       882
       882
       +
             sha256 = "64e7605b287432c38798e029ab2b02f136d7df876a9c8b3689ca603db0a736cc";

     

       883
       883
        
           }

     

       884
       884
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sq/firefox-80.0.1.tar.bz2";

     

       884
       884
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sq/firefox-81.0.tar.bz2";

     

       885
       885
        
             locale = "sq";

     

       886
       886
        
             arch = "linux-i686";

     

       887
       887
       -
             sha256 = "d87237e6ecdb3797c787f35f9ced339cc32380c23c3a0663cc3d46d3312aa8ea";

     

       887
       887
       +
             sha256 = "9b56875e2f5505f7fef3c41d4ed7fd8801df8e981f9c8f7cf665104a40e255ba";

     

       888
       888
        
           }

     

       889
       889
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sr/firefox-80.0.1.tar.bz2";

     

       889
       889
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sr/firefox-81.0.tar.bz2";

     

       890
       890
        
             locale = "sr";

     

       891
       891
        
             arch = "linux-i686";

     

       892
       892
       -
             sha256 = "4e2a7a21e3f94b0344fa5bb471dafb11d4589ae3966799b7b4e82d8503f5e7a6";

     

       892
       892
       +
             sha256 = "489a2d092f626f39a8e466c269486be8ae455d233e0e26d0c94953039668a57a";

     

       893
       893
        
           }

     

       894
       894
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sv-SE/firefox-80.0.1.tar.bz2";

     

       894
       894
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sv-SE/firefox-81.0.tar.bz2";

     

       895
       895
        
             locale = "sv-SE";

     

       896
       896
        
             arch = "linux-i686";

     

       897
       897
       -
             sha256 = "4b91c958b998f7f3cd59b26a27bc848aea98d5319a169684b82dfc3750ab0fc6";

     

       897
       897
       +
             sha256 = "9e45e9a0c79f9cb3c0c34fb2a26e608afb544716aa16843d53b3e6fd390e2685";

     

       898
       898
        
           }

     

       899
       899
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ta/firefox-80.0.1.tar.bz2";

     

       899
       899
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ta/firefox-81.0.tar.bz2";

     

       900
       900
        
             locale = "ta";

     

       901
       901
        
             arch = "linux-i686";

     

       902
       902
       -
             sha256 = "9772ccd592e51ce71ea86b241c9bfdd78793a90b8f0156c049f1b603f1d9a8ea";

     

       902
       902
       +
             sha256 = "2843290d4b90b057c6caa437514df0fa61a0cb901809c93690ac8247ff5b1233";

     

       903
       903
        
           }

     

       904
       904
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/te/firefox-80.0.1.tar.bz2";

     

       904
       904
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/te/firefox-81.0.tar.bz2";

     

       905
       905
        
             locale = "te";

     

       906
       906
        
             arch = "linux-i686";

     

       907
       907
       -
             sha256 = "b7906bbb4993e1fc231e02f390af62fcd40d7e6fb0cdc5031447d97c8e29eca9";

     

       907
       907
       +
             sha256 = "fc9f7e9312fd1430cbbf0d92d8f001077d0af89ccef6c7edb3eff504772ddb79";

     

       908
       908
        
           }

     

       909
       909
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/th/firefox-80.0.1.tar.bz2";

     

       909
       909
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/th/firefox-81.0.tar.bz2";

     

       910
       910
        
             locale = "th";

     

       911
       911
        
             arch = "linux-i686";

     

       912
       912
       -
             sha256 = "dc978d91b6de96590cfd95514a9563510d4f4725a80402e2eb6b2289de1f49a9";

     

       912
       912
       +
             sha256 = "622105aa85a0a5874c62f62afd77ffcdb1f4b2d329c255c56c7154a4bbfcb481";

     

       913
       913
        
           }

     

       914
       914
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tl/firefox-80.0.1.tar.bz2";

     

       914
       914
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tl/firefox-81.0.tar.bz2";

     

       915
       915
        
             locale = "tl";

     

       916
       916
        
             arch = "linux-i686";

     

       917
       917
       -
             sha256 = "98d617fb0ca75a977b127633a8050e119a047fc881161d97a852431231ecdc67";

     

       917
       917
       +
             sha256 = "998b966b13dc0b1eaf9ffac1788cc354049c43834d3678b51e946f907e42bd9d";

     

       918
       918
        
           }

     

       919
       919
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tr/firefox-80.0.1.tar.bz2";

     

       919
       919
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tr/firefox-81.0.tar.bz2";

     

       920
       920
        
             locale = "tr";

     

       921
       921
        
             arch = "linux-i686";

     

       922
       922
       -
             sha256 = "1228b0ba249cb2b9367db532647fdd0d58057e11d1b182a0982ac12e2c8f686f";

     

       922
       922
       +
             sha256 = "3dacf51f059f7b974e18d0cf4437bba48a0cf246014ed8ec38d06e2e09cb76f6";

     

       923
       923
        
           }

     

       924
       924
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/trs/firefox-80.0.1.tar.bz2";

     

       924
       924
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/trs/firefox-81.0.tar.bz2";

     

       925
       925
        
             locale = "trs";

     

       926
       926
        
             arch = "linux-i686";

     

       927
       927
       -
             sha256 = "e32783dc73b6e8d5aa2f0fc1e44fb361e07aecdacfa8a5f3dbcf0aadfa871762";

     

       927
       927
       +
             sha256 = "e9ce3a2591c8a9b7c5cccc20c2b56ff47ff22947d2393f5e7b010f1242ba1982";

     

       928
       928
        
           }

     

       929
       929
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uk/firefox-80.0.1.tar.bz2";

     

       929
       929
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uk/firefox-81.0.tar.bz2";

     

       930
       930
        
             locale = "uk";

     

       931
       931
        
             arch = "linux-i686";

     

       932
       932
       -
             sha256 = "aea971a56865756e9e6cd25638051e3e8048c2110e72aad2961bad40025fec05";

     

       932
       932
       +
             sha256 = "a8f78984d01fb54b7475e980aa5775fe7c298e1796cf603446e7cb9baa371bdc";

     

       933
       933
        
           }

     

       934
       934
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ur/firefox-80.0.1.tar.bz2";

     

       934
       934
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ur/firefox-81.0.tar.bz2";

     

       935
       935
        
             locale = "ur";

     

       936
       936
        
             arch = "linux-i686";

     

       937
       937
       -
             sha256 = "aa9ba0b3709ae1afc610b873877ec4b46a5ef3a801d04157c104ee985db4d9c7";

     

       937
       937
       +
             sha256 = "0b56702343d7495b752246a9d03e4a5571be05394cebefd1ccd2ca822180259d";

     

       938
       938
        
           }

     

       939
       939
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uz/firefox-80.0.1.tar.bz2";

     

       939
       939
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uz/firefox-81.0.tar.bz2";

     

       940
       940
        
             locale = "uz";

     

       941
       941
        
             arch = "linux-i686";

     

       942
       942
       -
             sha256 = "a3f0e1c314825ee0d8c6dfe6d5d5dabada792088342565d65cdc336fc74a8e98";

     

       942
       942
       +
             sha256 = "46a98ce354b40d64690c0aaf1c553b1d1e5ce51494291ff93ae0e54a82d897d4";

     

       943
       943
        
           }

     

       944
       944
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/vi/firefox-80.0.1.tar.bz2";

     

       944
       944
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/vi/firefox-81.0.tar.bz2";

     

       945
       945
        
             locale = "vi";

     

       946
       946
        
             arch = "linux-i686";

     

       947
       947
       -
             sha256 = "92f17fffcdbea8ca77dfc0da435ed936bd2011bb8b3bff7b565433ff281a9dc5";

     

       947
       947
       +
             sha256 = "fcbaf1dbab64bbc8983d444b1601721591c164bb8ff50ae09d2b7925fa41185a";

     

       948
       948
        
           }

     

       949
       949
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xh/firefox-80.0.1.tar.bz2";

     

       949
       949
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xh/firefox-81.0.tar.bz2";

     

       950
       950
        
             locale = "xh";

     

       951
       951
        
             arch = "linux-i686";

     

       952
       952
       -
             sha256 = "05a56d5d5abb3d0090b2bcae93a7d1ea45050da6ecbdef013916dd3b26228c16";

     

       952
       952
       +
             sha256 = "af8ff1f66472bbe39724ca714993246f02b0e9025b537ac7e52e65be29db4534";

     

       953
       953
        
           }

     

       954
       954
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-CN/firefox-80.0.1.tar.bz2";

     

       954
       954
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-CN/firefox-81.0.tar.bz2";

     

       955
       955
        
             locale = "zh-CN";

     

       956
       956
        
             arch = "linux-i686";

     

       957
       957
       -
             sha256 = "39231fb7720d7e35f81eb4aaf188eeda2414cc700d8e9658c776ff3bb535e418";

     

       957
       957
       +
             sha256 = "147a51431333da2333e4ecb0b307d4c74b3d66a626340b6bc25ded8c22c1acf5";

     

       958
       958
        
           }

     

       959
       959
       -
           { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-TW/firefox-80.0.1.tar.bz2";

     

       959
       959
       +
           { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-TW/firefox-81.0.tar.bz2";

     

       960
       960
        
             locale = "zh-TW";

     

       961
       961
        
             arch = "linux-i686";

     

       962
       962
       -
             sha256 = "09d04e81464057e0ecb222b28009a255a51023ff70aab58ba4411c8457d331fc";

     

       962
       962
       +
             sha256 = "e8d577aca0ac90285e9db278c2fc9eec1318407b830e4c231082b139320a4216";

     

       963
       963
        
           }

     

       964
       964
        
           ];

     

       965
       965
        
       }

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

···

       138
       138
        
           "-I${nss.dev}/include/nss"

     

       139
       139
        
         ];

     

       140
       140
        
       

     

       141
       141
       +
         MACH_USE_SYSTEM_PYTHON = "1";

     

       142
       142
       +
       

     

       141
       143
        
         postPatch = ''

     

       142
       144
        
           rm -rf obj-x86_64-pc-linux-gnu

     

       143
       145

+4 -4

pkgs/applications/networking/browsers/firefox/packages.nix

···

       7
       7
        
       rec {

     

       8
       8
        
         firefox = common rec {

     

       9
       9
        
           pname = "firefox";

     

       10
       10
       -
           ffversion = "80.0.1";

     

       10
       10
       +
           ffversion = "81.0";

     

       11
       11
        
           src = fetchurl {

     

       12
       12
        
             url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";

     

       13
       13
       -
             sha512 = "081sf41r7ickjij3kfrdq29a0d6wz7qv8950kx116kakh8qxgjy8ahk2mfwlcp6digrl4mimi8rl7ns1wjngsmrjh4lvqzh1xglx9cp";

     

       13
       13
       +
             sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19";

     

       14
       14
        
           };

     

       15
       15
        
       

     

       16
       16
        
           patches = [

     
···

       36
       36
        
       

     

       37
       37
        
         firefox-esr-78 = common rec {

     

       38
       38
        
           pname = "firefox-esr";

     

       39
       39
       -
           ffversion = "78.2.0esr";

     

       39
       39
       +
           ffversion = "78.3.0esr";

     

       40
       40
        
           src = fetchurl {

     

       41
       41
        
             url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";

     

       42
       42
       -
             sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q";

     

       42
       42
       +
             sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9";

     

       43
       43
        
           };

     

       44
       44
        
       

     

       45
       45
        
           patches = [

+3 -3

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix

···

       91
       91
        
         fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

     

       92
       92
        
       

     

       93
       93
        
         # Upstream source

     

       94
       94
       -
         version = "9.5.4";

     

       94
       94
       +
         version = "10.0";

     

       95
       95
        
       

     

       96
       96
        
         lang = "en-US";

     

       97
       97
        
       

     

       98
       98
        
         srcs = {

     

       99
       99
        
           x86_64-linux = fetchurl {

     

       100
       100
        
             url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";

     

       101
       101
       -
             sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04=";

     

       101
       101
       +
             sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l";

     

       102
       102
        
           };

     

       103
       103
        
       

     

       104
       104
        
           i686-linux = fetchurl {

     

       105
       105
        
             url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";

     

       106
       106
       -
             sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ=";

     

       106
       106
       +
             sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2";

     

       107
       107
        
           };

     

       108
       108
        
         };

     

       109
       109
        
       in

+2 -2

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

···

       18
       18
        
         vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

     

       19
       19
        
       in stdenv.mkDerivation rec {

     

       20
       20
        
         pname = "vivaldi";

     

       21
       21
       -
         version = "3.3.2022.39-1";

     

       21
       21
       +
         version = "3.3.2022.47-1";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchurl {

     

       24
       24
        
           url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

     

       25
       25
       -
           sha256 = "1d49556l067zilndm1381n1y22076qgww4n6nkscwchik2mj79sy";

     

       25
       25
       +
           sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         unpackPhase = ''

+2 -2

pkgs/applications/networking/datovka/default.nix

···

       11
       11
        
       

     

       12
       12
        
       mkDerivation rec {

     

       13
       13
        
         pname = "datovka";

     

       14
       14
       -
         version = "4.15.1";

     

       14
       14
       +
         version = "4.15.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";

     

       18
       18
       -
           sha256 = "0ab1s1r6zrqxcfjnij5ar352kzyrl1m92c04nqk6hahpzzma2p3r";

     

       18
       18
       +
           sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

+3 -3

pkgs/applications/networking/gns3/default.nix

···

       1
       1
        
       { callPackage, libsForQt5 }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         stableVersion = "2.2.13";

     

       4
       4
       +
         stableVersion = "2.2.14";

     

       5
       5
        
         previewVersion = stableVersion;

     

       6
       6
        
         addVersion = args:

     

       7
       7
        
           let version = if args.stable then stableVersion else previewVersion;

     
···

       26
       26
        
         };

     

       27
       27
        
         mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };

     

       28
       28
        
         mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };

     

       29
       29
       -
         guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66";

     

       30
       30
       -
         serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz";

     

       29
       29
       +
         guiSrcHash = "0y0dkyky2vw8ixm8nx4qhsj5b6hk0lv2cayrj4879icmp8zc4dy3";

     

       30
       30
       +
         serverSrcHash = "1vpsvvisw0sivlbjwawskkyiavl092qxaqxi13khkimz5fk0d3rc";

     

       31
       31
        
       in {

     

       32
       32
        
         guiStable = mkGui {

     

       33
       33
        
           stable = true;

+2 -2

pkgs/applications/networking/instant-messengers/zoom-us/default.nix

···

       15
       15
        
       let

     

       16
       16
        
         inherit (stdenv.lib) concatStringsSep makeBinPath optional;

     

       17
       17
        
       

     

       18
       18
       -
         version = "5.2.458699.0906";

     

       18
       18
       +
         version = "5.3.465578.0920";

     

       19
       19
        
         srcs = {

     

       20
       20
        
           x86_64-linux = fetchurl {

     

       21
       21
        
             url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";

     

       22
       22
       -
             sha256 = "0cwai5v2m99cvw1dnysl88fi97dwm6rq7xv3y0ydgg3499n8cjpf";

     

       22
       22
       +
             sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp";

     

       23
       23
        
           };

     

       24
       24
        
         };

     

       25
       25

+7 -6

pkgs/applications/networking/ipfs/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "ipfs";

     

       5
       5
       -
         version = "0.6.0";

     

       5
       5
       +
         version = "0.7.0";

     

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

     

       7
       7
        
       

     

       8
       8
        
         # go-ipfs makes changes to it's source tarball that don't match the git source.

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";

     

       11
       11
       -
           sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80";

     

       11
       11
       +
           sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # tarball contains multiple files/directories

     

       15
       15
        
         postUnpack = ''

     

       16
       16
        
           mkdir ipfs-src

     

       17
       17
       -
           mv * ipfs-src || true

     

       17
       17
       +
           shopt -s extglob

     

       18
       18
       +
           mv !(ipfs-src) ipfs-src || true

     

       18
       19
        
           cd ipfs-src

     

       19
       20
        
         '';

     

       20
       21
        
       

     
···

       27
       28
        
         vendorSha256 = null;

     

       28
       29
        
       

     

       29
       30
        
         postInstall = ''

     

       30
       30
       -
           install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service

     

       31
       31
       -
           install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket

     

       32
       32
       -
           install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket

     

       31
       31
       +
           install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service

     

       32
       32
       +
           install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket

     

       33
       33
       +
           install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket

     

       33
       34
        
           substituteInPlace $out/etc/systemd/system/ipfs.service \

     

       34
       35
        
             --replace /usr/bin/ipfs $out/bin/ipfs

     

       35
       36
        
         '';

+2 -2

pkgs/applications/networking/sniffers/kismet/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "kismet";

     

       13
       13
       -
         version = "2020-04-R2";

     

       13
       13
       +
         version = "2020-09-R2";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";

     

       17
       17
       -
           sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm";

     

       17
       17
       +
           sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [ pkgconfig ];

+3 -3

pkgs/applications/office/gtg/default.nix

···

       15
       15
        
       

     

       16
       16
        
       python3Packages.buildPythonApplication rec {

     

       17
       17
        
         pname = "gtg";

     

       18
       18
       -
         version = "unstable-2020-08-02";

     

       18
       18
       +
         version = "unstable-2020-09-16";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "getting-things-gnome";

     

       22
       22
        
           repo = "gtg";

     

       23
       23
       -
           rev = "6623731f301c1b9c7b727e009f4a6462ad381c68";

     

       24
       24
       -
           sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1";

     

       23
       23
       +
           rev = "1be991c6d7f7b2e4b8ac16f82e8a07f9dce4272f";

     

       24
       24
       +
           sha256 = "1f5acpjwnp08c78dds7xm22qjzcfnx2qs121yvm3rswkh27s4n23";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27

+2 -2

pkgs/applications/office/homebank/default.nix

···

       2
       2
        
       , libsoup, gnome3 }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "homebank-5.4.2";

     

       5
       5
       +
         name = "homebank-5.4.3";

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://homebank.free.fr/public/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6";

     

       8
       8
       +
           sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

+8 -1

pkgs/applications/science/biology/bwa/default.nix

···

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ zlib ];

     

       13
       13
        
       

     

       14
       14
       +
         # it's unclear which headers are intended to be part of the public interface

     

       15
       15
       +
         # so we may find ourselves having to add more here over time

     

       14
       16
        
         installPhase = ''

     

       15
       15
       -
           install -vD bwa $out/bin/bwa

     

       17
       17
       +
           install -vD -t $out/bin bwa

     

       18
       18
       +
           install -vD -t $out/lib libbwa.a

     

       19
       19
       +
           install -vD -t $out/include bntseq.h

     

       20
       20
       +
           install -vD -t $out/include bwa.h

     

       21
       21
       +
           install -vD -t $out/include bwamem.h

     

       22
       22
       +
           install -vD -t $out/include bwt.h

     

       16
       23
        
         '';

     

       17
       24
        
       

     

       18
       25
        
         meta = with stdenv.lib; {

+38

pkgs/applications/science/biology/obitools/obitools3.nix

···

       1
       1
       +
       { stdenv, fetchurl, python3Packages, cmake, python3 }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         pythonPackages = python3Packages;

     

       5
       5
       +
       in

     

       6
       6
       +
       

     

       7
       7
       +
       pythonPackages.buildPythonApplication rec {

     

       8
       8
       +
         pname = "obitools3";

     

       9
       9
       +
         version = "3.0.0-beta14";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchurl {

     

       12
       12
       +
           url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz";

     

       13
       13
       +
           sha256 = "17krklxfvxl6baf2m394gm1a88y0lg0bwqx20cf5q39zyw04z442";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         preBuild = ''

     

       17
       17
       +
           substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages";

     

       18
       18
       +
           export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE"

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         disabled = !pythonPackages.isPy3k;

     

       22
       22
       +
       

     

       23
       23
       +
         nativeBuildInputs = [ pythonPackages.cython cmake ];

     

       24
       24
       +
       

     

       25
       25
       +
         dontConfigure = true;

     

       26
       26
       +
       

     

       27
       27
       +
         doCheck = true;

     

       28
       28
       +
       

     

       29
       29
       +
         enableParallelBuilding = true;

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with stdenv.lib ; {

     

       32
       32
       +
           description = "Management of analyses and data in DNA metabarcoding";

     

       33
       33
       +
           homepage = "https://git.metabarcoding.org/obitools/obitools3";

     

       34
       34
       +
           license = licenses.cecill20;

     

       35
       35
       +
           maintainers = [ maintainers.bzizou ];

     

       36
       36
       +
           platforms = platforms.all;

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+2 -2

pkgs/applications/science/biology/octopus/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "octopus";

     

       5
       5
       -
         version = "0.6.3-beta";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "luntergroup";

     

       9
       9
        
           repo = "octopus";

     

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

     

       11
       11
       -
           sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n";

     

       11
       11
       +
           sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake pkg-config ];

+10 -9

pkgs/applications/science/biology/truvari/default.nix

···

       5
       5
        
       

     

       6
       6
        
       python3Packages.buildPythonApplication rec {

     

       7
       7
        
         pname = "truvari";

     

       8
       8
       -
         version = "1.3.4";

     

       8
       8
       +
         version = "2.0.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "spiralgenetics";

     

       12
       12
        
           repo = "truvari";

     

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

     

       14
       14
       -
           sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v";

     

       14
       14
       +
           sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = with python3Packages; [

     
···

       21
       21
        
           pysam

     

       22
       22
        
           pyfaidx

     

       23
       23
        
           intervaltree

     

       24
       24
       +
           pytabix

     

       25
       25
       +
           acebinf

     

       26
       26
       +
           bwapy

     

       27
       27
       +
           joblib

     

       28
       28
       +
           pandas

     

       24
       29
        
         ];

     

       25
       30
        
       

     

       26
       26
       -
         prePatch = ''

     

       27
       27
       -
           substituteInPlace ./setup.py \

     

       28
       28
       -
             --replace '"progressbar2==3.41.0",' '"progressbar2",' \

     

       29
       29
       -
             --replace '"pysam==0.15.2",' '"pysam",' \

     

       30
       30
       -
             --replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \

     

       31
       31
       -
             --replace '"intervaltree==3.0.2",' '"intervaltree",'

     

       32
       32
       -
         '';

     

       31
       31
       +
         # no tests

     

       32
       32
       +
         doCheck = false;

     

       33
       33
       +
         pythonImportsCheck = [ "truvari" ];

     

       33
       34
        
       

     

       34
       35
        
         meta = with lib; {

     

       35
       36
        
           description = "Structural variant comparison tool for VCFs";

+2 -2

pkgs/applications/science/chemistry/jmol/default.nix

···

       17
       17
        
         };

     

       18
       18
        
       in

     

       19
       19
        
       stdenv.mkDerivation rec {

     

       20
       20
       -
         version = "14.31.2";

     

       20
       20
       +
         version = "14.31.3";

     

       21
       21
        
         pname = "jmol";

     

       22
       22
        
       

     

       23
       23
        
         src = let

     

       24
       24
        
           baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";

     

       25
       25
        
         in fetchurl {

     

       26
       26
        
           url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";

     

       27
       27
       -
           sha256 = "0p2cbzxhw1s4l76kbriag3r4dkpsfvrnydryyikgkbdwnq479hm2";

     

       27
       27
       +
           sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         patchPhase = ''

-12

pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch

···

       1
       1
       -
       diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt

     

       2
       2
       -
       index 5913076..b0453b5 100644

     

       3
       3
       -
       --- a/avy/CMakeLists.txt

     

       4
       4
       -
       +++ b/avy/CMakeLists.txt

     

       5
       5
       -
       @@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT)

     

       6
       6
       -
          set (Boost_NO_SYSTEM_PATHS "ON")

     

       7
       7
       -
        endif()

     

       8
       8
       -
        

     

       9
       9
       -
       -set (Boost_USE_STATIC_LIBS ON)

     

       10
       10
       -
        find_package (Boost 1.46.1 REQUIRED program_options)

     

       11
       11
       -
        IF (Boost_FOUND)

     

       12
       12
       -
          include_directories (${Boost_INCLUDE_DIRS})

+4 -8

pkgs/applications/science/logic/avy/default.nix

···

       1
       1
        
       { stdenv, fetchgit, cmake, zlib, boost }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation {

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "avy";

     

       5
       5
       -
         version = "2017.10.16";

     

       5
       5
       +
         version = "2019.05.01"; # date of cav19 tag

     

       6
       6
        
       

     

       7
       7
        
         src = fetchgit {

     

       8
       8
        
           url    = "https://bitbucket.org/arieg/extavy";

     

       9
       9
       -
           rev    = "c75c83379c38d6ea1046d0caee95aef77283ffe3";

     

       10
       10
       -
           sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh";

     

       9
       9
       +
           rev    = "cav19";

     

       10
       10
       +
           sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy";

     

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
        
         };

     

       13
       13
        
       

     
···

       30
       30
        
           patch -p1 -d minisat -i ${./minisat-fenv.patch}

     

       31
       31
        
           patch -p1 -d glucose -i ${./glucose-fenv.patch}

     

       32
       32
        
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         patches =

     

       35
       35
       -
           [ ./0001-no-static-boost-libs.patch

     

       36
       36
       -
           ];

     

       37
       33
        
       

     

       38
       34
        
         installPhase = ''

     

       39
       35
        
           mkdir -p $out/bin

+7 -2

pkgs/applications/science/logic/cvc3/default.nix

···

       13
       13
        
       

     

       14
       14
        
         patches = [ ./cvc3-2.4.1-gccv6-fix.patch ];

     

       15
       15
        
       

     

       16
       16
       -
         preConfigure = ''

     

       16
       16
       +
         postPatch = ''

     

       17
       17
        
           sed -e "s@ /bin/bash@bash@g" -i Makefile.std

     

       18
       18
        
           find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'

     

       19
       19
       +
       

     

       20
       20
       +
           # bison 3.7 workaround

     

       21
       21
       +
           for f in parsePL parseLisp parsesmtlib parsesmtlib2 ; do

     

       22
       22
       +
             ln -s ../parser/''${f}_defs.h src/include/''${f}.hpp

     

       23
       23
       +
           done

     

       19
       24
        
         '';

     

       20
       25
        
       

     

       21
       26
        
         meta = with stdenv.lib; {

     

       22
       27
        
           description = "A prover for satisfiability modulo theory (SMT)";

     

       23
       28
        
           maintainers = with maintainers;

     

       24
       29
        
             [ raskin ];

     

       25
       25
       -
           platforms = platforms.linux;

     

       30
       30
       +
           platforms = platforms.unix;

     

       26
       31
        
           license = licenses.free;

     

       27
       32
        
           homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html";

     

       28
       33
        
         };

+3 -3

pkgs/applications/science/logic/why3/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation {

     

       5
       5
        
         pname = "why3";

     

       6
       6
       -
         version = "1.3.1";

     

       6
       6
       +
         version = "1.3.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
       -
           url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz";

     

       10
       10
       -
           sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv";

     

       9
       9
       +
           url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz";

     

       10
       10
       +
           sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = with ocamlPackages; [

+54 -4

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

···

       1
       1
       -
       { callPackage, stdenv, fetchFromGitHub, ...}:

     

       1
       1
       +
       { callPackage, stdenv, fetchFromGitHub, git, zsh, ...}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gitstatus";

     

       5
       5
       -
         version = "1.2.2";

     

       5
       5
       +
         version = "1.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "romkatv";

     

       9
       9
        
           repo = "gitstatus";

     

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

     

       11
       11
       -
           sha256 = "1kspz2fhryyjhn6gqf029rv0386a1ga08sf6g0l6smivw628k71l";

     

       11
       11
       +
           sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];

     

       15
       15
        
         patchPhase = ''

     

       16
       16
       -
           sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh

     

       16
       16
       +
           sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh

     

       17
       17
       +
           sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install

     

       17
       18
        
         '';

     

       18
       19
        
         installPhase = ''

     

       19
       20
        
           install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd

     

       20
       21
        
           install -Dm444 gitstatus.plugin.zsh $out

     

       22
       22
       +
           install -Dm555 install $out

     

       23
       23
       +
           install -Dm444 build.info $out

     

       24
       24
       +
         '';

     

       25
       25
       +
         # Don't install the "install" and "build.info" files, which the end user

     

       26
       26
       +
         # should not need to worry about.

     

       27
       27
       +
         pathsToLink = [

     

       28
       28
       +
           "/bin/gitstatusd"

     

       29
       29
       +
           "/gitstatus.plugin.zsh"

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         # The install check sets up an empty Git repository and a minimal zshrc that

     

       33
       33
       +
         # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies

     

       34
       34
       +
         # that the script was sourced successfully and that the "gitstatus_query"

     

       35
       35
       +
         # command ran successfully. This tests the binary itself and the zsh

     

       36
       36
       +
         # integration.

     

       37
       37
       +
         installCheckInputs = [ git zsh ];

     

       38
       38
       +
         doInstallCheck = true;

     

       39
       39
       +
         installCheckPhase = ''

     

       40
       40
       +
           TEMP=$(mktemp -d)

     

       41
       41
       +
           cd "$TEMP"

     

       42
       42
       +
       

     

       43
       43
       +
           git init

     

       44
       44
       +
       

     

       45
       45
       +
           echo '

     

       46
       46
       +
             GITSTATUS_LOG_LEVEL=DEBUG

     

       47
       47
       +
             . $out/gitstatus.plugin.zsh || exit 1

     

       48
       48
       +
       

     

       49
       49
       +
             gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST

     

       50
       50
       +
             gitstatus_query NIX_TEST

     

       51
       51
       +
             if [[ $? -ne 0 ]]; then

     

       52
       52
       +
                 print -- "Something went wrong with gitstatus"

     

       53
       53
       +
                 exit 1

     

       54
       54
       +
             elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then

     

       55
       55
       +
                 print -- "Not in a Git repo"

     

       56
       56
       +
                 exit 1

     

       57
       57
       +
             else

     

       58
       58
       +
                 print -- "OK"

     

       59
       59
       +
                 exit 0

     

       60
       60
       +
             fi

     

       61
       61
       +
           ' > .zshrc

     

       62
       62
       +
       

     

       63
       63
       +
           # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job

     

       64
       64
       +
           # control will be disabled in the shell and the gitstatus plugin script

     

       65
       65
       +
           # will fail when it tries to set the MONITOR option. As a workaround, we

     

       66
       66
       +
           # run zsh as a full-fledged independent process and then wait for it to

     

       67
       67
       +
           # exit. (The "exit" statements in the zshrc ensure that zsh will exit

     

       68
       68
       +
           # almost immediately after starting.)

     

       69
       69
       +
           ZDOTDIR=. zsh -i &

     

       70
       70
       +
           wait $!

     

       21
       71
        
         '';

     

       22
       72
        
       

     

       23
       73
        
         meta = with stdenv.lib; {

+2 -2

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

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "obs-v4l2sink";

     

       12
       12
       -
         version = "0.1.0";

     

       12
       12
       +
         version = "0.1.0-12-g1ec3c8a";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "CatxFish";

     

       16
       16
        
           repo = "obs-v4l2sink";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z";

     

       18
       18
       +
           sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+39

pkgs/applications/video/vcs/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, makeWrapper

     

       2
       2
       +
       , coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux

     

       3
       3
       +
       , dejavu_fonts

     

       4
       4
       +
       }:

     

       5
       5
       +
       with stdenv.lib;

     

       6
       6
       +
       let

     

       7
       7
       +
         version = "1.13.4";

     

       8
       8
       +
         runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ];

     

       9
       9
       +
       in

     

       10
       10
       +
       stdenv.mkDerivation {

     

       11
       11
       +
         pname = "vcs";

     

       12
       12
       +
         inherit version;

     

       13
       13
       +
         src = fetchurl {

     

       14
       14
       +
           url = "http://p.outlyer.net/files/vcs/vcs-${version}.bash";

     

       15
       15
       +
           sha256 = "0nhwcpffp3skz24kdfg4445i6j37ks6a0qsbpfd3dbi4vnpa60a0";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         unpackCmd = "mkdir src; cp $curSrc src/vcs";

     

       19
       19
       +
         patches = [ ./fonts.patch ];

     

       20
       20
       +
         nativeBuildInputs = [ makeWrapper ];

     

       21
       21
       +
         doBuild = false;

     

       22
       22
       +
       

     

       23
       23
       +
         inherit dejavu_fonts;

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           mkdir -p $out/bin

     

       26
       26
       +
           mv vcs $out/bin/vcs

     

       27
       27
       +
           substituteAllInPlace $out/bin/vcs

     

       28
       28
       +
           chmod +x $out/bin/vcs

     

       29
       29
       +
           wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "Generates contact sheets from video files";

     

       34
       34
       +
           homepage = "http://p.outlyer.net/vcs";

     

       35
       35
       +
           license = licenses.cc-by-nc-sa-30;

     

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

     

       37
       37
       +
           platforms = with platforms; unix;

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+23

pkgs/applications/video/vcs/fonts.patch

···

       1
       1
       +
       --- a/vcs	2020-04-04 14:37:53.531095977 -0700

     

       2
       2
       +
       +++ b/vcs	2020-04-04 14:40:46.459407878 -0700

     

       3
       3
       +
       @@ -3669,18 +3669,8 @@

     

       4
       4
       +
        	[[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return

     

       5
       5
       +
        	[[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return

     

       6
       6
       +
        	[[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return

     

       7
       7
       +
       -	# Try to locate DejaVu Sans

     

       8
       8
       +
       -	local dvs=''

     

       9
       9
       +
       -	if [[ -d /usr/local/share/fonts ]]; then

     

       10
       10
       +
       -		dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf')

     

       11
       11
       +
       -	fi

     

       12
       12
       +
       -	if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then

     

       13
       13
       +
       -		dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf')

     

       14
       14
       +
       -	fi

     

       15
       15
       +
       -	if [[ -z $dvs ]]; then

     

       16
       16
       +
       -		warn "Unable to locate DejaVu Sans font. Falling back to helvetica."

     

       17
       17
       +
       -		dvs=helvetica

     

       18
       18
       +
       -	fi

     

       19
       19
       +
       +	# Use DejaVu Sans, by default

     

       20
       20
       +
       +	local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf'

     

       21
       21
       +
        	[[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs"

     

       22
       22
       +
        	[[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs"

     

       23
       23
       +
        	[[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs"

+3 -2

pkgs/applications/virtualization/crun/default.nix

···

       25
       25
        
           "test_pid.py"

     

       26
       26
        
           "test_pid_file.py"

     

       27
       27
        
           "test_preserve_fds.py"

     

       28
       28
       +
           "test_resources"

     

       28
       29
        
           "test_start.py"

     

       29
       30
        
           "test_uid_gid.py"

     

       30
       31
        
           "test_update.py"

     
···

       34
       35
        
       in

     

       35
       36
        
       stdenv.mkDerivation rec {

     

       36
       37
        
         pname = "crun";

     

       37
       37
       -
         version = "0.14.1";

     

       38
       38
       +
         version = "0.15";

     

       38
       39
        
       

     

       39
       40
        
         src = fetchFromGitHub {

     

       40
       41
        
           owner = "containers";

     

       41
       42
        
           repo = pname;

     

       42
       43
        
           rev = version;

     

       43
       43
       -
           sha256 = "0r77ksdrpxskf79m898a7ai8wxw9fmmsf2lg8fw3ychnk74l8jvh";

     

       44
       44
       +
           sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc";

     

       44
       45
        
           fetchSubmodules = true;

     

       45
       46
        
         };

     

       46
       47

+2 -2

pkgs/applications/virtualization/podman/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildGoModule rec {

     

       18
       18
        
         pname = "podman";

     

       19
       19
       -
         version = "2.0.6";

     

       19
       19
       +
         version = "2.1.0";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "containers";

     

       23
       23
        
           repo = "podman";

     

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

     

       25
       25
       -
           sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4";

     

       25
       25
       +
           sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         vendorSha256 = null;

+4 -4

pkgs/build-support/rust/default.nix

···

       29
       29
        
       , target ? null

     

       30
       30
        
       , cargoVendorDir ? null

     

       31
       31
        
       , checkType ? buildType

     

       32
       32
       -
       

     

       32
       32
       +
       , depsExtraArgs ? {}

     

       33
       33
        
       # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir

     

       34
       34
        
       # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the

     

       35
       35
        
       # case for `rustfmt`/etc from the `rust-sources).

     
···

       43
       43
        
       let

     

       44
       44
        
       

     

       45
       45
        
         cargoDeps = if cargoVendorDir == null

     

       46
       46
       -
           then fetchCargoTarball {

     

       46
       46
       +
           then fetchCargoTarball ({

     

       47
       47
        
               inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;

     

       48
       48
        
               patches = cargoPatches;

     

       49
       49
        
               sha256 = cargoSha256;

     

       50
       50
       -
             }

     

       50
       50
       +
             } // depsExtraArgs)

     

       51
       51
        
           else null;

     

       52
       52
        
       

     

       53
       53
        
         # If we have a cargoSha256 fixed-output derivation, validate it at build time

     
···

       83
       83
        
       

     

       84
       84
        
       in

     

       85
       85
        
       

     

       86
       86
       -
       stdenv.mkDerivation (args // {

     

       86
       86
       +
       stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // {

     

       87
       87
        
         inherit cargoDeps;

     

       88
       88
        
       

     

       89
       89
        
         patchRegistryDeps = ./patch-registry-deps;

+33 -21

pkgs/data/fonts/comic-neue/default.nix

···

       1
       1
       -
       { lib, fetchzip }:

     

       1
       1
       +
       { stdenv, fetchzip }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         version = "2.3";

     

       5
       5
       -
       in fetchzip rec {

     

       6
       6
       -
         name = "comic-neue-${version}";

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "comic-neue";

     

       5
       5
       +
         version = "2.5";

     

       7
       6
        
       

     

       8
       8
       -
         url = "http://comicneue.com/${name}.zip";

     

       7
       7
       +
         src = fetchzip {

     

       8
       8
       +
           url = "http://comicneue.com/${pname}-${version}.zip";

     

       9
       9
       +
           sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q";

     

       10
       10
       +
           stripRoot = false; # because it comes with a __MACOSX directory

     

       11
       11
       +
         };

     

       9
       12
        
       

     

       10
       10
       -
         postFetch = ''

     

       11
       11
       -
           mkdir -vp $out/share/{doc,fonts}

     

       12
       12
       -
           unzip -j $downloadedFile OTF/\*.otf   -d $out/share/fonts/opentype

     

       13
       13
       -
           unzip -j $downloadedFile Web/\*.ttf   -d $out/share/fonts/truetype

     

       14
       14
       -
           unzip -j $downloadedFile Web/\*.eot   -d $out/share/fonts/EOT

     

       15
       15
       -
           unzip -j $downloadedFile Web/\*.woff  -d $out/share/fonts/WOFF

     

       16
       16
       -
           unzip -j $downloadedFile Web/\*.woff2 -d $out/share/fonts/WOFF2

     

       17
       17
       -
           unzip -j $downloadedFile \*.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt -d $out/share/doc/${name}

     

       18
       18
       -
         '';

     

       13
       13
       +
         phases = [ "unpackPhase" "installPhase" ];

     

       19
       14
        
       

     

       20
       20
       -
         sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779";

     

       15
       15
       +
         installPhase = ''

     

       16
       16
       +
           mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}}

     

       17
       17
       +
           cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/

     

       18
       18
       +
           cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype

     

       19
       19
       +
           cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype

     

       20
       20
       +
           cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype

     

       21
       21
       +
           cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype

     

       22
       22
       +
           cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT

     

       23
       23
       +
           cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT

     

       24
       24
       +
           cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF

     

       25
       25
       +
           cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF

     

       26
       26
       +
           cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2

     

       21
       27
        
       

     

       22
       22
       -
         meta = with lib; {

     

       28
       28
       +
           # Quick fix for conflicting names in upstream

     

       29
       29
       +
           for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do

     

       30
       30
       +
             cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'`

     

       31
       31
       +
           done

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with stdenv.lib; {

     

       23
       35
        
           homepage = "http://comicneue.com/";

     

       24
       36
        
           description = "A casual type face: Make your lemonade stand look like a fortune 500 company";

     

       25
       37
        
           longDescription = ''

     

       26
       26
       -
             It is inspired by Comic Sans but more regular.  The font was

     

       27
       27
       -
             designed by Craig Rozynski.  It is available in two variants:

     

       28
       28
       -
             Comic Neue and Comic Neue Angular.  The former having round and

     

       29
       29
       -
             the latter angular terminals.  Both variants come in Light,

     

       38
       38
       +
             ComicNeue is inspired by Comic Sans but more regular. It was

     

       39
       39
       +
             designed by Craig Rozynski. It is available in two variants:

     

       40
       40
       +
             Comic Neue and Comic Neue Angular. The former having round and

     

       41
       41
       +
             the latter angular terminals. Both variants come in Light,

     

       30
       42
        
             Regular, and Bold weights with Oblique variants.

     

       31
       43
        
           '';

     

       32
       44
        
           license = licenses.ofl;

-1

pkgs/development/chez-modules/chez-mit/default.nix

···

       13
       13
        
         buildInputs = [ chez chez-srfi ];

     

       14
       14
        
       

     

       15
       15
        
         buildPhase = ''

     

       16
       16
       -
           export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site

     

       17
       16
        
           make PREFIX=$out CHEZ=${chez}/bin/scheme

     

       18
       17
        
         '';

     

       19
       18

-1

pkgs/development/chez-modules/chez-scmutils/default.nix

···

       13
       13
        
         buildInputs = [ chez chez-srfi chez-mit ];

     

       14
       14
        
       

     

       15
       15
        
         buildPhase = ''

     

       16
       16
       -
           export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site:${chez-mit}/lib/csv-site

     

       17
       16
        
           make PREFIX=$out CHEZ=${chez}/bin/scheme

     

       18
       17
        
         '';

     

       19
       18

pkgs/development/compilers/chez/default.nix

···

       65
       65
        
           rm -rf $out/lib/csv${version}/examples

     

       66
       66
        
         '';

     

       67
       67
        
       

     

       68
       68
       +
         setupHook = ./setup-hook.sh;

     

       69
       69
       +
       

     

       68
       70
        
         meta = {

     

       69
       71
        
           description  = "A powerful and incredibly fast R6RS Scheme compiler";

     

       70
       72
        
           homepage     = "https://cisco.github.io/ChezScheme/";

pkgs/development/compilers/chez/setup-hook.sh

···

       1
       1
       +
       addChezLibraryPath() {

     

       2
       2
       +
         addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site"

     

       3
       3
       +
       }

     

       4
       4
       +
       

     

       5
       5
       +
       addEnvHooks "$targetOffset" addChezLibraryPath

+24 -24

pkgs/development/compilers/dotnet/default.nix

···

       12
       12
        
       rec {

     

       13
       13
        
         combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {};

     

       14
       14
        
       

     

       15
       15
       -
         # v2.1.15 (LTS)

     

       15
       15
       +
         # v2.1.22 (LTS)

     

       16
       16
        
       

     

       17
       17
        
         aspnetcore_2_1 = buildAspNetCore {

     

       18
       18
       -
           version = "2.1.16";

     

       18
       18
       +
           version = "2.1.22";

     

       19
       19
        
           sha512 = {

     

       20
       20
       -
             x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h";

     

       20
       20
       +
             x86_64-linux = "27v3a69dgnnb4lz5p2dn2qwadb8vpnqwdy6mnnqfp1dl4kgg3izvriz2268if272sy6flcz5lckjlmn0i0i1jci5zypc7x9kykj991l";

     

       21
       21
        
             aarch64-linux = null; # no aarch64 version of this package is available

     

       22
       22
       -
             x86_64-darwin = "1psqqpin4hipr2hzfp79712d6cag892jx4fx5001nlsynwrdq3vi4liakz4yz41rvk0jyd7f07z90wj97xlxyrqiqcc1fdbgn2q0px9";

     

       22
       22
       +
             x86_64-darwin = "0xh06jmzx2cfq51hv9l4h72hbfyh3r0wlla217821gi0hlw6xcc0gb3b4xmqcs240fllqnwrnrwz0axi3xi21wacgn3xbcmzpbi6jml";

     

       23
       23
        
           };

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         netcore_2_1 = buildNetCore {

     

       27
       27
       -
           version = "2.1.16";

     

       27
       27
       +
           version = "2.1.22";

     

       28
       28
        
           sha512 = {

     

       29
       29
       -
             x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l";

     

       30
       30
       -
             aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710";

     

       31
       31
       -
             x86_64-darwin = "2pxqpcw3djr18m0y124fbd6pz4lb5brlgvpvd9pdirkpsar8dmipsrhxcsk0d902zyxzgj1ac1ygzxsz49xvrkmh6s1m3w5fk8fws2f";

     

       29
       29
       +
             x86_64-linux = "0c2b31l59izcxbhz5wzjpjkdl550s5p3aid4vyghq468vyf67pm0npjny50c172b63vw0ikfbps2b2hj16hpifp116gj4b5llmqjhyc";

     

       30
       30
       +
             aarch64-linux = "3llai3d2xpgbr7a4ndg9wqfpnb5zb8k07dicc57a6cmniiqyqigyxinhpx2k0l45mbnihjsr5k1rih3r6bwlj241v67iwd2i0dpqd8a";

     

       31
       31
       +
             x86_64-darwin = "106mx6a4rwcvq41v54c1yx89156s43n889im9g0q2pvm7054q8b6xm6qrnymzmj5i2i6awyk0z02j5pfiyh35sw9afxb3695ymsb3v8";

     

       32
       32
        
           };

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         sdk_2_1 = buildNetCoreSdk {

     

       36
       36
       -
           version = "2.1.804";

     

       36
       36
       +
           version = "2.1.810";

     

       37
       37
        
           sha512 = {

     

       38
       38
       -
             x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42";

     

       39
       39
       -
             aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g";

     

       40
       40
       -
             x86_64-darwin = "0fjn18vizgfdbziklhgppnvka5iw2hb4pfi6047i46il8ydb6z1m40cflq436sdf07sivi0mnldg9247qvqrl6f078w3fwnh3bwlac8";

     

       38
       38
       +
             x86_64-linux = "388nrba5f7z9syq23xh3k45rzy3iys58s32ya7a0q9mwdf1y3haw7yvbq79cn08741hhqdi73mip8jf50f4s64mbr62ay1p76zsrkj5";

     

       39
       39
       +
             aarch64-linux = "2vs8bhk63cjrqkm5n164ahc6bdz58aq9vmhaiyy27krp7wlkz4gpiva9153h7mywhk709l1qc7cddj99qsh2ygv6axjfigbhgrzslqi";

     

       40
       40
       +
             x86_64-darwin = "3qxlgbd0np0w8wmp98mhp4cqgva4zglqf7k9kzqbwxfwr5s795kap7rs5w0cy7h0bsvj0ygx3d5nzyn9hp3fsswx4jl4mkvillnvjzy";

     

       41
       41
        
           };

     

       42
       42
        
         };

     

       43
       43
        
       

     
···

       77
       77
        
         # v3.1.1 (LTS)

     

       78
       78
        
       

     

       79
       79
        
         aspnetcore_3_1 = buildAspNetCore {

     

       80
       80
       -
           version = "3.1.5";

     

       80
       80
       +
           version = "3.1.8";

     

       81
       81
        
           sha512 = {

     

       82
       82
       -
             x86_64-linux = "3ziyvm6llvhnjg8ayr4cfcabwkc46fqscgj12faavib34r5zx4mnv3qccqm3gg2r8jps60h42lvrwj3fliqmr0qqnhsw04819kqwai6";

     

       83
       83
       -
             aarch64-linux = "2nbhvh8dpg7dghcs6ysdg7mcc60hbk5d3zab0nnbqkib93fdhbzhzcra9qhh80h8x03zw0jsn3gzqx0d1z2vz5z3lsa14vmb86pzj4a";

     

       84
       84
       -
             x86_64-darwin = "1sfnp849vmsv8775fjsf9nzx28cmkvfgk8fa81h2l849z31ssaw9fn89kk0n83l0wrhr24ivmprfr11sp42gnjbncqfsnz4883lfchw";

     

       82
       82
       +
             x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw";

     

       83
       83
       +
             aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40";

     

       84
       84
       +
             x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b";

     

       85
       85
        
           };

     

       86
       86
        
         };

     

       87
       87
        
       

     

       88
       88
        
         netcore_3_1 = buildNetCore {

     

       89
       89
       -
           version = "3.1.5";

     

       89
       89
       +
           version = "3.1.8";

     

       90
       90
        
           sha512 = {

     

       91
       91
       -
             x86_64-linux = "03g6aghbpsxj9csaq9lkc8cad1nk8kvlivkarq6bfqvx992fxw6zryp7kcm5h6a5gkgpimb1nr17vndj1r629hdhpincqj8yw6i33mq";

     

       92
       92
       -
             aarch64-linux = "25gwicmpzhzs96w3azypbl32bx967f14xkfdgvl7knw234rcmfv7zr0a7lb3vci68dbx4xywpnwlrvgi54mimzp8nagrgwva8zrrxzb";

     

       93
       93
       -
             x86_64-darwin = "2g28jmv1n7pgxfq4wk9x58y5dp835c7rckz6c88ylk7g9w6z75l94pblfl1rc7mr6g3wddiy5cl87a607j9g283hv28a4vcpvll8s7g";

     

       91
       91
       +
             x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc";

     

       92
       92
       +
             aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf";

     

       93
       93
       +
             x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c";

     

       94
       94
        
           };

     

       95
       95
        
         };

     

       96
       96
        
       

     

       97
       97
        
         sdk_3_1 = buildNetCoreSdk {

     

       98
       98
       -
           version = "3.1.102";

     

       98
       98
       +
           version = "3.1.402";

     

       99
       99
        
           sha512 = {

     

       100
       100
       -
             x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w";

     

       101
       101
       -
             aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks";

     

       102
       102
       -
             x86_64-darwin = "00xs87zj94v6yr6xs294bficp6lxpghyfswhnwqfkx62jy80qr5fa2y7s10ich3cbm2daa8dby56iizdvi7rnlvp23gfkq12gq4w1g8";

     

       100
       100
       +
             x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2";

     

       101
       101
       +
             aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p";

     

       102
       102
       +
             x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8";

     

       103
       103
        
           };

     

       104
       104
        
         };

     

       105
       105
        
       }

-12

pkgs/development/compilers/elm/default.nix

···

       30
       30
        
                   `package/nix/build.sh`

     

       31
       31
        
                   */

     

       32
       32
        
                   elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {

     

       33
       33
       -
                     # GHC 8.8.3 support

     

       34
       34
       -
                     # https://github.com/avh4/elm-format/pull/640

     

       35
       35
       -
                     patches = [(

     

       36
       36
       -
                       fetchpatch {

     

       37
       37
       -
                         url = "https://github.com/turboMaCk/elm-format/commit/4f4abdc7117ed6ce3335f6cf39b6495b48067b7c.patch";

     

       38
       38
       -
                         sha256 = "1zqk6q6w0ph12mnwffgwzf4h1hcgqg0v09ws9q2g5bg2riq4rvd9";

     

       39
       39
       -
                       }

     

       40
       40
       -
                     )];

     

       41
       41
       -
                     # Tests are failing after upgrade to ghc881.

     

       42
       42
       -
                     # Cause is probably just a minor change in stdout output

     

       43
       43
       -
                     # see https://github.com/avh4/elm-format/pull/640

     

       44
       44
       -
                     doCheck = false;

     

       45
       33
        
                     jailbreak = true;

     

       46
       34
        
                   }));

     

       47
       35

+8 -8

pkgs/development/compilers/elm/packages/elm-format.nix

···

       1
       1
       -
       { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary

     

       1
       1
       +
       { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary

     

       2
       2
        
       , bytestring, cmark, containers, directory, filepath, free, HUnit

     

       3
       3
        
       , indents, json, mtl, optparse-applicative, parsec, process

     

       4
       4
        
       , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden

     
···

       6
       6
        
       }:

     

       7
       7
        
       mkDerivation {

     

       8
       8
        
         pname = "elm-format";

     

       9
       9
       -
         version = "0.8.3";

     

       9
       9
       +
         version = "0.8.4";

     

       10
       10
        
         src = fetchgit {

     

       11
       11
        
           url = "https://github.com/avh4/elm-format";

     

       12
       12
       -
           sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8";

     

       13
       13
       -
           rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b";

     

       12
       12
       +
           sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai";

     

       13
       13
       +
           rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890";

     

       14
       14
        
         };

     

       15
       15
        
         postPatch = ''

     

       16
       16
        
           mkdir -p ./generated

     
···

       18
       18
        
           module Build_elm_format where

     

       19
       19
        
       

     

       20
       20
        
           gitDescribe :: String

     

       21
       21
       -
           gitDescribe = "0.8.3"

     

       21
       21
       +
           gitDescribe = "0.8.4"

     

       22
       22
        
           EOHS

     

       23
       23
        
         '';

     

       24
       24
        
         isLibrary = false;

     

       25
       25
        
         isExecutable = true;

     

       26
       26
        
         libraryHaskellDepends = [

     

       27
       27
       -
           ansi-terminal ansi-wl-pprint base binary bytestring containers

     

       28
       28
       -
           directory filepath free indents json mtl optparse-applicative

     

       29
       29
       -
           parsec process split text

     

       27
       27
       +
           ansi-terminal ansi-wl-pprint array base binary bytestring

     

       28
       28
       +
           containers directory filepath free indents json mtl

     

       29
       29
       +
           optparse-applicative parsec process split text

     

       30
       30
        
         ];

     

       31
       31
        
         executableHaskellDepends = [ base ];

     

       32
       32
        
         testHaskellDepends = [

+2 -2

pkgs/development/compilers/llvm/rocm/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, callPackage, wrapCCWith }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "3.7.0";

     

       4
       4
       +
         version = "3.8.0";

     

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "RadeonOpenCompute";

     

       7
       7
        
           repo = "llvm-project";

     

       8
       8
        
           rev = "rocm-${version}";

     

       9
       9
       -
           sha256 = "02p0s041wwsi4q0dhs1sj5l6059y02s31az505h0f22agz3jnpfn";

     

       9
       9
       +
           sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6";

     

       10
       10
        
         };

     

       11
       11
        
       in rec {

     

       12
       12
        
         clang = wrapCCWith rec {

+66

pkgs/development/compilers/lobster/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , cmake

     

       4
       4
       +
       , callPackage

     

       5
       5
       +
       

     

       6
       6
       +
       # Linux deps

     

       7
       7
       +
       , libGL

     

       8
       8
       +
       , xorg

     

       9
       9
       +
       

     

       10
       10
       +
       # Darwin deps

     

       11
       11
       +
       , cf-private

     

       12
       12
       +
       , Cocoa

     

       13
       13
       +
       , AudioToolbox

     

       14
       14
       +
       , OpenGL

     

       15
       15
       +
       , Foundation

     

       16
       16
       +
       , ForceFeedback

     

       17
       17
       +
       }:

     

       18
       18
       +
       

     

       19
       19
       +
       stdenv.mkDerivation rec {

     

       20
       20
       +
         pname = "lobster";

     

       21
       21
       +
         version = "unstable-2020-07-27";

     

       22
       22
       +
       

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "aardappel";

     

       25
       25
       +
           repo = pname;

     

       26
       26
       +
           rev = "9d68171494a79c83931426b624a0249a9c51882c";

     

       27
       27
       +
           sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd";

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         nativeBuildInputs = [ cmake ];

     

       31
       31
       +
         buildInputs = if stdenv.isDarwin

     

       32
       32
       +
           then [

     

       33
       33
       +
             cf-private

     

       34
       34
       +
             Cocoa

     

       35
       35
       +
             AudioToolbox

     

       36
       36
       +
             OpenGL

     

       37
       37
       +
             Foundation

     

       38
       38
       +
             ForceFeedback

     

       39
       39
       +
           ]

     

       40
       40
       +
           else [

     

       41
       41
       +
             libGL

     

       42
       42
       +
             xorg.libX11

     

       43
       43
       +
             xorg.libXext

     

       44
       44
       +
           ];

     

       45
       45
       +
       

     

       46
       46
       +
         preConfigure = "cd dev";

     

       47
       47
       +
         enableParallelBuilding = true;

     

       48
       48
       +
       

     

       49
       49
       +
         passthru.tests = {

     

       50
       50
       +
           can-run-hello-world = callPackage ./test-can-run-hello-world.nix {};

     

       51
       51
       +
         };

     

       52
       52
       +
       

     

       53
       53
       +
         meta = with stdenv.lib; {

     

       54
       54
       +
           homepage = "http://strlen.com/lobster";

     

       55
       55
       +
           description = "The Lobster programming language";

     

       56
       56
       +
           longDescription = ''

     

       57
       57
       +
             Lobster is a programming language that tries to combine the advantages of

     

       58
       58
       +
             very static typing and memory management with a very lightweight,

     

       59
       59
       +
             friendly and terse syntax, by doing most of the heavy lifting for you.

     

       60
       60
       +
           '';

     

       61
       61
       +
           license = licenses.asl20;

     

       62
       62
       +
           maintainers = with maintainers; [ fgaz ];

     

       63
       63
       +
           platforms = platforms.all;

     

       64
       64
       +
         };

     

       65
       65
       +
       }

     

       66
       66
       +

+13

pkgs/development/compilers/lobster/test-can-run-hello-world.nix

···

       1
       1
       +
       { stdenv, lobster }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "lobster-test-can-run-hello-world";

     

       5
       5
       +
         meta.timeout = 10;

     

       6
       6
       +
         buildCommand = ''

     

       7
       7
       +
           ${lobster}/bin/lobster \

     

       8
       8
       +
             ${lobster}/share/Lobster/samples/rosettacode/hello_world_test.lobster \

     

       9
       9
       +
             | grep 'Goodbye, World!'

     

       10
       10
       +
           touch $out

     

       11
       11
       +
         '';

     

       12
       12
       +
       }

     

       13
       13
       +

+12 -35

pkgs/development/coq-modules/metalib/default.nix

···

       1
       1
       -
       { stdenv, fetchgit, coq, haskellPackages, which, ott

     

       2
       2
       -
       }:

     

       1
       1
       +
       { stdenv, fetchFromGitHub, coq }:

     

       3
       2
        
       

     

       4
       3
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "metalib-${coq.coq-version}-${version}";

     

       6
       6
       -
         version = "20170713";

     

       4
       4
       +
         name = "coq${coq.coq-version}-metalib-${version}";

     

       5
       5
       +
         version = "20200527";

     

       7
       6
        
       

     

       8
       8
       -
         src = fetchgit {

     

       9
       9
       -
           url = "https://github.com/plclub/metalib.git";

     

       10
       10
       -
           rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52";

     

       11
       11
       -
           sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "plclub";

     

       9
       9
       +
           repo = "metalib";

     

       10
       10
       +
           rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8";

     

       11
       11
       +
           sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         # The 'lngen' command-line utility is built from Haskell sources

     

       15
       15
       -
         lngen = with haskellPackages; mkDerivation {

     

       16
       16
       -
           pname = "lngen";

     

       17
       17
       -
           version = "0.0.1";

     

       18
       18
       -
           src = fetchgit {

     

       19
       19
       -
             url = "https://github.com/plclub/lngen";

     

       20
       20
       -
             rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c";

     

       21
       21
       -
             sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd";

     

       22
       22
       -
           };

     

       23
       23
       -
           isLibrary = true;

     

       24
       24
       -
           isExecutable = true;

     

       25
       25
       -
           libraryHaskellDepends = [ base containers mtl parsec syb ];

     

       26
       26
       -
           executableHaskellDepends = [ base ];

     

       27
       27
       -
           homepage = "https://github.com/plclub/lngen";

     

       28
       28
       -
           description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott";

     

       29
       29
       -
           license = stdenv.lib.licenses.mit;

     

       30
       30
       -
         };

     

       14
       14
       +
         sourceRoot = "source/Metalib";

     

       31
       15
        
       

     

       32
       32
       -
         buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ];

     

       33
       33
       -
         propagatedBuildInputs = [ coq ];

     

       16
       16
       +
         buildInputs = [ coq ];

     

       34
       17
        
       

     

       35
       18
        
         enableParallelBuilding = true;

     

       36
       19
        
       

     

       37
       37
       -
         buildPhase = ''

     

       38
       38
       -
           (cd Metalib; make)

     

       39
       39
       -
         '';

     

       40
       40
       -
       

     

       41
       41
       -
         installPhase = ''

     

       42
       42
       -
           (cd Metalib; make -f CoqSrc.mk DSTROOT=/ COQLIB=$out/lib/coq/${coq.coq-version}/ install)

     

       43
       43
       -
         '';

     

       20
       20
       +
         installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}";

     

       44
       21
        
       

     

       45
       22
        
         meta = with stdenv.lib; {

     

       46
       23
        
           homepage = "https://github.com/plclub/metalib";

     
···

       50
       27
        
         };

     

       51
       28
        
       

     

       52
       29
        
         passthru = {

     

       53
       53
       -
           compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];

     

       30
       30
       +
           compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ];

     

       54
       31
        
         };

     

       55
       32
        
       

     

       56
       33
        
       }

+6 -36

pkgs/development/dotnet-modules/python-language-server/deps.nix

···

       54
       54
        
       

     

       55
       55
        
         (fetchNuGet {

     

       56
       56
        
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       57
       57
       -
           version = "3.0.2";

     

       58
       58
       -
           sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj";

     

       59
       59
       -
         })

     

       60
       60
       -
       

     

       61
       61
       -
         (fetchNuGet {

     

       62
       62
       -
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       63
       57
        
           version = "3.0.3";

     

       64
       58
        
           sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9";

     

       65
       59
        
         })

     

       66
       60
        
       

     

       67
       61
        
         (fetchNuGet {

     

       68
       62
        
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       69
       69
       -
           version = "3.1.2";

     

       70
       70
       -
           sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9";

     

       71
       71
       -
         })

     

       72
       72
       -
       

     

       73
       73
       -
         (fetchNuGet {

     

       74
       74
       -
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       75
       75
       -
           version = "3.1.3";

     

       76
       76
       -
           sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn";

     

       63
       63
       +
           version = "3.1.8";

     

       64
       64
       +
           sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";

     

       77
       65
        
         })

     

       78
       66
        
       

     

       79
       67
        
         (fetchNuGet {

     
···

       102
       90
        
       

     

       103
       91
        
         (fetchNuGet {

     

       104
       92
        
           name = "Microsoft.NetCore.App.Host.linux-x64";

     

       105
       105
       -
           version = "3.0.2";

     

       106
       106
       -
           sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5";

     

       107
       107
       -
         })

     

       108
       108
       -
       

     

       109
       109
       -
         (fetchNuGet {

     

       110
       110
       -
           name = "Microsoft.NetCore.App.Host.linux-x64";

     

       111
       93
        
           version = "3.0.3";

     

       112
       94
        
           sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4";

     

       113
       95
        
         })

     

       114
       96
        
       

     

       115
       97
        
         (fetchNuGet {

     

       116
       98
        
           name = "Microsoft.NetCore.App.Host.linux-x64";

     

       117
       117
       -
           version = "3.1.3";

     

       118
       118
       -
           sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw";

     

       99
       99
       +
           version = "3.1.8";

     

       100
       100
       +
           sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs";

     

       119
       101
        
         })

     

       120
       102
        
       

     

       121
       103
        
         (fetchNuGet {

     
···

       128
       110
        
           name = "Microsoft.NetCore.App.Ref";

     

       129
       111
        
           version = "3.1.0";

     

       130
       112
        
           sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y";

     

       131
       131
       -
         })

     

       132
       132
       -
       

     

       133
       133
       -
         (fetchNuGet {

     

       134
       134
       -
           name = "Microsoft.NetCore.App.Runtime.linux-x64";

     

       135
       135
       -
           version = "3.0.2";

     

       136
       136
       -
           sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1";

     

       137
       113
        
         })

     

       138
       114
        
       

     

       139
       115
        
         (fetchNuGet {

     
···

       144
       120
        
       

     

       145
       121
        
         (fetchNuGet {

     

       146
       122
        
           name = "Microsoft.NetCore.App.Runtime.linux-x64";

     

       147
       147
       -
           version = "3.1.2";

     

       148
       148
       -
           sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";

     

       149
       149
       -
         })

     

       150
       150
       -
       

     

       151
       151
       -
         (fetchNuGet {

     

       152
       152
       -
           name = "Microsoft.NetCore.App.Runtime.linux-x64";

     

       153
       153
       -
           version = "3.1.3";

     

       154
       154
       -
           sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9";

     

       123
       123
       +
           version = "3.1.8";

     

       124
       124
       +
           sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";

     

       155
       125
        
         })

     

       156
       126
        
       

     

       157
       127
        
         (fetchNuGet {

+1 -1

pkgs/development/interpreters/perl/default.nix

···

       72
       72
        
           # Miniperl needs -lm. perl needs -lrt.

     

       73
       73
        
           configureFlags =

     

       74
       74
        
             (if crossCompiling

     

       75
       75
       -
              then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ]

     

       75
       75
       +
              then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ]

     

       76
       76
        
              else [ "-de" "-Dcc=cc" ])

     

       77
       77
        
             ++ [

     

       78
       78
        
               "-Uinstallusrbinperl"

+1 -1

pkgs/development/interpreters/python/default.nix

···

       1
       1
       -
       { pkgs, lib }:

     

       1
       1
       +
       { pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       with pkgs;

     

       4
       4

+39

pkgs/development/libraries/audiality2/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , cmake

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       # The two audio backends:

     

       6
       6
       +
       , SDL2

     

       7
       7
       +
       , jack2

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation rec {

     

       11
       11
       +
         pname = "audiality2";

     

       12
       12
       +
         version = "1.9.4";

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "olofson";

     

       16
       16
       +
           repo = "audiality2";

     

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

     

       18
       18
       +
           sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [

     

       22
       22
       +
           cmake

     

       23
       23
       +
           pkg-config

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildInputs = [

     

       27
       27
       +
           SDL2

     

       28
       28
       +
           jack2

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         meta = with stdenv.lib; {

     

       32
       32
       +
           description = "A realtime scripted modular audio engine for video games and musical applications";

     

       33
       33
       +
           homepage = "http://audiality.org";

     

       34
       34
       +
           license = licenses.zlib;

     

       35
       35
       +
           platforms = platforms.all;

     

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

     

       37
       37
       +
         };

     

       38
       38
       +
       }

     

       39
       39
       +

+4 -1

pkgs/development/libraries/crc32c/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, cmake, gflags }:

     

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, cmake, gflags

     

       2
       2
       +
       , staticOnly ? false }:

     

       3
       3
       +
       

     

       2
       4
        
       stdenv.mkDerivation rec {

     

       3
       5
        
         pname = "crc32c";

     

       4
       6
        
         version = "1.1.0";

     
···

       14
       16
        
         nativeBuildInputs = [ cmake ];

     

       15
       17
        
         buildInputs = [ gflags ];

     

       16
       18
        
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc";

     

       19
       19
       +
         cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1"  ];

     

       17
       20
        
       

     

       18
       21
        
         meta = with stdenv.lib; {

     

       19
       22
        
           homepage = "https://github.com/google/crc32c";

+2 -2

pkgs/development/libraries/hiredis/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "hiredis";

     

       5
       5
       -
         version = "0.14.1";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "redis";

     

       9
       9
        
           repo = "hiredis";

     

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

     

       11
       11
       -
           sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq";

     

       11
       11
       +
           sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         PREFIX = "\${out}";

+23

pkgs/development/libraries/libbacktrace/default.nix

···

       1
       1
       +
       { stdenv, callPackage, fetchFromGitHub, enableStatic ? false, enableShared ? true }:

     

       2
       2
       +
       let

     

       3
       3
       +
         yesno = b: if b then "yes" else "no";

     

       4
       4
       +
       in stdenv.mkDerivation rec {

     

       5
       5
       +
         pname = "libbacktrace";

     

       6
       6
       +
         version = "2020-05-13";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "ianlancetaylor";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = "9b7f216e867916594d81e8b6118f092ac3fcf704";

     

       11
       11
       +
           sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh";

     

       12
       12
       +
         };

     

       13
       13
       +
         configureFlags = [

     

       14
       14
       +
           "--enable-static=${yesno enableStatic}"

     

       15
       15
       +
           "--enable-shared=${yesno enableShared}"

     

       16
       16
       +
         ];

     

       17
       17
       +
         meta = with stdenv.lib; {

     

       18
       18
       +
           description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces";

     

       19
       19
       +
           homepage = https://github.com/ianlancetaylor/libbacktrace;

     

       20
       20
       +
           maintainers = with maintainers; [ twey ];

     

       21
       21
       +
           license = with licenses; [ bsd3 ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+7 -2

pkgs/development/libraries/neatvnc/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "neatvnc";

     

       7
       7
       -
         version = "0.2.0";

     

       7
       7
       +
         version = "0.3.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "any1";

     

       11
       11
        
           repo = pname;

     

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

     

       13
       13
       -
           sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs";

     

       13
       13
       +
           sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8";

     

       14
       14
        
         };

     

       15
       15
       +
       

     

       16
       16
       +
         postPatch = ''

     

       17
       17
       +
           substituteInPlace meson.build --replace \

     

       18
       18
       +
             "version: '0.2.0'" "version: '${version}'"

     

       19
       19
       +
         '';

     

       15
       20
        
       

     

       16
       21
        
         nativeBuildInputs = [ meson pkg-config ninja ];

     

       17
       22
        
         buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ];

+2 -2

pkgs/development/libraries/rocclr/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "rocclr";

     

       18
       18
       -
         version = "3.7.0";

     

       18
       18
       +
         version = "3.8.0";

     

       19
       19
        
       

     

       20
       20
        
         src = fetchFromGitHub {

     

       21
       21
        
           owner = "ROCm-Developer-Tools";

     

       22
       22
        
           repo = "ROCclr";

     

       23
       23
        
           rev = "rocm-${version}";

     

       24
       24
       -
           sha256 = "0sx4irbmjgs5bm8dc8jc9fl1jmfdnrp3ar14hdhrsmbani7gqah3";

     

       24
       24
       +
           sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [ cmake rocm-cmake ];

+2 -2

pkgs/development/libraries/rocm-comgr/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "rocm-comgr";

     

       5
       5
       -
         version = "3.7.0";

     

       5
       5
       +
         version = "3.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RadeonOpenCompute";

     

       9
       9
        
           repo = "ROCm-CompilerSupport";

     

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

     

       11
       11
       -
           sha256 = "1r7arfdqfh6pfvjza6x2dzd5gjmkndngrp688d3n2ab92n5ijiqf";

     

       11
       11
       +
           sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = "source/lib/comgr";

+2 -2

pkgs/development/libraries/rocm-device-libs/default.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "rocm-device-libs";

     

       12
       12
       -
         version = "3.7.0";

     

       12
       12
       +
         version = "3.8.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "RadeonOpenCompute";

     

       16
       16
        
           repo = "ROCm-Device-Libs";

     

       17
       17
        
           rev = "rocm-${version}";

     

       18
       18
       -
           sha256 = "1sg7wzj2mi5vhba53cp52gnya7c799f0p325ig262vi70r7mr7n2";

     

       18
       18
       +
           sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/rocm-opencl-runtime/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "rocm-opencl-runtime";

     

       24
       24
       -
         version = "3.7.0";

     

       24
       24
       +
         version = "3.8.0";

     

       25
       25
        
       

     

       26
       26
        
         src = fetchFromGitHub {

     

       27
       27
        
           owner = "RadeonOpenCompute";

     

       28
       28
        
           repo = "ROCm-OpenCL-Runtime";

     

       29
       29
        
           rev = "rocm-${version}";

     

       30
       30
       -
           sha256 = "15rz11a8qwvxmd0kkaikj04q1glfg9sgqqblcqp3iahr3by8z0wd";

     

       30
       30
       +
           sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm";

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         nativeBuildInputs = [ cmake rocm-cmake ];

+1 -1

pkgs/development/libraries/rocm-runtime/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "rocm-runtime";

     

       14
       14
       -
         version = "3.7.0";

     

       14
       14
       +
         version = "3.8.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "RadeonOpenCompute";

+2 -2

pkgs/development/libraries/rocm-thunk/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "rocm-thunk";

     

       10
       10
       -
         version = "3.7.0";

     

       10
       10
       +
         version = "3.8.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "RadeonOpenCompute";

     

       14
       14
        
           repo = "ROCT-Thunk-Interface";

     

       15
       15
        
           rev = "rocm-${version}";

     

       16
       16
       -
           sha256 = "05963lxip3175g4b7k45r94yayp9gcwl3fpma9g5mdkbrlbvwlvz";

     

       16
       16
       +
           sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

+1 -1

pkgs/development/libraries/sundials/2.x.nix

···

       53
       53
        
           description = "Suite of nonlinear differential/algebraic equation solvers";

     

       54
       54
        
           homepage    = "https://computation.llnl.gov/projects/sundials";

     

       55
       55
        
           platforms   = platforms.all;

     

       56
       56
       -
           maintainers = with maintainers; [ flokli idontgetoutmuch ];

     

       56
       56
       +
           maintainers = with maintainers; [ idontgetoutmuch ];

     

       57
       57
        
           license     = licenses.bsd3;

     

       58
       58
        
         };

     

       59
       59
        
       }

+2 -2

pkgs/development/libraries/sundials/default.nix

···

       21
       21
        
           gfortran

     

       22
       22
        
           blas

     

       23
       23
        
           lapack

     

       24
       24
       -
         ] 

     

       24
       24
       +
         ]

     

       25
       25
        
         # KLU support is based on Suitesparse.

     

       26
       26
        
         # It is tested upstream according to the section 1.1.4 of

     

       27
       27
        
         # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf)

     
···

       63
       63
        
           description = "Suite of nonlinear differential/algebraic equation solvers";

     

       64
       64
        
           homepage    = "https://computation.llnl.gov/projects/sundials";

     

       65
       65
        
           platforms   = platforms.all;

     

       66
       66
       -
           maintainers = with maintainers; [ flokli idontgetoutmuch ];

     

       66
       66
       +
           maintainers = with maintainers; [ idontgetoutmuch ];

     

       67
       67
        
           license     = licenses.bsd3;

     

       68
       68
        
         };

     

       69
       69
        
       }

+3 -1

pkgs/development/libraries/vulkan-loader/default.nix

···

       17
       17
        
         enableParallelBuilding = true;

     

       18
       18
        
       

     

       19
       19
        
         preConfigure = ''

     

       20
       20
       -
           substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include'

     

       20
       20
       +
           substituteInPlace loader/vulkan.pc.in \

     

       21
       21
       +
             --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \

     

       22
       22
       +
             --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@'

     

       21
       23
        
         '';

     

       22
       24
        
       

     

       23
       25
        
         cmakeFlags = [

+2 -2

pkgs/development/libraries/zimg/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "zimg";

     

       5
       5
       -
         version = "3.0";

     

       5
       5
       +
         version = "3.0.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "sekrit-twc";

     

       9
       9
        
           repo   = "zimg";

     

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

     

       11
       11
       -
           sha256 = "157lqfgz4lqa782iij7lkajgjbxv3vqf6y5hpdz36i6dg06paqqa";

     

       11
       11
       +
           sha256 = "1mpns443ifbkbaxsw6yy8z01l7815259pxzd7s006npr0dxnc8ng";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook ];

+2 -4

pkgs/development/ocaml-modules/csexp/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "csexp";

     

       5
       5
       -
         version = "1.3.1";

     

       6
       6
       -
       

     

       7
       7
       -
         useDune2 = true;

     

       5
       5
       +
         version = "1.3.2";

     

       8
       6
        
       

     

       9
       7
        
         minimumOCamlVersion = "4.08";

     

       10
       8
        
       

     

       11
       9
        
         src = fetchurl {

     

       12
       10
        
           url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz";

     

       13
       13
       -
           sha256 = "0maihbqbqq9bwr0r1cv51r3m4hrkx9cf5wnxcz7rjgn13lcc9s49";

     

       11
       11
       +
           sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         postPatch = ''

-26

pkgs/development/ocaml-modules/irmin/1.4.nix

···

       1
       1
       -
       { lib, fetchurl, buildDunePackage, ocaml

     

       2
       2
       -
       , astring, cstruct, fmt, hex, jsonm, logs, ocaml_lwt, ocamlgraph, uri

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildDunePackage rec {

     

       6
       6
       -
         pname = "irmin";

     

       7
       7
       -
         version = "1.4.0";

     

       8
       8
       -
       

     

       9
       9
       -
         minimumOCamlVersion = "4.03";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-${version}.tbz";

     

       13
       13
       -
           sha256 = "019di4cz0z65knl232rnwj26npnc1mqh8j71xbf0mav6x350g1w5";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         propagatedBuildInputs = [ astring cstruct fmt hex jsonm logs ocaml_lwt ocamlgraph uri ];

     

       17
       17
       -
       

     

       18
       18
       -
         doCheck = true;

     

       19
       19
       -
       

     

       20
       20
       -
         meta = with lib; {

     

       21
       21
       -
           homepage = "https://github.com/mirage/irmin";

     

       22
       22
       -
           description = "Irmin, a distributed database that follows the same design principles as Git";

     

       23
       23
       -
           license = licenses.isc;

     

       24
       24
       -
           maintainers = [ maintainers.alexfmpe ];

     

       25
       25
       -
         };

     

       26
       26
       -
       }

+14 -20

pkgs/development/ocaml-modules/qtest/default.nix

···

       1
       1
       -
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }:

     

       1
       1
       +
       { lib, buildDunePackage, fetchFromGitHub, qcheck }:

     

       2
       2
        
       

     

       3
       3
       -
       if !stdenv.lib.versionAtLeast ocaml.version "4"

     

       4
       4
       -
       then throw "qtest is not available for OCaml ${ocaml.version}"

     

       5
       5
       -
       else

     

       3
       3
       +
       buildDunePackage rec {

     

       4
       4
       +
         pname = "qtest";

     

       5
       5
       +
         version = "2.11";

     

       6
       6
        
       

     

       7
       7
       -
       let version = "2.7"; in

     

       8
       8
       -
       

     

       9
       9
       -
       stdenv.mkDerivation {

     

       10
       10
       -
         name = "ocaml${ocaml.version}-qtest-${version}";

     

       11
       11
       -
         src = fetchzip {

     

       12
       12
       -
           url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz";

     

       13
       13
       -
           sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "vincent-hugot";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3";

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       16
       -
         buildInputs = [ ocaml findlib ocamlbuild ];

     

       17
       17
       -
         propagatedBuildInputs = [ qcheck ounit ];

     

       18
       18
       -
       

     

       19
       19
       -
         installFlags = [ "BIN=$(out)/bin" ];

     

       20
       20
       -
         preInstall = "mkdir -p $out/bin";

     

       14
       14
       +
         propagatedBuildInputs = [ qcheck ];

     

       21
       15
        
       

     

       22
       16
        
         meta = {

     

       23
       23
       -
           description = "Inline (Unit) Tests for OCaml (formerly “qtest”)";

     

       24
       24
       -
           homepage = "https://github.com/vincent-hugot/iTeML";

     

       25
       25
       -
           platforms = ocaml.meta.platforms or [];

     

       26
       26
       -
           maintainers = with stdenv.lib.maintainers; [ vbgl ];

     

       17
       17
       +
           description = "Inline (Unit) Tests for OCaml";

     

       18
       18
       +
           inherit (src.meta) homepage;

     

       19
       19
       +
           maintainers = with lib.maintainers; [ vbgl ];

     

       20
       20
       +
           license = lib.licenses.gpl3;

     

       27
       21
        
         };

     

       28
       22
        
       }

+2 -2

pkgs/development/ocaml-modules/zed/default.nix

···

       3
       3
        
       let param =

     

       4
       4
        
         if stdenv.lib.versionAtLeast ocaml.version "4.02" then

     

       5
       5
        
         {

     

       6
       6
       -
           version = "2.0.3";

     

       7
       7
       -
           sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55";

     

       6
       6
       +
           version = "3.1.0";

     

       7
       7
       +
           sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p";

     

       8
       8
        
           buildInputs = [ dune ];

     

       9
       9
        
           propagatedBuildInputs = [ charInfo_width ];

     

       10
       10
        
           extra = {

+28

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

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pyvcf

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "ACEBinf";

     

       9
       9
       +
         version = "1.0.2";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchPypi {

     

       12
       12
       +
           inherit pname version;

     

       13
       13
       +
           sha256 = "1168pny671l6zfm2vv1pwspnflmzi7f4v8yldjl7zlz0b9cm5zlz";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ pyvcf ];

     

       17
       17
       +
       

     

       18
       18
       +
         # no tests

     

       19
       19
       +
         doCheck = false;

     

       20
       20
       +
         pythonImportsCheck = [ "acebinf" ];

     

       21
       21
       +
       

     

       22
       22
       +
         meta = with stdenv.lib; {

     

       23
       23
       +
           homepage = "https://github.com/ACEnglish/acebinf";

     

       24
       24
       +
           description = "Collection of simple utilities used when building bioinformatics tools";

     

       25
       25
       +
           license = licenses.unlicense;

     

       26
       26
       +
           maintainers = with maintainers; [ ris ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+42

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

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , bwa

     

       6
       6
       +
       , cffi

     

       7
       7
       +
       , zlib

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "bwapy";

     

       12
       12
       +
         version = "0.1.4";

     

       13
       13
       +
         disabled = pythonOlder "3.6";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchPypi {

     

       16
       16
       +
           inherit pname version;

     

       17
       17
       +
           sha256 = "090qwx3vl729zn3a7sksbviyg04kc71gpbm3nd8dalqp673x1npw";

     

       18
       18
       +
         };

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           # replace bundled bwa

     

       21
       21
       +
           rm -r bwa/*

     

       22
       22
       +
           cp ${bwa}/lib/*.a ${bwa}/include/*.h bwa/

     

       23
       23
       +
       

     

       24
       24
       +
           substituteInPlace setup.py \

     

       25
       25
       +
             --replace 'setuptools>=49.2.0' 'setuptools'

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [ zlib bwa ];

     

       29
       29
       +
       

     

       30
       30
       +
         propagatedBuildInputs = [ cffi ];

     

       31
       31
       +
       

     

       32
       32
       +
         # no tests

     

       33
       33
       +
         doCheck = false;

     

       34
       34
       +
         pythonImportsCheck = [ "bwapy" ];

     

       35
       35
       +
       

     

       36
       36
       +
         meta = with stdenv.lib; {

     

       37
       37
       +
           homepage = "https://github.com/ACEnglish/acebinf";

     

       38
       38
       +
           description = "Python bindings to bwa mem aligner";

     

       39
       39
       +
           license = licenses.mpl20;

     

       40
       40
       +
           maintainers = with maintainers; [ ris ];

     

       41
       41
       +
         };

     

       42
       42
       +
       }

+53

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , isPy27

     

       5
       5
       +
       , attrs

     

       6
       6
       +
       , colorlog

     

       7
       7
       +
       , csvw

     

       8
       8
       +
       , dateutil

     

       9
       9
       +
       , tabulate

     

       10
       10
       +
       , mock

     

       11
       11
       +
       , postgresql

     

       12
       12
       +
       , pytestCheckHook

     

       13
       13
       +
       , pytest-mock

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       buildPythonPackage rec {

     

       17
       17
       +
         pname = "clldutils";

     

       18
       18
       +
         version = "3.5.2";

     

       19
       19
       +
         disabled = isPy27;

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "clld";

     

       23
       23
       +
           repo = pname;

     

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

     

       25
       25
       +
           sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         patchPhase = ''

     

       29
       29
       +
           substituteInPlace setup.cfg --replace "--cov" ""

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         propagatedBuildInputs = [

     

       33
       33
       +
           dateutil

     

       34
       34
       +
           tabulate

     

       35
       35
       +
           colorlog

     

       36
       36
       +
           attrs

     

       37
       37
       +
           csvw

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         checkInputs = [

     

       41
       41
       +
           mock

     

       42
       42
       +
           postgresql

     

       43
       43
       +
           pytestCheckHook

     

       44
       44
       +
           pytest-mock

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         meta = with lib; {

     

       48
       48
       +
           description = "CSV on the Web";

     

       49
       49
       +
           homepage = "https://github.com/cldf/csvw";

     

       50
       50
       +
           license = licenses.asl20;

     

       51
       51
       +
           maintainers = with maintainers; [ hexa ];

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+3 -2

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

···

       4
       4
        
       buildPythonPackage {

     

       5
       5
        
         pname = "cozy";

     

       6
       6
        
         version = "2.0a1";

     

       7
       7
       +
         disabled = !isPy3k;

     

       7
       8
        
       

     

       8
       9
        
         propagatedBuildInputs = [

     

       9
       10
        
           z3 ply python-igraph oset ordered-set dictionaries

     
···

       18
       19
        
       

     

       19
       20
        
         # Yoink the Z3 dependency name, because our Z3 package doesn't provide it.

     

       20
       21
        
         postPatch = ''

     

       21
       21
       -
           sed -i -e '/z3-solver/d' requirements.txt

     

       22
       22
       +
           sed -i -e '/z3-solver/d' -e 's/^dictionaries.*$/dictionaries/' requirements.txt

     

       22
       23
        
         '';

     

       23
       24
        
       

     

       24
       25
        
         # Tests are not correctly set up in the source tree.

     

       25
       26
        
         doCheck = false;

     

       27
       27
       +
         pythonImportsCheck = [ "cozy" ];

     

       26
       28
        
       

     

       27
       29
        
         # There is some first-time-run codegen that we will force to happen.

     

       28
       30
        
         postInstall = ''

     

       29
       31
        
           $out/bin/cozy --help

     

       30
       32
        
         '';

     

       31
       33
        
       

     

       32
       32
       -
         disabled = !isPy3k;

     

       33
       34
        
       

     

       34
       35
        
         meta = {

     

       35
       36
        
           description = "The collection synthesizer";

+51

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , isPy27

     

       5
       5
       +
       , attrs

     

       6
       6
       +
       , isodate

     

       7
       7
       +
       , dateutil

     

       8
       8
       +
       , rfc3986

     

       9
       9
       +
       , uritemplate

     

       10
       10
       +
       , mock

     

       11
       11
       +
       , pytestCheckHook

     

       12
       12
       +
       , pytest-mock

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       buildPythonPackage rec {

     

       16
       16
       +
         pname = "csvw";

     

       17
       17
       +
         version = "1.8.0";

     

       18
       18
       +
         disabled = isPy27;

     

       19
       19
       +
       

     

       20
       20
       +
         src = fetchFromGitHub {

     

       21
       21
       +
           owner = "cldf";

     

       22
       22
       +
           repo = "csvw";

     

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

     

       24
       24
       +
           sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd";

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         patchPhase = ''

     

       28
       28
       +
           substituteInPlace setup.cfg --replace "--cov" ""

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         propagatedBuildInputs = [

     

       32
       32
       +
           attrs

     

       33
       33
       +
           isodate

     

       34
       34
       +
           dateutil

     

       35
       35
       +
           rfc3986

     

       36
       36
       +
           uritemplate

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         checkInputs = [

     

       40
       40
       +
           mock

     

       41
       41
       +
           pytestCheckHook

     

       42
       42
       +
           pytest-mock

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "CSV on the Web";

     

       47
       47
       +
           homepage = "https://github.com/cldf/csvw";

     

       48
       48
       +
           license = licenses.asl20;

     

       49
       49
       +
           maintainers = with maintainers; [ hexa ];

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+4 -1

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

···

       23
       23
        
       , singledispatch

     

       24
       24
        
       , mpi4py

     

       25
       25
        
       , bokeh

     

       26
       26
       +
       , pythonOlder

     

       26
       27
        
       }:

     

       27
       28
        
       

     

       28
       29
        
       buildPythonPackage rec {

     
···

       35
       36
        
           sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c";

     

       36
       37
        
         };

     

       37
       38
        
       

     

       39
       39
       +
         disabled = pythonOlder "3.6";

     

       40
       40
       +
       

     

       38
       41
        
         checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ];

     

       39
       42
        
         propagatedBuildInputs = [

     

       40
       43
        
             click cloudpickle dask msgpack psutil six

     

       41
       44
        
             sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh

     

       42
       42
       -
         ] ++ lib.optionals (!isPy3k) [ futures singledispatch ];

     

       45
       45
       +
         ];

     

       43
       46
        
       

     

       44
       47
        
         # tests take about 10-15 minutes

     

       45
       48
        
         # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses

+2 -2

pkgs/development/python-modules/google-api-python-client/default.nix

···

       4
       4
        
       

     

       5
       5
        
       buildPythonPackage rec {

     

       6
       6
        
         pname = "google-api-python-client";

     

       7
       7
       -
         version = "1.12.1";

     

       7
       7
       +
         version = "1.12.2";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchPypi {

     

       10
       10
        
           inherit pname version;

     

       11
       11
       -
           sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98";

     

       11
       11
       +
           sha256 = "54a7d330833a2e7b0587446d7e4ae6d0244925a9a8e1dfe878f3f7e06cdedb62";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # No tests included in archive

+31

pkgs/development/python-modules/google-crc32c/default.nix

···

       1
       1
       +
       { lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildPythonPackage rec {

     

       4
       4
       +
         pname = "google-crc32c";

     

       5
       5
       +
         version = "1.0.0";

     

       6
       6
       +
       

     

       7
       7
       +
         disabled = !isPy3k;

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "googleapis";

     

       11
       11
       +
           repo = "python-crc32c";

     

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

     

       13
       13
       +
           sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ crc32c  ];

     

       17
       17
       +
         propagatedBuildInputs = [ cffi ];

     

       18
       18
       +
       

     

       19
       19
       +
         LDFLAGS = "-L${crc32c}/lib";

     

       20
       20
       +
         CFLAGS = "-I${crc32c}/include";

     

       21
       21
       +
       

     

       22
       22
       +
         checkInputs = [ pytestCheckHook crc32c ];

     

       23
       23
       +
         pythonImportsCheck = [ "google_crc32c" ];

     

       24
       24
       +
       

     

       25
       25
       +
         meta = with lib; {

     

       26
       26
       +
           homepage = "https://github.com/googleapis/python-crc32c";

     

       27
       27
       +
           description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm";

     

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

     

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

     

       30
       30
       +
         };

     

       31
       31
       +
       }

+10 -5

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

···

       1
       1
       -
       { stdenv

     

       1
       1
       +
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       +
       , isPy3k

     

       3
       4
        
       , fetchPypi

     

       4
       5
        
       , six

     

       5
       6
        
       , requests

     

       6
       7
        
       , setuptools

     

       7
       8
        
       , pytest

     

       8
       9
        
       , mock

     

       10
       10
       +
       , crcmod

     

       11
       11
       +
       , google-crc32c

     

       9
       12
        
       }:

     

       10
       13
        
       

     

       11
       14
        
       buildPythonPackage rec {

     

       12
       15
        
         pname = "google-resumable-media";

     

       13
       13
       -
         version = "0.7.1";

     

       16
       16
       +
         version = "1.0.0";

     

       14
       17
        
       

     

       15
       18
        
         src = fetchPypi {

     

       16
       19
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "57841f5e65fb285c01071f439724745b2549a72eb75e5fd979198eb518608ed0";

     

       20
       20
       +
           sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI=";

     

       18
       21
        
         };

     

       19
       22
        
       

     

       20
       23
        
         checkInputs = [ pytest mock ];

     

       21
       21
       -
         propagatedBuildInputs = [ requests setuptools six ];

     

       24
       24
       +
         propagatedBuildInputs = [ requests setuptools six ]

     

       25
       25
       +
           ++ lib.optional isPy3k google-crc32c

     

       26
       26
       +
           ++ lib.optional (!isPy3k) crcmod;

     

       22
       27
        
       

     

       23
       28
        
         checkPhase = ''

     

       24
       29
        
           py.test tests/unit

     

       25
       30
        
         '';

     

       26
       31
        
       

     

       27
       27
       -
         meta = with stdenv.lib; {

     

       32
       32
       +
         meta = with lib; {

     

       28
       33
        
           description = "Utilities for Google Media Downloads and Resumable Uploads";

     

       29
       34
        
           homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python";

     

       30
       35
        
           license = licenses.asl20;

+16 -7

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

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , lib

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       +
       , pythonOlder

     

       4
       5
        
       , fetchFromGitHub

     

       5
       6
        
       , six

     

       6
       6
       -
       , enum34

     

       7
       7
        
       , decorator

     

       8
       8
        
       , nose

     

       9
       9
        
       , krb5Full

     

       10
       10
        
       , darwin

     

       11
       11
       -
       , isPy27

     

       12
       11
        
       , parameterized

     

       13
       12
        
       , shouldbe

     

       14
       13
        
       , cython

     
···

       18
       17
        
       

     

       19
       18
        
       buildPythonPackage rec {

     

       20
       19
        
         pname = "gssapi";

     

       21
       21
       -
         version = "1.6.2";

     

       20
       20
       +
         version = "1.6.9";

     

       21
       21
       +
         disabled = pythonOlder "3.6";

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "pythongssapi";

     

       25
       25
        
           repo = "python-${pname}";

     

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

     

       27
       27
       -
           sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l";

     

       27
       27
       +
           sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         # It's used to locate headers

     
···

       41
       41
        
         propagatedBuildInputs =  [

     

       42
       42
        
           decorator

     

       43
       43
        
           six

     

       44
       44
       -
         ] ++ lib.optional isPy27 enum34;

     

       44
       44
       +
         ];

     

       45
       45
        
       

     

       46
       46
        
         buildInputs = lib.optionals stdenv.isDarwin [

     

       47
       47
        
           darwin.apple_sdk.frameworks.GSS

     
···

       55
       55
        
           six

     

       56
       56
        
         ];

     

       57
       57
        
       

     

       58
       58
       -
         doCheck = !stdenv.isDarwin; # many failures on darwin

     

       58
       58
       +
         doCheck = pythonOlder "3.8"  # `shouldbe` not available

     

       59
       59
       +
           && !stdenv.isDarwin;  # many failures on darwin

     

       59
       60
        
       

     

       61
       61
       +
         # skip tests which fail possibly due to be an upstream issue (see

     

       62
       62
       +
         # https://github.com/pythongssapi/python-gssapi/issues/220)

     

       60
       63
        
         checkPhase = ''

     

       64
       64
       +
           # some tests don't respond to being disabled through nosetests -x

     

       65
       65
       +
           echo $'\ndel CredsTestCase.test_add_with_impersonate' >> gssapi/tests/test_high_level.py

     

       66
       66
       +
           echo $'\ndel TestBaseUtilities.test_acquire_creds_impersonate_name' >> gssapi/tests/test_raw.py

     

       67
       67
       +
           echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py

     

       68
       68
       +
       

     

       61
       69
        
           export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"

     

       62
       62
       -
           ${python.interpreter} setup.py nosetests

     

       70
       70
       +
           ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*'

     

       63
       71
        
         '';

     

       72
       72
       +
         pythonImportsCheck = [ "gssapi" ];

     

       64
       73
        
       

     

       65
       74
        
         meta = with lib; {

     

       66
       75
        
           homepage = "https://pypi.python.org/pypi/gssapi";

+5 -2

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

···

       28
       28
        
       

     

       29
       29
        
       buildPythonPackage rec {

     

       30
       30
        
         pname = "notebook";

     

       31
       31
       -
         version = "6.1.3";

     

       31
       31
       +
         version = "6.1.4";

     

       32
       32
        
         disabled = !isPy3k;

     

       33
       33
        
       

     

       34
       34
        
         src = fetchPypi {

     

       35
       35
        
           inherit pname version;

     

       36
       36
       -
           sha256 = "9990d51b9931a31e681635899aeb198b4c4b41586a9e87fbfaaed1a71d0a05b6";

     

       36
       36
       +
           sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         LC_ALL = "en_US.utf8";

     
···

       67
       67
        
           "TestInstallServerExtension"

     

       68
       68
        
           "launch_socket"

     

       69
       69
        
           "sock_server"

     

       70
       70
       +
         ] ++ lib.optional stdenv.isDarwin [

     

       71
       71
       +
           "test_delete"

     

       72
       72
       +
           "test_checkpoints_follow_file"

     

       70
       73
        
         ];

     

       71
       74
        
       

     

       72
       75
        
         # Some of the tests use localhost networking.

+2 -2

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

···

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
       -
         version = "3.0.1";

     

       12
       12
       +
         version = "2.3.0";

     

       13
       13
        
         pname = "pamqp";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchPypi {

     

       16
       16
        
           inherit pname version;

     

       17
       17
       -
           sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4";

     

       17
       17
       +
           sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         buildInputs = [ mock nose pep8 pylint mccabe ];

+47 -66

pkgs/development/python-modules/pysdl2/PySDL2-dll.patch

···

       1
       1
       -
       diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py

     

       2
       2
       -
       --- PySDL2-0.9.6-old/sdl2/dll.py	2018-03-08 10:18:37.583471745 +0100

     

       3
       3
       -
       +++ PySDL2-0.9.6/sdl2/dll.py	2018-03-08 10:20:06.705517520 +0100

     

       4
       4
       -
       @@ -45,29 +45,31 @@

     

       1
       1
       +
       diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py

     

       2
       2
       +
       --- PySDL2-0.9.7-old/sdl2/dll.py	2020-02-15 09:36:29.000000000 +0100

     

       3
       3
       +
       +++ PySDL2-0.9.7/sdl2/dll.py	2020-09-23 20:24:09.365497270 +0200

     

       4
       4
       +
       @@ -94,15 +94,16 @@

     

       5
       5
        
            """Function wrapper around the different DLL functions. Do not use or

     

       6
       6
        
            instantiate this one directly from your user code.

     

       7
       7
        
            """

     

       8
       8
        
       -    def __init__(self, libinfo, libnames, path=None):

     

       9
       9
       -
       -        self._dll = None

     

       9
       9
       +
       +    def __init__(self, libinfo, libfile):

     

       10
       10
       +
                self._dll = None

     

       11
       11
       +
                self._libname = libinfo

     

       12
       12
       +
                self._version = None

     

       10
       13
        
       -        foundlibs = _findlib(libnames, path)

     

       11
       14
        
       -        dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       12
       15
        
       -        if len(foundlibs) == 0:

     

       13
       16
        
       -            raise RuntimeError("could not find any library for %s (%s)" %

     

       14
       17
        
       -                               (libinfo, dllmsg))

     

       15
       15
       -
       -        for libfile in foundlibs:

     

       16
       16
       -
       -            try:

     

       17
       17
       -
       -                self._dll = CDLL(libfile)

     

       18
       18
       -
       -                self._libfile = libfile

     

       19
       19
       -
       -                break

     

       20
       20
       -
       -            except Exception as exc:

     

       21
       21
       -
       -                # Could not load the DLL, move to the next, but inform the user

     

       22
       22
       -
       -                # about something weird going on - this may become noisy, but

     

       23
       23
       -
       -                # is better than confusing the users with the RuntimeError below

     

       24
       24
       -
       -                warnings.warn(repr(exc), DLLWarning)

     

       25
       25
       -
       -        if self._dll is None:

     

       26
       26
       -
       -            raise RuntimeError("found %s, but it's not usable for the library %s" %

     

       27
       27
       -
       -                               (foundlibs, libinfo))

     

       18
       18
       +
       +        #foundlibs = _findlib(libnames, path)

     

       19
       19
       +
       +        #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       20
       20
       +
       +        #if len(foundlibs) == 0:

     

       21
       21
       +
       +        #    raise RuntimeError("could not find any library for %s (%s)" %

     

       22
       22
       +
       +        #                       (libinfo, dllmsg))

     

       23
       23
       +
       +        foundlibs = [ libfile ]

     

       24
       24
       +
                for libfile in foundlibs:

     

       25
       25
       +
                    try:

     

       26
       26
       +
                        self._dll = CDLL(libfile)

     

       27
       27
       +
       @@ -117,9 +118,9 @@

     

       28
       28
       +
                if self._dll is None:

     

       29
       29
       +
                    raise RuntimeError("found %s, but it's not usable for the library %s" %

     

       30
       30
       +
                                       (foundlibs, libinfo))

     

       28
       31
        
       -        if path is not None and sys.platform in ("win32",) and \

     

       29
       32
        
       -            path in self._libfile:

     

       30
       33
        
       -            os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       31
       31
       -
       +    def __init__(self, libfile):

     

       32
       32
       -
       +        self._dll = CDLL(libfile)

     

       33
       33
       -
       +        self._libfile = libfile

     

       34
       34
       -
       +        # self._dll = None

     

       35
       35
       -
       +        # foundlibs = _findlib(libnames, path)

     

       36
       36
       -
       +        # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")

     

       37
       37
       -
       +        # if len(foundlibs) == 0:

     

       38
       38
       -
       +        #     raise RuntimeError("could not find any library for %s (%s)" %

     

       39
       39
       -
       +        #                        (libinfo, dllmsg))

     

       40
       40
       -
       +        # for libfile in foundlibs:

     

       41
       41
       -
       +        #     try:

     

       42
       42
       -
       +        #         self._dll = CDLL(libfile)

     

       43
       43
       -
       +        #         self._libfile = libfile

     

       44
       44
       -
       +        #         break

     

       45
       45
       -
       +        #     except Exception as exc:

     

       46
       46
       -
       +        #         # Could not load the DLL, move to the next, but inform the user

     

       47
       47
       -
       +        #         # about something weird going on - this may become noisy, but

     

       48
       48
       -
       +        #         # is better than confusing the users with the RuntimeError below

     

       49
       49
       -
       +        #         warnings.warn(repr(exc), DLLWarning)

     

       50
       50
       -
       +        # if self._dll is None:

     

       51
       51
       -
       +        #     raise RuntimeError("found %s, but it's not usable for the library %s" %

     

       52
       52
       -
       +        #                        (foundlibs, libinfo))

     

       53
       53
       -
       +        # if path is not None and sys.platform in ("win32",) and \

     

       54
       54
       -
       +        #     path in self._libfile:

     

       55
       55
       -
       +        #     os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       34
       34
       +
       +        #if path is not None and sys.platform in ("win32",) and \

     

       35
       35
       +
       +        #    path in self._libfile:

     

       36
       36
       +
       +        #    os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])

     

       56
       37
        
        

     

       57
       57
       -
            def bind_function(self, funcname, args=None, returns=None, optfunc=None):

     

       38
       38
       +
            def bind_function(self, funcname, args=None, returns=None, added=None):

     

       58
       39
        
                """Binds the passed argument and return value types to the specified

     

       59
       59
       -
       @@ -110,7 +112,7 @@

     

       40
       40
       +
       @@ -220,7 +221,7 @@

     

       60
       41
        
            return

     

       61
       42
        
        

     

       62
       43
        
        try:

     

       63
       44
        
       -    dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))

     

       64
       64
       -
       +    dll = DLL("SDL2")

     

       45
       45
       +
       +    dll = DLL("SDL2", "@sdl2@")

     

       65
       46
        
        except RuntimeError as exc:

     

       66
       47
        
            raise ImportError(exc)

     

       67
       48
        
        

     

       68
       68
       -
       diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py

     

       69
       69
       -
       --- PySDL2-0.9.6-old/sdl2/sdlgfx.py	2018-03-08 10:18:37.585471769 +0100

     

       70
       70
       -
       +++ PySDL2-0.9.6/sdl2/sdlgfx.py	2018-03-08 10:20:06.705517520 +0100

     

       71
       71
       -
       @@ -34,8 +34,7 @@

     

       49
       49
       +
       diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py

     

       50
       50
       +
       --- PySDL2-0.9.7-old/sdl2/sdlgfx.py	2020-02-02 11:07:00.000000000 +0100

     

       51
       51
       +
       +++ PySDL2-0.9.7/sdl2/sdlgfx.py	2020-09-23 20:23:56.997419129 +0200

     

       52
       52
       +
       @@ -39,8 +39,7 @@

     

       72
       53
        
                   ]

     

       73
       54
        
        

     

       74
       55
        
        try:

     

       75
       56
        
       -    dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],

     

       76
       57
        
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       77
       77
       -
       +    dll = DLL("SDL2_gfx")

     

       58
       58
       +
       +    dll = DLL("SDL2_gfx", "@sdl2_gfx@")

     

       78
       59
        
        except RuntimeError as exc:

     

       79
       60
        
            raise ImportError(exc)

     

       80
       61
        
        

     

       81
       81
       -
       diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py

     

       82
       82
       -
       --- PySDL2-0.9.6-old/sdl2/sdlimage.py	2018-03-08 10:18:37.585471769 +0100

     

       83
       83
       -
       +++ PySDL2-0.9.6/sdl2/sdlimage.py	2018-03-08 10:20:06.705517520 +0100

     

       84
       84
       -
       @@ -26,8 +26,7 @@

     

       62
       62
       +
       diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py

     

       63
       63
       +
       --- PySDL2-0.9.7-old/sdl2/sdlimage.py	2020-02-02 11:07:00.000000000 +0100

     

       64
       64
       +
       +++ PySDL2-0.9.7/sdl2/sdlimage.py	2020-09-23 20:23:50.085375658 +0200

     

       65
       65
       +
       @@ -27,8 +27,7 @@

     

       85
       66
        
                   ]

     

       86
       67
        
        

     

       87
       68
        
        try:

     

       88
       69
        
       -    dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],

     

       89
       70
        
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       90
       90
       -
       +    dll = DLL("SDL2_image")

     

       71
       71
       +
       +    dll = DLL("SDL2_image", "@sdl2_image@")

     

       91
       72
        
        except RuntimeError as exc:

     

       92
       73
        
            raise ImportError(exc)

     

       93
       74
        
        

     

       94
       94
       -
       diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py

     

       95
       95
       -
       --- PySDL2-0.9.6-old/sdl2/sdlmixer.py	2018-03-08 10:18:37.585471769 +0100

     

       96
       96
       -
       +++ PySDL2-0.9.6/sdl2/sdlmixer.py	2018-03-08 10:20:27.415758478 +0100

     

       97
       97
       -
       @@ -50,8 +50,7 @@

     

       75
       75
       +
       diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py

     

       76
       76
       +
       --- PySDL2-0.9.7-old/sdl2/sdlmixer.py	2020-02-02 11:07:00.000000000 +0100

     

       77
       77
       +
       +++ PySDL2-0.9.7/sdl2/sdlmixer.py	2020-09-23 20:23:46.117350771 +0200

     

       78
       78
       +
       @@ -53,8 +53,7 @@

     

       98
       79
        
                  ]

     

       99
       80
        
        

     

       100
       81
        
        try:

     

       101
       82
        
       -    dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],

     

       102
       83
        
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       103
       103
       -
       +    dll = DLL("SDL2_mixer")

     

       84
       84
       +
       +    dll = DLL("SDL2_mixer", "@sdl2_mixer@")

     

       104
       85
        
        except RuntimeError as exc:

     

       105
       86
        
            raise ImportError(exc)

     

       106
       87
        
        

     

       107
       107
       -
       diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py

     

       108
       108
       -
       --- PySDL2-0.9.6-old/sdl2/sdlttf.py	2018-03-08 10:18:37.585471769 +0100

     

       109
       109
       -
       +++ PySDL2-0.9.6/sdl2/sdlttf.py	2018-03-08 10:20:06.705517520 +0100

     

       110
       110
       -
       @@ -38,8 +38,7 @@

     

       88
       88
       +
       diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py

     

       89
       89
       +
       --- PySDL2-0.9.7-old/sdl2/sdlttf.py	2020-02-02 11:07:00.000000000 +0100

     

       90
       90
       +
       +++ PySDL2-0.9.7/sdl2/sdlttf.py	2020-09-23 20:23:40.069312931 +0200

     

       91
       91
       +
       @@ -39,8 +39,7 @@

     

       111
       92
        
                  ]

     

       112
       93
        
        

     

       113
       94
        
        try:

     

       114
       95
        
       -    dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],

     

       115
       96
        
       -              os.getenv("PYSDL2_DLL_PATH"))

     

       116
       116
       -
       +    dll = DLL("SDL2_ttf")

     

       97
       97
       +
       +    dll = DLL("SDL2_ttf", "@sdl2_ttf@")

     

       117
       98
        
        except RuntimeError as exc:

     

       118
       99
        
            raise ImportError(exc)

     

       119
       100

+13 -14

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

···

       1
       1
       -
       { stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }:

     

       1
       1
       +
       { stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }:

     

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "PySDL2";

     
···

       18
       18
        
         # which library they want to include.

     

       19
       19
        
         buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ];

     

       20
       20
        
         propagatedBuildInputs = [ SDL2 ];

     

       21
       21
       -
         patches = [ ./PySDL2-dll.patch ];

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           substituteInPlace sdl2/dll.py --replace \

     

       24
       24
       -
             "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')"

     

       25
       25
       -
           substituteInPlace sdl2/sdlttf.py --replace \

     

       26
       26
       -
             "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')"

     

       27
       27
       -
           substituteInPlace sdl2/sdlimage.py --replace \

     

       28
       28
       -
             "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')"

     

       29
       29
       -
           substituteInPlace sdl2/sdlgfx.py --replace \

     

       30
       30
       -
            "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')"

     

       31
       31
       -
           substituteInPlace sdl2/sdlmixer.py --replace \

     

       32
       32
       -
            "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')"

     

       33
       33
       -
         '';

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           (substituteAll ({

     

       23
       23
       +
             src = ./PySDL2-dll.patch;

     

       24
       24
       +
           } // builtins.mapAttrs (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}") {

     

       25
       25
       +
             # substituteAll keys must start lowercase

     

       26
       26
       +
             sdl2 = SDL2;

     

       27
       27
       +
             sdl2_ttf = SDL2_ttf;

     

       28
       28
       +
             sdl2_image = SDL2_image;

     

       29
       29
       +
             sdl2_gfx = SDL2_gfx;

     

       30
       30
       +
             sdl2_mixer = SDL2_mixer;

     

       31
       31
       +
           }))

     

       32
       32
       +
         ];

     

       34
       33
        
       

     

       35
       34
        
         meta = {

     

       36
       35
        
           description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project";

+32

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

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , isPy3k

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , zlib

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       buildPythonPackage rec {

     

       9
       9
       +
         pname = "pytabix";

     

       10
       10
       +
         version = "0.1";

     

       11
       11
       +
       

     

       12
       12
       +
         src = fetchPypi {

     

       13
       13
       +
           inherit pname version;

     

       14
       14
       +
           sha256 = "1ldp5r4ggskji6qx4bp2qxy2vrvb3fam03ksn0gq2hdxgrlg2x07";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         buildInputs = [ zlib ];

     

       18
       18
       +
       

     

       19
       19
       +
         doCheck = !isPy3k;

     

       20
       20
       +
         preCheck = ''

     

       21
       21
       +
           substituteInPlace test/test.py \

     

       22
       22
       +
             --replace 'test_remote_file' 'dont_test_remote_file'

     

       23
       23
       +
         '';

     

       24
       24
       +
         pythonImportsCheck = [ "tabix" ];

     

       25
       25
       +
       

     

       26
       26
       +
         meta = with stdenv.lib; {

     

       27
       27
       +
           homepage = "https://github.com/slowkow/pytabix";

     

       28
       28
       +
           description = "Python interface for tabix";

     

       29
       29
       +
           license = licenses.mit;

     

       30
       30
       +
           maintainers = with maintainers; [ ris ];

     

       31
       31
       +
         };

     

       32
       32
       +
       }

+3 -3

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

···

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
       -
         version = "1.0.0";

     

       10
       10
       +
         version = "2.0.1";

     

       11
       11
        
         pname = "rabbitpy";

     

       12
       12
        
       

     

       13
       13
        
         # No tests in the pypi tarball, so we directly fetch from git

     
···

       15
       15
        
           owner = "gmr";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6";

     

       18
       18
       +
           sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ pamqp ];

     
···

       31
       31
        
         postPatch = ''

     

       32
       32
        
           # See: https://github.com/gmr/rabbitpy/issues/118

     

       33
       33
        
           substituteInPlace setup.py \

     

       34
       34
       -
             --replace 'pamqp>=1.6.1,<2.0' 'pamqp'

     

       34
       34
       +
             --replace 'pamqp>=2,<3' 'pamqp'

     

       35
       35
        
         '';

     

       36
       36
        
       

     

       37
       37
        
         meta = with stdenv.lib; {

+1 -1

pkgs/development/python-modules/scikits-odes/default.nix

···

       49
       49
        
           description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy";

     

       50
       50
        
           homepage = "https://github.com/bmcage/odes";

     

       51
       51
        
           license = licenses.bsd3;

     

       52
       52
       -
           maintainers = with maintainers; [ flokli idontgetoutmuch ];

     

       52
       52
       +
           maintainers = with maintainers; [ idontgetoutmuch ];

     

       53
       53
        
           platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];

     

       54
       54
        
         };

     

       55
       55
        
       }

+47

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

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , isPy27

     

       5
       5
       +
       , regex

     

       6
       6
       +
       , csvw

     

       7
       7
       +
       , clldutils

     

       8
       8
       +
       , mock

     

       9
       9
       +
       , pytestCheckHook

     

       10
       10
       +
       , pytest-mock

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       buildPythonPackage rec {

     

       14
       14
       +
         pname = "segments";

     

       15
       15
       +
         version = "2.1.3";

     

       16
       16
       +
         disabled = isPy27;

     

       17
       17
       +
       

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "cldf";

     

       20
       20
       +
           repo = pname;

     

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

     

       22
       22
       +
           sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         patchPhase = ''

     

       26
       26
       +
           substituteInPlace setup.cfg --replace "--cov" ""

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         propagatedBuildInputs = [

     

       30
       30
       +
           regex

     

       31
       31
       +
           csvw

     

       32
       32
       +
           clldutils

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         checkInputs = [

     

       36
       36
       +
           mock

     

       37
       37
       +
           pytestCheckHook

     

       38
       38
       +
           pytest-mock

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Unicode Standard tokenization routines and orthography profile segmentation";

     

       43
       43
       +
           homepage = "https://github.com/cldf/segments";

     

       44
       44
       +
           license = licenses.asl20;

     

       45
       45
       +
           maintainers = with maintainers; [ hexa ];

     

       46
       46
       +
         };

     

       47
       47
       +
       }

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

···

       10
       10
        
       , toolz

     

       11
       11
        
       , tornado

     

       12
       12
        
       , zict

     

       13
       13
       +
       , pythonOlder

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       buildPythonPackage rec {

     
···

       37
       38
        
           pytest

     

       38
       39
        
           requests

     

       39
       40
        
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         disabled = pythonOlder "3.6";

     

       40
       43
        
       

     

       41
       44
        
         # Disable test_tcp_async because fails on sandbox build

     

       42
       45
        
         # disable kafka tests

+10 -4

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

···

       6
       6
        
       , regex

     

       7
       7
        
       , requests

     

       8
       8
        
       , numpy

     

       9
       9
       +
       , parameterized

     

       9
       10
        
       , sacremoses

     

       10
       11
        
       , sentencepiece

     

       11
       12
        
       , timeout-decorator

     
···

       16
       17
        
       

     

       17
       18
        
       buildPythonPackage rec {

     

       18
       19
        
         pname = "transformers";

     

       19
       19
       -
         version = "3.1.0";

     

       20
       20
       +
         version = "3.2.0";

     

       20
       21
        
       

     

       21
       22
        
         src = fetchFromGitHub {

     

       22
       23
        
           owner = "huggingface";

     

       23
       24
        
           repo = pname;

     

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

     

       25
       25
       -
           sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk";

     

       26
       26
       +
           sha256 = "0jj94153kgdyklra30xcszxv11hwzfigzy82fgvgzvbwlxv3a1j5";

     

       26
       27
        
         };

     

       27
       28
        
       

     

       28
       29
        
         propagatedBuildInputs = [

     
···

       38
       39
        
         ];

     

       39
       40
        
       

     

       40
       41
        
         checkInputs = [

     

       42
       42
       +
           parameterized

     

       41
       43
        
           pytestCheckHook

     

       42
       44
        
           timeout-decorator

     

       43
       45
        
         ];

     
···

       49
       51
        
       

     

       50
       52
        
         preCheck = ''

     

       51
       53
        
           export HOME="$TMPDIR"

     

       52
       52
       -
           cd tests

     

       53
       54
        
       

     

       54
       55
        
           # This test requires the nlp module, which we haven't

     

       55
       56
        
           # packaged yet. However, nlp is optional for transformers

     

       56
       57
        
           # itself

     

       57
       57
       -
           rm test_trainer.py

     

       58
       58
       +
           rm tests/test_trainer.py

     

       58
       59
        
         '';

     

       60
       60
       +
       

     

       61
       61
       +
         # We have to run from the main directory for the tests. However,

     

       62
       62
       +
         # letting pytest discover tests leads to errors.

     

       63
       63
       +
         pytestFlagsArray = [ "tests" ];

     

       59
       64
        
       

     

       60
       65
        
         # Disable tests that require network access.

     

       61
       66
        
         disabledTests = [

     
···

       76
       81
        
           "test_tokenizer_from_model_type"

     

       77
       82
        
           "test_tokenizer_from_model_type"

     

       78
       83
        
           "test_tokenizer_from_pretrained"

     

       84
       84
       +
           "test_tokenizer_from_tokenizer_class"

     

       79
       85
        
           "test_tokenizer_identifier_with_correct_config"

     

       80
       86
        
         ];

     

       81
       87

+3 -1

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

···

       1
       1
        
       { stdenv, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest, heapdict }:

     

       2
       2
       +
       , pytest, heapdict, pythonOlder }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
        
         pname = "zict";

     
···

       9
       9
        
           inherit pname version;

     

       10
       10
        
           sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16";

     

       11
       11
        
         };

     

       12
       12
       +
       

     

       13
       13
       +
         disabled = pythonOlder "3.6";

     

       12
       14
        
       

     

       13
       15
        
         buildInputs = [ pytest ];

     

       14
       16
        
         propagatedBuildInputs = [ heapdict ];

+3 -3

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

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "tflint";

     

       5
       5
       -
         version = "0.20.1";

     

       5
       5
       +
         version = "0.20.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "terraform-linters";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "06y4p65zzd7nmpvpnfcig58wbrav9ifbpqw1lhs2vdav17035xif";

     

       11
       11
       +
           sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "0c1b06np4yhixndig11kxxvj24rk50l1sdqah8kzhi2cqjwvmpw0";

     

       14
       14
       +
         vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+1 -1

pkgs/development/tools/build-managers/rocm-cmake/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "rocm-cmake";

     

       5
       5
       -
         version = "3.7.0";

     

       5
       5
       +
         version = "3.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RadeonOpenCompute";

+2 -2

pkgs/development/tools/buildah/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildGoModule rec {

     

       16
       16
        
         pname = "buildah";

     

       17
       17
       -
         version = "1.16.1";

     

       17
       17
       +
         version = "1.16.2";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "containers";

     

       21
       21
        
           repo = "buildah";

     

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

     

       23
       23
       -
           sha256 = "0nndm936g0i18ly6395y5s4h1f6cfbg602cvlg7c6w007f2j15hq";

     

       23
       23
       +
           sha256 = "0zvf060nsd8cvyclkaasqlc9bw699vh2004qrvcy8hf50b2z1bi2";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         outputs = [ "out" "man" ];

+2 -2

pkgs/development/tools/flyway/default.nix

···

       1
       1
        
       { stdenv, fetchurl, jre_headless, makeWrapper }:

     

       2
       2
        
         let

     

       3
       3
       -
           version = "6.5.4";

     

       3
       3
       +
           version = "6.5.5";

     

       4
       4
        
         in

     

       5
       5
        
           stdenv.mkDerivation {

     

       6
       6
        
             pname = "flyway";

     

       7
       7
        
             inherit version;

     

       8
       8
        
             src = fetchurl {

     

       9
       9
        
               url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";

     

       10
       10
       -
               sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii";

     

       10
       10
       +
               sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn";

     

       11
       11
        
             };

     

       12
       12
        
             nativeBuildInputs = [ makeWrapper ];

     

       13
       13
        
             dontBuild = true;

+8 -5

pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix

···

       1
       1
       -
       { mkDerivation, base, containers, fetchgit, optparse-applicative

     

       2
       2
       -
       , parsec, stdenv, text

     

       1
       1
       +
       { mkDerivation, base, containers, fetchgit, hedgehog

     

       2
       2
       +
       , optparse-applicative, parsec, stdenv, template-haskell, text

     

       3
       3
        
       }:

     

       4
       4
        
       mkDerivation {

     

       5
       5
        
         pname = "dconf2nix";

     

       6
       6
       -
         version = "0.0.5";

     

       6
       6
       +
         version = "0.0.6";

     

       7
       7
        
         src = fetchgit {

     

       8
       8
        
           url = "https://github.com/gvolpe/dconf2nix.git";

     

       9
       9
       -
           sha256 = "0immbx4bgfq3xmbbrpw441nx0sdpm4cp64s7qbvcbvllp4gbivpg";

     

       10
       10
       -
           rev = "848ff9966db21c66e61a19c04ab6dfc9270eb78e";

     

       9
       9
       +
           sha256 = "0ql3xrr05kg1xrfxq86mhzh5ky33sngx57sahzck3rb8fv2g6amv";

     

       10
       10
       +
           rev = "cf976e033c1a89f897924baa219c3b227fe68489";

     

       11
       11
        
           fetchSubmodules = true;

     

       12
       12
        
         };

     

       13
       13
        
         isLibrary = true;

     
···

       16
       16
        
           base containers optparse-applicative parsec text

     

       17
       17
        
         ];

     

       18
       18
        
         executableHaskellDepends = [ base ];

     

       19
       19
       +
         testHaskellDepends = [

     

       20
       20
       +
           base containers hedgehog parsec template-haskell text

     

       21
       21
       +
         ];

     

       19
       22
        
         description = "Convert dconf files to Nix, as expected by Home Manager";

     

       20
       23
        
         license = stdenv.lib.licenses.asl20;

     

       21
       24
        
       }

+2 -2

pkgs/development/tools/metals/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "metals";

     

       5
       5
       -
         version = "0.9.3";

     

       5
       5
       +
         version = "0.9.4";

     

       6
       6
        
       

     

       7
       7
        
         deps = stdenv.mkDerivation {

     

       8
       8
        
           name = "${pname}-deps-${version}";

     
···

       16
       16
        
           '';

     

       17
       17
        
           outputHashMode = "recursive";

     

       18
       18
        
           outputHashAlgo = "sha256";

     

       19
       19
       -
           outputHash     = "0mr0pxicka4qd0cn002g5r80dyg59164czyb0r7012l0q1xighz2";

     

       19
       19
       +
           outputHash     = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

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

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "global";

     

       7
       7
       -
         version = "6.6.4";

     

       7
       7
       +
         version = "6.6.5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

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

     

       11
       11
       -
           sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq";

     

       11
       11
       +
           sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ libtool makeWrapper ];

+22

pkgs/development/tools/rust/cargo-sync-readme/default.nix

···

       1
       1
       +
       { stdenv, rustPlatform, fetchFromGitHub }:

     

       2
       2
       +
       

     

       3
       3
       +
       rustPlatform.buildRustPackage rec {

     

       4
       4
       +
         pname = "cargo-sync-readme";

     

       5
       5
       +
         version = "1.0";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "phaazon";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83";

     

       15
       15
       +
       

     

       16
       16
       +
         meta = with stdenv.lib; {

     

       17
       17
       +
           description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

     

       18
       18
       +
           homepage = "https://github.com/phaazon/cargo-sync-readme";

     

       19
       19
       +
           license = licenses.bsd3;

     

       20
       20
       +
           maintainers = with maintainers; [ b4dm4n ];

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+87

pkgs/games/koboredux/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , fetchpatch

     

       4
       4
       +
       , requireFile

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , SDL2

     

       8
       8
       +
       , SDL2_image

     

       9
       9
       +
       , audiality2

     

       10
       10
       +
       , useProprietaryAssets ? true

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       with stdenv.lib;

     

       14
       14
       +
       stdenv.mkDerivation rec {

     

       15
       15
       +
         pname = "koboredux";

     

       16
       16
       +
         version = "0.7.5.1";

     

       17
       17
       +
       

     

       18
       18
       +
         src =

     

       19
       19
       +
           [(fetchFromGitHub {

     

       20
       20
       +
             owner = "olofson";

     

       21
       21
       +
             repo = "koboredux";

     

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

     

       23
       23
       +
             sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";

     

       24
       24
       +
           })]

     

       25
       25
       +
           ++

     

       26
       26
       +
           (optional useProprietaryAssets (requireFile {

     

       27
       27
       +
             name = "koboredux-${version}-Linux.tar.bz2";

     

       28
       28
       +
             sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav";

     

       29
       29
       +
             message = ''

     

       30
       30
       +
               Please purchase the game on https://olofson.itch.io/kobo-redux

     

       31
       31
       +
               and download the Linux build.

     

       32
       32
       +
       

     

       33
       33
       +
               Once you have downloaded the file, please use the following command

     

       34
       34
       +
               and re-run the installation:

     

       35
       35
       +
       

     

       36
       36
       +
               nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2

     

       37
       37
       +
       

     

       38
       38
       +
               Alternatively, install the "koboredux-free" package, which replaces the

     

       39
       39
       +
               proprietary assets with a placeholder theme.

     

       40
       40
       +
             '';

     

       41
       41
       +
           }));

     

       42
       42
       +
       

     

       43
       43
       +
         sourceRoot = "source"; # needed when we have the assets source

     

       44
       44
       +
       

     

       45
       45
       +
         # Fix clang build

     

       46
       46
       +
         patches = [(fetchpatch {

     

       47
       47
       +
           url = "https://github.com/olofson/koboredux/commit/cf92b8a61d002ccaa9fbcda7a96dab08a681dee4.patch";

     

       48
       48
       +
           sha256 = "0dwhvis7ghf3mgzjd2rwn8hk3ndlgfwwcqaq581yc5rwd73v6vw4";

     

       49
       49
       +
         })];

     

       50
       50
       +
       

     

       51
       51
       +
         postPatch = optionalString useProprietaryAssets ''

     

       52
       52
       +
           cp -r ../koboredux-${version}-Linux/sfx/redux data/sfx/

     

       53
       53
       +
           cp -r ../koboredux-${version}-Linux/gfx/redux data/gfx/

     

       54
       54
       +
           cp -r ../koboredux-${version}-Linux/gfx/redux_fullscreen data/gfx/

     

       55
       55
       +
         '';

     

       56
       56
       +
       

     

       57
       57
       +
         nativeBuildInputs = [

     

       58
       58
       +
           cmake

     

       59
       59
       +
           pkg-config

     

       60
       60
       +
         ];

     

       61
       61
       +
       

     

       62
       62
       +
         buildInputs = [

     

       63
       63
       +
           SDL2

     

       64
       64
       +
           SDL2_image

     

       65
       65
       +
           audiality2

     

       66
       66
       +
         ];

     

       67
       67
       +
       

     

       68
       68
       +
         meta = {

     

       69
       69
       +
           description = "A frantic 80's style 2D shooter, similar to XKobo and Kobo Deluxe" +

     

       70
       70
       +
             optionalString (!useProprietaryAssets) " (built without proprietary assets)";

     

       71
       71
       +
           longDescription = ''

     

       72
       72
       +
             Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and

     

       73
       73
       +
             feel of 90's arcade cabinets. The gameplay is fast and unforgiving,

     

       74
       74
       +
             although with less of the frustrating quirkiness of the actual games

     

       75
       75
       +
             of the 80's. A true challenge in the spirit of the arcade era!

     

       76
       76
       +
           '' + optionalString (!useProprietaryAssets) ''

     

       77
       77
       +
       

     

       78
       78
       +
             This version replaces the official proprietary assets with placeholders.

     

       79
       79
       +
             For the full experience, consider installing "koboredux" instead.

     

       80
       80
       +
           '';

     

       81
       81
       +
           homepage = "https://olofson.itch.io/kobo-redux";

     

       82
       82
       +
           license = with licenses; if useProprietaryAssets then unfree else gpl2;

     

       83
       83
       +
           platforms = platforms.all;

     

       84
       84
       +
           maintainers = with maintainers; [ fgaz ];

     

       85
       85
       +
         };

     

       86
       86
       +
       }

     

       87
       87
       +

+2 -3

pkgs/games/minecraft/default.nix

···

       59
       59
        
           freetype

     

       60
       60
        
           gdk-pixbuf

     

       61
       61
        
           glib

     

       62
       62
       -
           gnome2.GConf

     

       63
       62
        
           gnome2.pango

     

       64
       63
        
           gtk3-x11

     

       65
       64
        
           gtk2-x11

     
···

       87
       86
        
       stdenv.mkDerivation rec {

     

       88
       87
        
         pname = "minecraft-launcher";

     

       89
       88
        
       

     

       90
       90
       -
         version = "2.1.16102";

     

       89
       89
       +
         version = "2.1.17627";

     

       91
       90
        
       

     

       92
       91
        
         src = fetchurl {

     

       93
       92
        
           url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";

     

       94
       94
       -
           sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i";

     

       93
       93
       +
           sha256 = "04zjjyy0psfxfibzbac9w0kkgqwfpf1qmbj5gspyvhaib7k8may0";

     

       95
       94
        
         };

     

       96
       95
        
       

     

       97
       96
        
         icon = fetchurl {

+1 -1

pkgs/games/osu-lazer/default.nix

···

       49
       49
        
           mkdir -p $HOME/.nuget/NuGet

     

       50
       50
        
           cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet

     

       51
       51
        
       

     

       52
       52
       -
           dotnet restore --source nixos osu.Desktop

     

       52
       52
       +
           dotnet restore --source "$PWD/nixos" osu.Desktop

     

       53
       53
        
       

     

       54
       54
        
           runHook postConfigure

     

       55
       55
        
         '';

+15 -4

pkgs/games/stockfish/default.nix

···

       4
       4
        
                  if stdenv.isi686 then "x86-32" else

     

       5
       5
        
                  "unknown";

     

       6
       6
        
       

     

       7
       7
       -
           version = "11";

     

       7
       7
       +
           version = "12";

     

       8
       8
       +
       

     

       9
       9
       +
           nnueFile = "nn-82215d0fd0df.nnue";

     

       10
       10
       +
           nnue = fetchurl {

     

       11
       11
       +
             name = nnueFile;

     

       12
       12
       +
               url = "https://tests.stockfishchess.org/api/nn/${nnueFile}";

     

       13
       13
       +
             sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2";

     

       14
       14
       +
           };

     

       8
       15
        
       in

     

       9
       16
        
       

     

       10
       17
        
       stdenv.mkDerivation {

     

       11
       11
       -
       

     

       12
       18
        
         pname = "stockfish";

     

       13
       19
        
         inherit version;

     

       14
       20
        
       

     

       15
       21
        
         src = fetchurl {

     

       16
       22
        
           url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";

     

       17
       17
       -
           sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0";

     

       23
       23
       +
           sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i";

     

       18
       24
        
         };

     

       19
       25
        
       

     

       20
       20
       -
         postUnpack = "sourceRoot+=/src";

     

       26
       26
       +
         postUnpack = ''

     

       27
       27
       +
           sourceRoot+=/src

     

       28
       28
       +
           echo ${nnue}

     

       29
       29
       +
           cp "${nnue}" "$sourceRoot/${nnueFile}"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       21
       32
        
         makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ];

     

       22
       33
        
         buildFlags = [ "build" ];

     

       23
       34

+10 -2

pkgs/misc/emulators/mame/default.nix

···

       1
       1
       -
       { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper

     

       1
       1
       +
       { stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper

     

       2
       2
        
       , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama

     

       3
       3
        
       , libpcap, CoreAudioKit, ForceFeedback

     

       4
       4
        
       , installShellFiles }:

     
···

       51
       51
        
         # by default MAME assumes that paths with stock resources

     

       52
       52
        
         # are relative and that you run MAME changing to

     

       53
       53
        
         # install directory, so we add absolute paths here

     

       54
       54
       -
         patches = [ ./emuopts.patch ];

     

       54
       54
       +
         patches = [

     

       55
       55
       +
           ./emuopts.patch

     

       56
       56
       +
           # Make the parallel build reliable -- see https://github.com/mamedev/mame/pull/7279

     

       57
       57
       +
           (fetchpatch {

     

       58
       58
       +
             name = "fix-mame-parallel-build.patch";

     

       59
       59
       +
             url = "https://github.com/mamedev/mame/commit/13a54fd4e8b8b1a4aad77671562b2d9ef3d82e1f.patch";

     

       60
       60
       +
             sha256 = "1p4bszir9hcdjx6am58p48zh17rhjzlhx2baiacas7fnig61i02n";

     

       61
       61
       +
           })

     

       62
       62
       +
         ];

     

       55
       63
        
       

     

       56
       64
        
         postPatch = ''

     

       57
       65
        
           substituteInPlace src/emu/emuopts.cpp \

+4 -4

pkgs/misc/emulators/ryujinx/default.nix

···

       13
       13
        
         ];

     

       14
       14
        
       in stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "ryujinx";

     

       16
       16
       -
         version = "1.0.5160";

     

       16
       16
       +
         version = "1.0.5346";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "Ryujinx";

     

       20
       20
        
           repo = "Ryujinx";

     

       21
       21
       -
           rev = "58f65b6523fb25d989b011c51f963520c811f9f0";

     

       22
       22
       -
           sha256 = "19fizqmcr8i3axi3j5hg8p6dxr1pxnl5l58z4pws6nj1xbq8z5mi";

     

       21
       21
       +
           rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c";

     

       22
       22
       +
           sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ];

     
···

       48
       48
        
           mkdir -p $HOME/.nuget/NuGet

     

       49
       49
        
           cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet

     

       50
       50
        
       

     

       51
       51
       -
           dotnet restore --source nixos Ryujinx.sln

     

       51
       51
       +
           dotnet restore --source "$PWD/nixos" Ryujinx.sln

     

       52
       52
        
       

     

       53
       53
        
           runHook postConfigure

     

       54
       54
        
         '';

+38 -293

pkgs/misc/emulators/ryujinx/deps.nix

···

       56
       56
        
         })

     

       57
       57
        
         (fetchNuGet {

     

       58
       58
        
           name = "LibHac";

     

       59
       59
       -
           version = "0.11.3";

     

       60
       60
       -
           sha256 = "0xj2ip3bjy29xwy4fn5fncjadwbbg59sa3580cmkj47aab9cddyn";

     

       59
       59
       +
           version = "0.12.0";

     

       60
       60
       +
           sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld";

     

       61
       61
        
         })

     

       62
       62
        
         (fetchNuGet {

     

       63
       63
        
           name = "Microsoft.AspNetCore.App.Runtime.linux-x64";

     

       64
       64
       -
           version = "3.1.2";

     

       65
       65
       -
           sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9";

     

       64
       64
       +
           version = "3.1.8";

     

       65
       65
       +
           sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135";

     

       66
       66
        
         })

     

       67
       67
        
         (fetchNuGet {

     

       68
       68
        
           name = "Microsoft.AspNetCore.App.Runtime.osx-x64";

     

       69
       69
       -
           version = "3.1.2";

     

       70
       70
       -
           sha256 = "1v7i4f1k3j8xavbfwb7qr5f680gg5nblrmx5zcsj7l07q4wbnmwl";

     

       69
       69
       +
           version = "3.1.8";

     

       70
       70
       +
           sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4";

     

       71
       71
        
         })

     

       72
       72
        
         (fetchNuGet {

     

       73
       73
        
           name = "Microsoft.AspNetCore.App.Runtime.win-x64";

     

       74
       74
       -
           version = "3.1.2";

     

       75
       75
       -
           sha256 = "1gciv56vzfpl86lb9gzvyfj8w2qd7jhdrbxph6l1aykwzqbxf7bd";

     

       76
       76
       -
         })

     

       77
       77
       -
         (fetchNuGet {

     

       78
       78
       -
           name = "Microsoft.CodeCoverage";

     

       79
       79
       -
           version = "16.2.0";

     

       80
       80
       -
           sha256 = "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki";

     

       74
       74
       +
           version = "3.1.8";

     

       75
       75
       +
           sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f";

     

       81
       76
        
         })

     

       82
       77
        
         (fetchNuGet {

     

       83
       78
        
           name = "Microsoft.CodeCoverage";

     

       84
       84
       -
           version = "16.5.0";

     

       85
       85
       -
           sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf";

     

       79
       79
       +
           version = "16.7.0";

     

       80
       80
       +
           sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1";

     

       86
       81
        
         })

     

       87
       82
        
         (fetchNuGet {

     

       88
       83
        
           name = "Microsoft.CSharp";

     
···

       96
       91
        
         })

     

       97
       92
        
         (fetchNuGet {

     

       98
       93
        
           name = "Microsoft.NETCore.App.Host.osx-x64";

     

       99
       99
       -
           version = "3.1.2";

     

       100
       100
       -
           sha256 = "0sy1h7ffq8s3bkvf1carf4rn9qf7hn0yv6dcjklgh3g9jhlsq34f";

     

       94
       94
       +
           version = "3.1.8";

     

       95
       95
       +
           sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb";

     

       101
       96
        
         })

     

       102
       97
        
         (fetchNuGet {

     

       103
       98
        
           name = "Microsoft.NETCore.App.Host.win-x64";

     

       104
       104
       -
           version = "3.1.2";

     

       105
       105
       -
           sha256 = "1yqsnl4my2q1ps666162kn0h34wyfajiwqs6snhrww195b59msdv";

     

       99
       99
       +
           version = "3.1.8";

     

       100
       100
       +
           sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb";

     

       106
       101
        
         })

     

       107
       102
        
         (fetchNuGet {

     

       108
       103
        
           name = "Microsoft.NETCore.App.Runtime.linux-x64";

     

       109
       109
       -
           version = "3.1.2";

     

       110
       110
       -
           sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66";

     

       104
       104
       +
           version = "3.1.8";

     

       105
       105
       +
           sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa";

     

       111
       106
        
         })

     

       112
       107
        
         (fetchNuGet {

     

       113
       108
        
           name = "Microsoft.NETCore.App.Runtime.osx-x64";

     

       114
       114
       -
           version = "3.1.2";

     

       115
       115
       -
           sha256 = "1wb8h30di1mix8liz937snl1w8hbblixrpiazjskxclp3i7m1rg3";

     

       109
       109
       +
           version = "3.1.8";

     

       110
       110
       +
           sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w";

     

       116
       111
        
         })

     

       117
       112
        
         (fetchNuGet {

     

       118
       113
        
           name = "Microsoft.NETCore.App.Runtime.win-x64";

     

       119
       119
       -
           version = "3.1.2";

     

       120
       120
       -
           sha256 = "0aj005mh57ynscf87cpfshc3ff22l4svf6lqz0hpqsi0hlidqwqx";

     

       114
       114
       +
           version = "3.1.8";

     

       115
       115
       +
           sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz";

     

       121
       116
        
         })

     

       122
       117
        
         (fetchNuGet {

     

       123
       118
        
           name = "Microsoft.NETCore.Platforms";

     
···

       151
       146
        
         })

     

       152
       147
        
         (fetchNuGet {

     

       153
       148
        
           name = "Microsoft.NET.Test.Sdk";

     

       154
       154
       -
           version = "16.2.0";

     

       155
       155
       -
           sha256 = "1nr5jxchdy3p7jm4fm73d5yivghjisdsyafma8fs5d1v49bhgckq";

     

       156
       156
       -
         })

     

       157
       157
       -
         (fetchNuGet {

     

       158
       158
       -
           name = "Microsoft.NET.Test.Sdk";

     

       159
       159
       -
           version = "16.5.0";

     

       160
       160
       -
           sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq";

     

       161
       161
       -
         })

     

       162
       162
       -
         (fetchNuGet {

     

       163
       163
       -
           name = "Microsoft.TestPlatform.ObjectModel";

     

       164
       164
       -
           version = "16.2.0";

     

       165
       165
       -
           sha256 = "1ywzyx75d61wm75l7wglxzglg5k9nq66wd56m52hmmg8mf253z57";

     

       149
       149
       +
           version = "16.7.0";

     

       150
       150
       +
           sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy";

     

       166
       151
        
         })

     

       167
       152
        
         (fetchNuGet {

     

       168
       153
        
           name = "Microsoft.TestPlatform.ObjectModel";

     

       169
       169
       -
           version = "16.5.0";

     

       170
       170
       -
           sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw";

     

       154
       154
       +
           version = "16.7.0";

     

       155
       155
       +
           sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz";

     

       171
       156
        
         })

     

       172
       157
        
         (fetchNuGet {

     

       173
       158
        
           name = "Microsoft.TestPlatform.TestHost";

     

       174
       174
       -
           version = "16.2.0";

     

       175
       175
       -
           sha256 = "05dx9nv1skc5ji79ji5vz6c93b09w9xh70iyy6j5ca978ga92i6g";

     

       176
       176
       -
         })

     

       177
       177
       -
         (fetchNuGet {

     

       178
       178
       -
           name = "Microsoft.TestPlatform.TestHost";

     

       179
       179
       -
           version = "16.5.0";

     

       180
       180
       -
           sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v";

     

       159
       159
       +
           version = "16.7.0";

     

       160
       160
       +
           sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs";

     

       181
       161
        
         })

     

       182
       162
        
         (fetchNuGet {

     

       183
       163
        
           name = "Microsoft.Win32.Primitives";

     
···

       188
       168
        
           name = "Microsoft.Win32.Primitives";

     

       189
       169
        
           version = "4.3.0";

     

       190
       170
        
           sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq";

     

       191
       191
       -
         })

     

       192
       192
       -
         (fetchNuGet {

     

       193
       193
       -
           name = "Microsoft.Win32.Registry";

     

       194
       194
       -
           version = "4.0.0";

     

       195
       195
       -
           sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k";

     

       196
       171
        
         })

     

       197
       172
        
         (fetchNuGet {

     

       198
       173
        
           name = "Microsoft.Win32.Registry";

     
···

       256
       231
        
         })

     

       257
       232
        
         (fetchNuGet {

     

       258
       233
        
           name = "NUnit3TestAdapter";

     

       259
       259
       -
           version = "3.15.1";

     

       260
       260
       -
           sha256 = "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y";

     

       261
       261
       -
         })

     

       262
       262
       -
         (fetchNuGet {

     

       263
       263
       -
           name = "NUnit3TestAdapter";

     

       264
       264
       -
           version = "3.16.1";

     

       265
       265
       -
           sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9";

     

       234
       234
       +
           version = "3.17.0";

     

       235
       235
       +
           sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6";

     

       266
       236
        
         })

     

       267
       237
        
         (fetchNuGet {

     

       268
       238
        
           name = "OpenTK.NetStandard";

     
···

       276
       246
        
         })

     

       277
       247
        
         (fetchNuGet {

     

       278
       248
        
           name = "runtime.any.System.Collections";

     

       279
       279
       -
           version = "4.0.11";

     

       280
       280
       -
           sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0";

     

       281
       281
       -
         })

     

       282
       282
       -
         (fetchNuGet {

     

       283
       283
       -
           name = "runtime.any.System.Collections";

     

       284
       249
        
           version = "4.3.0";

     

       285
       250
        
           sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0";

     

       286
       251
        
         })

     

       287
       252
        
         (fetchNuGet {

     

       288
       253
        
           name = "runtime.any.System.Diagnostics.Tools";

     

       289
       289
       -
           version = "4.0.1";

     

       290
       290
       -
           sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7";

     

       291
       291
       -
         })

     

       292
       292
       -
         (fetchNuGet {

     

       293
       293
       -
           name = "runtime.any.System.Diagnostics.Tools";

     

       294
       254
        
           version = "4.3.0";

     

       295
       255
        
           sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk";

     

       296
       256
        
         })

     
···

       301
       261
        
         })

     

       302
       262
        
         (fetchNuGet {

     

       303
       263
        
           name = "runtime.any.System.Globalization";

     

       304
       304
       -
           version = "4.0.11";

     

       305
       305
       -
           sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286";

     

       306
       306
       -
         })

     

       307
       307
       -
         (fetchNuGet {

     

       308
       308
       -
           name = "runtime.any.System.Globalization";

     

       309
       264
        
           version = "4.3.0";

     

       310
       265
        
           sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x";

     

       311
       266
        
         })

     
···

       316
       271
        
         })

     

       317
       272
        
         (fetchNuGet {

     

       318
       273
        
           name = "runtime.any.System.IO";

     

       319
       319
       -
           version = "4.1.0";

     

       320
       320
       -
           sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5";

     

       321
       321
       -
         })

     

       322
       322
       -
         (fetchNuGet {

     

       323
       323
       -
           name = "runtime.any.System.IO";

     

       324
       274
        
           version = "4.3.0";

     

       325
       275
        
           sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x";

     

       326
       276
        
         })

     

       327
       277
        
         (fetchNuGet {

     

       328
       278
        
           name = "runtime.any.System.Reflection";

     

       329
       329
       -
           version = "4.1.0";

     

       330
       330
       -
           sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6";

     

       331
       331
       -
         })

     

       332
       332
       -
         (fetchNuGet {

     

       333
       333
       -
           name = "runtime.any.System.Reflection";

     

       334
       279
        
           version = "4.3.0";

     

       335
       280
        
           sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly";

     

       336
       281
        
         })

     

       337
       282
        
         (fetchNuGet {

     

       338
       283
        
           name = "runtime.any.System.Reflection.Extensions";

     

       339
       339
       -
           version = "4.0.1";

     

       340
       340
       -
           sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr";

     

       341
       341
       -
         })

     

       342
       342
       -
         (fetchNuGet {

     

       343
       343
       -
           name = "runtime.any.System.Reflection.Extensions";

     

       344
       284
        
           version = "4.3.0";

     

       345
       285
        
           sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33";

     

       346
       286
        
         })

     

       347
       287
        
         (fetchNuGet {

     

       348
       288
        
           name = "runtime.any.System.Reflection.Primitives";

     

       349
       349
       -
           version = "4.0.1";

     

       350
       350
       -
           sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz";

     

       351
       351
       -
         })

     

       352
       352
       -
         (fetchNuGet {

     

       353
       353
       -
           name = "runtime.any.System.Reflection.Primitives";

     

       354
       289
        
           version = "4.3.0";

     

       355
       290
        
           sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf";

     

       356
       291
        
         })

     

       357
       292
        
         (fetchNuGet {

     

       358
       293
        
           name = "runtime.any.System.Resources.ResourceManager";

     

       359
       359
       -
           version = "4.0.1";

     

       360
       360
       -
           sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr";

     

       361
       361
       -
         })

     

       362
       362
       -
         (fetchNuGet {

     

       363
       363
       -
           name = "runtime.any.System.Resources.ResourceManager";

     

       364
       294
        
           version = "4.3.0";

     

       365
       295
        
           sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl";

     

       366
       296
        
         })

     

       367
       297
        
         (fetchNuGet {

     

       368
       298
        
           name = "runtime.any.System.Runtime";

     

       369
       369
       -
           version = "4.1.0";

     

       370
       370
       -
           sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m";

     

       371
       371
       -
         })

     

       372
       372
       -
         (fetchNuGet {

     

       373
       373
       -
           name = "runtime.any.System.Runtime";

     

       374
       299
        
           version = "4.3.0";

     

       375
       300
        
           sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b";

     

       376
       301
        
         })

     

       377
       302
        
         (fetchNuGet {

     

       378
       303
        
           name = "runtime.any.System.Runtime.Handles";

     

       379
       379
       -
           version = "4.0.1";

     

       380
       380
       -
           sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas";

     

       381
       381
       -
         })

     

       382
       382
       -
         (fetchNuGet {

     

       383
       383
       -
           name = "runtime.any.System.Runtime.Handles";

     

       384
       304
        
           version = "4.3.0";

     

       385
       305
        
           sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x";

     

       386
       386
       -
         })

     

       387
       387
       -
         (fetchNuGet {

     

       388
       388
       -
           name = "runtime.any.System.Runtime.InteropServices";

     

       389
       389
       -
           version = "4.1.0";

     

       390
       390
       -
           sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z";

     

       391
       306
        
         })

     

       392
       307
        
         (fetchNuGet {

     

       393
       308
        
           name = "runtime.any.System.Runtime.InteropServices";

     
···

       396
       311
        
         })

     

       397
       312
        
         (fetchNuGet {

     

       398
       313
        
           name = "runtime.any.System.Text.Encoding";

     

       399
       399
       -
           version = "4.0.11";

     

       400
       400
       -
           sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7";

     

       401
       401
       -
         })

     

       402
       402
       -
         (fetchNuGet {

     

       403
       403
       -
           name = "runtime.any.System.Text.Encoding";

     

       404
       314
        
           version = "4.3.0";

     

       405
       315
        
           sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3";

     

       406
       316
        
         })

     

       407
       317
        
         (fetchNuGet {

     

       408
       318
        
           name = "runtime.any.System.Text.Encoding.Extensions";

     

       409
       409
       -
           version = "4.0.11";

     

       410
       410
       -
           sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877";

     

       411
       411
       -
         })

     

       412
       412
       -
         (fetchNuGet {

     

       413
       413
       -
           name = "runtime.any.System.Text.Encoding.Extensions";

     

       414
       319
        
           version = "4.3.0";

     

       415
       320
        
           sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8";

     

       416
       416
       -
         })

     

       417
       417
       -
         (fetchNuGet {

     

       418
       418
       -
           name = "runtime.any.System.Threading.Tasks";

     

       419
       419
       -
           version = "4.0.11";

     

       420
       420
       -
           sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk";

     

       421
       321
        
         })

     

       422
       322
        
         (fetchNuGet {

     

       423
       323
        
           name = "runtime.any.System.Threading.Tasks";

     
···

       521
       421
        
         })

     

       522
       422
        
         (fetchNuGet {

     

       523
       423
        
           name = "runtime.unix.System.Diagnostics.Debug";

     

       524
       524
       -
           version = "4.0.11";

     

       525
       525
       -
           sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d";

     

       526
       526
       -
         })

     

       527
       527
       -
         (fetchNuGet {

     

       528
       528
       -
           name = "runtime.unix.System.Diagnostics.Debug";

     

       529
       424
        
           version = "4.3.0";

     

       530
       425
        
           sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5";

     

       531
       531
       -
         })

     

       532
       532
       -
         (fetchNuGet {

     

       533
       533
       -
           name = "runtime.unix.System.IO.FileSystem";

     

       534
       534
       -
           version = "4.0.1";

     

       535
       535
       -
           sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha";

     

       536
       426
        
         })

     

       537
       427
        
         (fetchNuGet {

     

       538
       428
        
           name = "runtime.unix.System.IO.FileSystem";

     
···

       551
       441
        
         })

     

       552
       442
        
         (fetchNuGet {

     

       553
       443
        
           name = "runtime.unix.System.Private.Uri";

     

       554
       554
       -
           version = "4.0.1";

     

       555
       555
       -
           sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm";

     

       556
       556
       -
         })

     

       557
       557
       -
         (fetchNuGet {

     

       558
       558
       -
           name = "runtime.unix.System.Private.Uri";

     

       559
       444
        
           version = "4.3.0";

     

       560
       445
        
           sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk";

     

       561
       561
       -
         })

     

       562
       562
       -
         (fetchNuGet {

     

       563
       563
       -
           name = "runtime.unix.System.Runtime.Extensions";

     

       564
       564
       -
           version = "4.1.0";

     

       565
       565
       -
           sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4";

     

       566
       446
        
         })

     

       567
       447
        
         (fetchNuGet {

     

       568
       448
        
           name = "runtime.unix.System.Runtime.Extensions";

     
···

       581
       461
        
         })

     

       582
       462
        
         (fetchNuGet {

     

       583
       463
        
           name = "runtime.win.System.Diagnostics.Debug";

     

       584
       584
       -
           version = "4.0.11";

     

       585
       585
       -
           sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm";

     

       586
       586
       -
         })

     

       587
       587
       -
         (fetchNuGet {

     

       588
       588
       -
           name = "runtime.win.System.Diagnostics.Debug";

     

       589
       464
        
           version = "4.3.0";

     

       590
       465
        
           sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f";

     

       591
       591
       -
         })

     

       592
       592
       -
         (fetchNuGet {

     

       593
       593
       -
           name = "runtime.win.System.IO.FileSystem";

     

       594
       594
       -
           version = "4.0.1";

     

       595
       595
       -
           sha256 = "1dn9k6x8h27b6vbqh72hsfxax4fwf30jj8lc5328rg52lw29cyn1";

     

       596
       466
        
         })

     

       597
       467
        
         (fetchNuGet {

     

       598
       468
        
           name = "runtime.win.System.IO.FileSystem";

     
···

       611
       481
        
         })

     

       612
       482
        
         (fetchNuGet {

     

       613
       483
        
           name = "runtime.win.System.Runtime.Extensions";

     

       614
       614
       -
           version = "4.1.0";

     

       615
       615
       -
           sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw";

     

       616
       616
       -
         })

     

       617
       617
       -
         (fetchNuGet {

     

       618
       618
       -
           name = "runtime.win.System.Runtime.Extensions";

     

       619
       484
        
           version = "4.3.0";

     

       620
       485
        
           sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr";

     

       621
       486
        
         })

     
···

       625
       490
        
           sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll";

     

       626
       491
        
         })

     

       627
       492
        
         (fetchNuGet {

     

       628
       628
       -
           name = "SkiaSharp";

     

       629
       629
       -
           version = "1.68.1.1";

     

       630
       630
       -
           sha256 = "013yzsk798dwxdf2y5yx675x96nagfapkri5k3pgsjnmyfp1lvzk";

     

       631
       631
       -
         })

     

       632
       632
       -
         (fetchNuGet {

     

       633
       633
       -
           name = "SkiaSharp.NativeAssets.Linux";

     

       634
       634
       -
           version = "1.68.1.1";

     

       635
       635
       -
           sha256 = "07448kn9x56pxlnkxp2dpr5jmwj62k48y5m4608mwci32vs675hn";

     

       636
       636
       -
         })

     

       637
       637
       -
         (fetchNuGet {

     

       638
       638
       -
           name = "SkiaSharp.Views.Desktop.Common";

     

       639
       639
       -
           version = "1.68.1.1";

     

       640
       640
       -
           sha256 = "0wkj952iha7w2i8mvl0mksz2wqkx7vi7xylh10xgddld8kkm03r7";

     

       641
       641
       -
         })

     

       642
       642
       -
         (fetchNuGet {

     

       643
       643
       -
           name = "SkiaSharp.Views.Gtk3";

     

       644
       644
       -
           version = "1.68.1.1";

     

       645
       645
       -
           sha256 = "19fgshim2i60p55j4jcr0biq6k2xwal5dsmbgvyrrajnssaj3r95";

     

       646
       646
       -
         })

     

       647
       647
       -
         (fetchNuGet {

     

       648
       493
        
           name = "System.AppContext";

     

       649
       494
        
           version = "4.1.0";

     

       650
       495
        
           sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";

     
···

       685
       530
        
           sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";

     

       686
       531
        
         })

     

       687
       532
        
         (fetchNuGet {

     

       688
       688
       -
           name = "System.Collections.Immutable";

     

       689
       689
       -
           version = "1.2.0";

     

       690
       690
       -
           sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m";

     

       691
       691
       -
         })

     

       692
       692
       -
         (fetchNuGet {

     

       693
       693
       -
           name = "System.Collections.NonGeneric";

     

       694
       694
       -
           version = "4.0.1";

     

       695
       695
       -
           sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d";

     

       696
       696
       -
         })

     

       697
       697
       -
         (fetchNuGet {

     

       698
       533
        
           name = "System.Collections.NonGeneric";

     

       699
       534
        
           version = "4.3.0";

     

       700
       535
        
           sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k";

     

       701
       536
        
         })

     

       702
       537
        
         (fetchNuGet {

     

       703
       538
        
           name = "System.Collections.Specialized";

     

       704
       704
       -
           version = "4.0.1";

     

       705
       705
       -
           sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9";

     

       706
       706
       -
         })

     

       707
       707
       -
         (fetchNuGet {

     

       708
       708
       -
           name = "System.Collections.Specialized";

     

       709
       539
        
           version = "4.3.0";

     

       710
       540
        
           sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20";

     

       711
       541
        
         })

     

       712
       542
        
         (fetchNuGet {

     

       713
       543
        
           name = "System.ComponentModel";

     

       714
       714
       -
           version = "4.0.1";

     

       715
       715
       -
           sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z";

     

       716
       716
       -
         })

     

       717
       717
       -
         (fetchNuGet {

     

       718
       718
       -
           name = "System.ComponentModel";

     

       719
       544
        
           version = "4.3.0";

     

       720
       545
        
           sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb";

     

       721
       546
        
         })

     

       722
       547
        
         (fetchNuGet {

     

       723
       548
        
           name = "System.ComponentModel.EventBasedAsync";

     

       724
       724
       -
           version = "4.0.11";

     

       725
       725
       -
           sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh";

     

       726
       726
       -
         })

     

       727
       727
       -
         (fetchNuGet {

     

       728
       728
       -
           name = "System.ComponentModel.EventBasedAsync";

     

       729
       549
        
           version = "4.3.0";

     

       730
       550
        
           sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7";

     

       731
       551
        
         })

     

       732
       552
        
         (fetchNuGet {

     

       733
       553
        
           name = "System.ComponentModel.Primitives";

     

       734
       734
       -
           version = "4.1.0";

     

       735
       735
       -
           sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0";

     

       736
       736
       -
         })

     

       737
       737
       -
         (fetchNuGet {

     

       738
       738
       -
           name = "System.ComponentModel.Primitives";

     

       739
       554
        
           version = "4.3.0";

     

       740
       555
        
           sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0";

     

       741
       741
       -
         })

     

       742
       742
       -
         (fetchNuGet {

     

       743
       743
       -
           name = "System.ComponentModel.TypeConverter";

     

       744
       744
       -
           version = "4.1.0";

     

       745
       745
       -
           sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y";

     

       746
       556
        
         })

     

       747
       557
        
         (fetchNuGet {

     

       748
       558
        
           name = "System.ComponentModel.TypeConverter";

     
···

       771
       581
        
         })

     

       772
       582
        
         (fetchNuGet {

     

       773
       583
        
           name = "System.Diagnostics.Process";

     

       774
       774
       -
           version = "4.1.0";

     

       775
       775
       -
           sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s";

     

       776
       776
       -
         })

     

       777
       777
       -
         (fetchNuGet {

     

       778
       778
       -
           name = "System.Diagnostics.Process";

     

       779
       584
        
           version = "4.3.0";

     

       780
       585
        
           sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7";

     

       781
       586
        
         })

     

       782
       587
        
         (fetchNuGet {

     

       783
       783
       -
           name = "System.Diagnostics.TextWriterTraceListener";

     

       784
       784
       -
           version = "4.0.0";

     

       785
       785
       -
           sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs";

     

       786
       786
       -
         })

     

       787
       787
       -
         (fetchNuGet {

     

       788
       588
        
           name = "System.Diagnostics.Tools";

     

       789
       589
        
           version = "4.0.1";

     

       790
       590
        
           sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";

     

       791
       791
       -
         })

     

       792
       792
       -
         (fetchNuGet {

     

       793
       793
       -
           name = "System.Diagnostics.TraceSource";

     

       794
       794
       -
           version = "4.0.0";

     

       795
       795
       -
           sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h";

     

       796
       591
        
         })

     

       797
       592
        
         (fetchNuGet {

     

       798
       593
        
           name = "System.Diagnostics.Tracing";

     
···

       930
       725
        
           sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";

     

       931
       726
        
         })

     

       932
       727
        
         (fetchNuGet {

     

       933
       933
       -
           name = "System.Private.DataContractSerialization";

     

       934
       934
       -
           version = "4.1.1";

     

       935
       935
       -
           sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r";

     

       936
       936
       -
         })

     

       937
       937
       -
         (fetchNuGet {

     

       938
       938
       -
           name = "System.Private.Uri";

     

       939
       939
       -
           version = "4.0.1";

     

       940
       940
       -
           sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j";

     

       941
       941
       -
         })

     

       942
       942
       -
         (fetchNuGet {

     

       943
       728
        
           name = "System.Private.Uri";

     

       944
       729
        
           version = "4.3.0";

     

       945
       730
        
           sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx";

     
···

       995
       780
        
           sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq";

     

       996
       781
        
         })

     

       997
       782
        
         (fetchNuGet {

     

       998
       998
       -
           name = "System.Reflection.Metadata";

     

       999
       999
       -
           version = "1.3.0";

     

       1000
       1000
       -
           sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b";

     

       1001
       1001
       -
         })

     

       1002
       1002
       -
         (fetchNuGet {

     

       1003
       783
        
           name = "System.Reflection.Primitives";

     

       1004
       784
        
           version = "4.0.1";

     

       1005
       785
        
           sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28";

     
···

       1040
       820
        
           sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";

     

       1041
       821
        
         })

     

       1042
       822
        
         (fetchNuGet {

     

       823
       823
       +
           name = "System.Runtime.CompilerServices.Unsafe";

     

       824
       824
       +
           version = "4.6.0";

     

       825
       825
       +
           sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m";

     

       826
       826
       +
         })

     

       827
       827
       +
         (fetchNuGet {

     

       828
       828
       +
           name = "System.Runtime.CompilerServices.Unsafe";

     

       829
       829
       +
           version = "5.0.0-preview.7.20364.11";

     

       830
       830
       +
           sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m";

     

       831
       831
       +
         })

     

       832
       832
       +
         (fetchNuGet {

     

       1043
       833
        
           name = "System.Runtime.Extensions";

     

       1044
       834
        
           version = "4.1.0";

     

       1045
       835
        
           sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z";

     
···

       1080
       870
        
           sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";

     

       1081
       871
        
         })

     

       1082
       872
        
         (fetchNuGet {

     

       1083
       1083
       -
           name = "System.Runtime.Loader";

     

       1084
       1084
       -
           version = "4.0.0";

     

       1085
       1085
       -
           sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0";

     

       1086
       1086
       -
         })

     

       1087
       1087
       -
         (fetchNuGet {

     

       1088
       873
        
           name = "System.Runtime.Numerics";

     

       1089
       874
        
           version = "4.0.1";

     

       1090
       875
        
           sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";

     

       1091
       1091
       -
         })

     

       1092
       1092
       -
         (fetchNuGet {

     

       1093
       1093
       -
           name = "System.Runtime.Serialization.Json";

     

       1094
       1094
       -
           version = "4.0.2";

     

       1095
       1095
       -
           sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn";

     

       1096
       876
        
         })

     

       1097
       877
        
         (fetchNuGet {

     

       1098
       878
        
           name = "System.Runtime.Serialization.Primitives";

     
···

       1211
       991
        
         })

     

       1212
       992
        
         (fetchNuGet {

     

       1213
       993
        
           name = "System.Threading.Overlapped";

     

       1214
       1214
       -
           version = "4.0.1";

     

       1215
       1215
       -
           sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188";

     

       1216
       1216
       -
         })

     

       1217
       1217
       -
         (fetchNuGet {

     

       1218
       1218
       -
           name = "System.Threading.Overlapped";

     

       1219
       994
        
           version = "4.3.0";

     

       1220
       995
        
           sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm";

     

       1221
       996
        
         })

     
···

       1241
       1016
        
         })

     

       1242
       1017
        
         (fetchNuGet {

     

       1243
       1018
        
           name = "System.Threading.Thread";

     

       1244
       1244
       -
           version = "4.0.0";

     

       1245
       1245
       -
           sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";

     

       1246
       1246
       -
         })

     

       1247
       1247
       -
         (fetchNuGet {

     

       1248
       1248
       -
           name = "System.Threading.Thread";

     

       1249
       1019
        
           version = "4.3.0";

     

       1250
       1020
        
           sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4";

     

       1251
       1251
       -
         })

     

       1252
       1252
       -
         (fetchNuGet {

     

       1253
       1253
       -
           name = "System.Threading.ThreadPool";

     

       1254
       1254
       -
           version = "4.0.10";

     

       1255
       1255
       -
           sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx";

     

       1256
       1021
        
         })

     

       1257
       1022
        
         (fetchNuGet {

     

       1258
       1023
        
           name = "System.Threading.ThreadPool";

     
···

       1281
       1046
        
         })

     

       1282
       1047
        
         (fetchNuGet {

     

       1283
       1048
        
           name = "System.Xml.XmlDocument";

     

       1284
       1284
       -
           version = "4.0.1";

     

       1285
       1285
       -
           sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1";

     

       1286
       1286
       -
         })

     

       1287
       1287
       -
         (fetchNuGet {

     

       1288
       1288
       -
           name = "System.Xml.XmlDocument";

     

       1289
       1049
        
           version = "4.3.0";

     

       1290
       1050
        
           sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi";

     

       1291
       1051
        
         })

     

       1292
       1052
        
         (fetchNuGet {

     

       1293
       1293
       -
           name = "System.Xml.XmlSerializer";

     

       1294
       1294
       -
           version = "4.0.11";

     

       1295
       1295
       -
           sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z";

     

       1296
       1296
       -
         })

     

       1297
       1297
       -
         (fetchNuGet {

     

       1298
       1298
       -
           name = "System.Xml.XPath";

     

       1299
       1299
       -
           version = "4.0.1";

     

       1300
       1300
       -
           sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m";

     

       1301
       1301
       -
         })

     

       1302
       1302
       -
         (fetchNuGet {

     

       1303
       1053
        
           name = "System.Xml.XPath";

     

       1304
       1054
        
           version = "4.3.0";

     

       1305
       1055
        
           sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci";

     

       1306
       1306
       -
         })

     

       1307
       1307
       -
         (fetchNuGet {

     

       1308
       1308
       -
           name = "System.Xml.XPath.XmlDocument";

     

       1309
       1309
       -
           version = "4.0.1";

     

       1310
       1310
       -
           sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc";

     

       1311
       1056
        
         })

     

       1312
       1057
        
         (fetchNuGet {

     

       1313
       1058
        
           name = "System.Xml.XPath.XmlDocument";

+148 -136

pkgs/misc/vim-plugins/generated.nix

···

       341
       341
        
       

     

       342
       342
        
         clang_complete = buildVimPluginFrom2Nix {

     

       343
       343
        
           pname = "clang_complete";

     

       344
       344
       -
           version = "2020-09-02";

     

       344
       344
       +
           version = "2020-09-18";

     

       345
       345
        
           src = fetchFromGitHub {

     

       346
       346
        
             owner = "xavierd";

     

       347
       347
        
             repo = "clang_complete";

     

       348
       348
       -
             rev = "e0f5c246883fb06b6331ff5bec8ef1c3c71af3d4";

     

       349
       349
       -
             sha256 = "0kincdj1l3d552pjnrdjcl72fpln6klc85b01m1sn2b2dlin3xhz";

     

       348
       348
       +
             rev = "293a1062274a06be61797612034bd8d87851406e";

     

       349
       349
       +
             sha256 = "1whipcrr4pcg1bkivq3l753v3f3glbhkdd6wp6f9czspr7hx2h2d";

     

       350
       350
        
           };

     

       351
       351
        
           meta.homepage = "https://github.com/xavierd/clang_complete/";

     

       352
       352
        
         };

     
···

       389
       389
        
       

     

       390
       390
        
         coc-explorer = buildVimPluginFrom2Nix {

     

       391
       391
        
           pname = "coc-explorer";

     

       392
       392
       -
           version = "2020-09-17";

     

       392
       392
       +
           version = "2020-09-19";

     

       393
       393
        
           src = fetchFromGitHub {

     

       394
       394
        
             owner = "weirongxu";

     

       395
       395
        
             repo = "coc-explorer";

     

       396
       396
       -
             rev = "fd1fbf5eaba58ff25cae154bc98b3ceaa6467d8b";

     

       397
       397
       -
             sha256 = "0h9ff2n7mw00vn0yw5jkfa8p8ii9gj25lnir7812b182480my1mg";

     

       396
       396
       +
             rev = "810fa85761f44519116d4c8020f163e4ec76ad01";

     

       397
       397
       +
             sha256 = "04gnz214gkb3hsxb2xwisbmmjf6njka6yvaf8xcwzplzxxnl2zxg";

     

       398
       398
        
           };

     

       399
       399
        
           meta.homepage = "https://github.com/weirongxu/coc-explorer/";

     

       400
       400
        
         };

     
···

       461
       461
        
       

     

       462
       462
        
         coc-nvim = buildVimPluginFrom2Nix {

     

       463
       463
        
           pname = "coc-nvim";

     

       464
       464
       -
           version = "2020-09-13";

     

       464
       464
       +
           version = "2020-09-24";

     

       465
       465
        
           src = fetchFromGitHub {

     

       466
       466
        
             owner = "neoclide";

     

       467
       467
        
             repo = "coc.nvim";

     

       468
       468
       -
             rev = "825f7f5b89fb1708f18711798ef7a2ba6aa1bde5";

     

       469
       469
       -
             sha256 = "19lp2znwjc6p9wmqbp92qjvy1hvddh89hfcy739haf53pbnscds4";

     

       468
       468
       +
             rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847";

     

       469
       469
       +
             sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw";

     

       470
       470
        
           };

     

       471
       471
        
           meta.homepage = "https://github.com/neoclide/coc.nvim/";

     

       472
       472
        
         };

     
···

       522
       522
        
       

     

       523
       523
        
         completion-nvim = buildVimPluginFrom2Nix {

     

       524
       524
        
           pname = "completion-nvim";

     

       525
       525
       -
           version = "2020-09-17";

     

       525
       525
       +
           version = "2020-09-24";

     

       526
       526
        
           src = fetchFromGitHub {

     

       527
       527
        
             owner = "nvim-lua";

     

       528
       528
        
             repo = "completion-nvim";

     

       529
       529
       -
             rev = "f6f63add3a6004183ae6f2fff12b5b9f5067f493";

     

       530
       530
       -
             sha256 = "059msciykax5gcf71i80zxn0qm9hpf7g7k5cn8h2xqxil13jxrin";

     

       529
       529
       +
             rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3";

     

       530
       530
       +
             sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy";

     

       531
       531
        
           };

     

       532
       532
        
           meta.homepage = "https://github.com/nvim-lua/completion-nvim/";

     

       533
       533
        
         };

     
···

       558
       558
        
       

     

       559
       559
        
         conjure = buildVimPluginFrom2Nix {

     

       560
       560
        
           pname = "conjure";

     

       561
       561
       -
           version = "2020-09-08";

     

       561
       561
       +
           version = "2020-09-20";

     

       562
       562
        
           src = fetchFromGitHub {

     

       563
       563
        
             owner = "Olical";

     

       564
       564
        
             repo = "conjure";

     

       565
       565
       -
             rev = "566915cc545edd68bab2ad76eb59dfa43648a8b3";

     

       566
       566
       -
             sha256 = "0qcg51wmkz6bfz8pz4ryl78ifl7pf8lsjszp2kh0sbq7raz1kpkn";

     

       565
       565
       +
             rev = "a9431410d74f2281ae626727342a5d23d4a12552";

     

       566
       566
       +
             sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375";

     

       567
       567
        
           };

     

       568
       568
        
           meta.homepage = "https://github.com/Olical/conjure/";

     

       569
       569
        
         };

     
···

       678
       678
        
       

     

       679
       679
        
         ctrlp-vim = buildVimPluginFrom2Nix {

     

       680
       680
        
           pname = "ctrlp-vim";

     

       681
       681
       -
           version = "2020-05-26";

     

       681
       681
       +
           version = "2020-09-21";

     

       682
       682
        
           src = fetchFromGitHub {

     

       683
       683
        
             owner = "ctrlpvim";

     

       684
       684
        
             repo = "ctrlp.vim";

     

       685
       685
       -
             rev = "d93d97813dc839ef0782302a0debd7c4877f09f3";

     

       686
       686
       -
             sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k";

     

       685
       685
       +
             rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740";

     

       686
       686
       +
             sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp";

     

       687
       687
        
           };

     

       688
       688
        
           meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";

     

       689
       689
        
         };

     
···

       726
       726
        
       

     

       727
       727
        
         defx-nvim = buildVimPluginFrom2Nix {

     

       728
       728
        
           pname = "defx-nvim";

     

       729
       729
       -
           version = "2020-09-17";

     

       729
       729
       +
           version = "2020-09-24";

     

       730
       730
        
           src = fetchFromGitHub {

     

       731
       731
        
             owner = "Shougo";

     

       732
       732
        
             repo = "defx.nvim";

     

       733
       733
       -
             rev = "ac40f5170ba097efec0f9055c92fe95e20ee2a7e";

     

       734
       734
       -
             sha256 = "031bgs5ypw20ffml7x2nbrfzpi4zqb64d1n9j3blyy4yyaa60089";

     

       733
       733
       +
             rev = "a84cb7f88afc904123858b226240c3339b7ca814";

     

       734
       734
       +
             sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch";

     

       735
       735
        
           };

     

       736
       736
        
           meta.homepage = "https://github.com/Shougo/defx.nvim/";

     

       737
       737
        
         };

     
···

       774
       774
        
       

     

       775
       775
        
         denite-nvim = buildVimPluginFrom2Nix {

     

       776
       776
        
           pname = "denite-nvim";

     

       777
       777
       -
           version = "2020-09-15";

     

       777
       777
       +
           version = "2020-09-23";

     

       778
       778
        
           src = fetchFromGitHub {

     

       779
       779
        
             owner = "Shougo";

     

       780
       780
        
             repo = "denite.nvim";

     

       781
       781
       -
             rev = "7d54f44e1035aea4cba99bdb34f0565b55008706";

     

       782
       782
       -
             sha256 = "1bjslhsw3xm4pvzks7b1v7il8ap2mr7n64sv2sgx56c5fl410pkl";

     

       781
       781
       +
             rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406";

     

       782
       782
       +
             sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h";

     

       783
       783
        
           };

     

       784
       784
        
           meta.homepage = "https://github.com/Shougo/denite.nvim/";

     

       785
       785
        
         };

     
···

       908
       908
        
       

     

       909
       909
        
         deoplete-khard = buildVimPluginFrom2Nix {

     

       910
       910
        
           pname = "deoplete-khard";

     

       911
       911
       -
           version = "2020-04-30";

     

       911
       911
       +
           version = "2020-09-18";

     

       912
       912
        
           src = fetchFromGitHub {

     

       913
       913
        
             owner = "nicoe";

     

       914
       914
        
             repo = "deoplete-khard";

     

       915
       915
       -
             rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7";

     

       916
       916
       -
             sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066";

     

       915
       915
       +
             rev = "dc2b519e8da0df10c3954946285caf484d376497";

     

       916
       916
       +
             sha256 = "126mhnn4dqwm3aw6v4c3s3fnz40lki4cbb8xfrmxfbnbnjw1yx4x";

     

       917
       917
        
           };

     

       918
       918
        
           meta.homepage = "https://github.com/nicoe/deoplete-khard/";

     

       919
       919
        
         };

     

       920
       920
        
       

     

       921
       921
        
         deoplete-lsp = buildVimPluginFrom2Nix {

     

       922
       922
        
           pname = "deoplete-lsp";

     

       923
       923
       -
           version = "2020-08-25";

     

       923
       923
       +
           version = "2020-09-18";

     

       924
       924
        
           src = fetchFromGitHub {

     

       925
       925
        
             owner = "Shougo";

     

       926
       926
        
             repo = "deoplete-lsp";

     

       927
       927
       -
             rev = "4fd2507dd295d9c114febabb0c9cf31da87df008";

     

       928
       928
       -
             sha256 = "1alwf8gjvgj5q3sbrqxrm0f2nbf6drk6dxqipk9pmvbj50iadyf1";

     

       927
       927
       +
             rev = "17cd3fae3044eb8148bc22167257d4ae13165eb1";

     

       928
       928
       +
             sha256 = "1xag51j71ifjn64xyaz7whml796pdl8vsw0ad22wndwzb95kyxdm";

     

       929
       929
        
           };

     

       930
       930
        
           meta.homepage = "https://github.com/Shougo/deoplete-lsp/";

     

       931
       931
        
         };

     
···

       1125
       1125
        
       

     

       1126
       1126
        
         elm-vim = buildVimPluginFrom2Nix {

     

       1127
       1127
        
           pname = "elm-vim";

     

       1128
       1128
       -
           version = "2019-04-05";

     

       1128
       1128
       +
           version = "2020-09-23";

     

       1129
       1129
        
           src = fetchFromGitHub {

     

       1130
       1130
        
             owner = "elmcast";

     

       1131
       1131
        
             repo = "elm-vim";

     

       1132
       1132
       -
             rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7";

     

       1133
       1133
       -
             sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5";

     

       1132
       1132
       +
             rev = "4b71facd77297cb33bbb3b14894676cff0a9bd1d";

     

       1133
       1133
       +
             sha256 = "1kxkjm6fzmircg5gh7w2bmvjgk8ly5vvq9l31m4p6ql48azg2ilc";

     

       1134
       1134
        
           };

     

       1135
       1135
        
           meta.homepage = "https://github.com/elmcast/elm-vim/";

     

       1136
       1136
        
         };

     
···

       1535
       1535
        
       

     

       1536
       1536
        
         hoon-vim = buildVimPluginFrom2Nix {

     

       1537
       1537
        
           pname = "hoon-vim";

     

       1538
       1538
       -
           version = "2019-02-19";

     

       1538
       1538
       +
           version = "2020-02-19";

     

       1539
       1539
        
           src = fetchFromGitHub {

     

       1540
       1540
        
             owner = "urbit";

     

       1541
       1541
        
             repo = "hoon.vim";

     
···

       1942
       1942
        
           meta.homepage = "https://github.com/junegunn/limelight.vim/";

     

       1943
       1943
        
         };

     

       1944
       1944
        
       

     

       1945
       1945
       +
         lsp_extensions-nvim = buildVimPluginFrom2Nix {

     

       1946
       1946
       +
           pname = "lsp_extensions-nvim";

     

       1947
       1947
       +
           version = "2020-09-06";

     

       1948
       1948
       +
           src = fetchFromGitHub {

     

       1949
       1949
       +
             owner = "tjdevries";

     

       1950
       1950
       +
             repo = "lsp_extensions.nvim";

     

       1951
       1951
       +
             rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2";

     

       1952
       1952
       +
             sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz";

     

       1953
       1953
       +
           };

     

       1954
       1954
       +
           meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/";

     

       1955
       1955
       +
         };

     

       1956
       1956
       +
       

     

       1945
       1957
        
         lushtags = buildVimPluginFrom2Nix {

     

       1946
       1958
        
           pname = "lushtags";

     

       1947
       1959
        
           version = "2017-04-19";

     
···

       2268
       2280
        
       

     

       2269
       2281
        
         neoformat = buildVimPluginFrom2Nix {

     

       2270
       2282
        
           pname = "neoformat";

     

       2271
       2271
       -
           version = "2020-09-16";

     

       2283
       2283
       +
           version = "2020-09-19";

     

       2272
       2284
        
           src = fetchFromGitHub {

     

       2273
       2285
        
             owner = "sbdchd";

     

       2274
       2286
        
             repo = "neoformat";

     

       2275
       2275
       -
             rev = "edb1751fbe5330f32ded49d736b8c403ae071fba";

     

       2276
       2276
       -
             sha256 = "19m0yyasjnm5863yw9qlkbschj6f901p6qn89brf2ml7app9vmb4";

     

       2287
       2287
       +
             rev = "4f259033bfbc1465c3a8348fcf632260d96a3e6f";

     

       2288
       2288
       +
             sha256 = "09grfx66m5wasqy8blhqhfcqnsh3b4gfyyi09l1zda1vr2hhvz15";

     

       2277
       2289
        
           };

     

       2278
       2290
        
           meta.homepage = "https://github.com/sbdchd/neoformat/";

     

       2279
       2291
        
         };

     
···

       2316
       2328
        
       

     

       2317
       2329
        
         neosnippet-snippets = buildVimPluginFrom2Nix {

     

       2318
       2330
        
           pname = "neosnippet-snippets";

     

       2319
       2319
       -
           version = "2020-08-16";

     

       2331
       2331
       +
           version = "2020-09-24";

     

       2320
       2332
        
           src = fetchFromGitHub {

     

       2321
       2333
        
             owner = "Shougo";

     

       2322
       2334
        
             repo = "neosnippet-snippets";

     

       2323
       2323
       -
             rev = "b7ba77a4eb39a95ffbb6b3ff0c3c43746441b2aa";

     

       2324
       2324
       -
             sha256 = "0yf55pi6d35brdva4n0x7yygjnymwbgwn1fx83nbzxhixmgbk45b";

     

       2335
       2335
       +
             rev = "886a414e339fe40a47f30da8aa6012a6e0906018";

     

       2336
       2336
       +
             sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96";

     

       2325
       2337
        
           };

     

       2326
       2338
        
           meta.homepage = "https://github.com/Shougo/neosnippet-snippets/";

     

       2327
       2339
        
         };

     
···

       2352
       2364
        
       

     

       2353
       2365
        
         neoterm = buildVimPluginFrom2Nix {

     

       2354
       2366
        
           pname = "neoterm";

     

       2355
       2355
       -
           version = "2020-08-06";

     

       2367
       2367
       +
           version = "2020-09-22";

     

       2356
       2368
        
           src = fetchFromGitHub {

     

       2357
       2369
        
             owner = "kassio";

     

       2358
       2370
        
             repo = "neoterm";

     

       2359
       2359
       -
             rev = "48bc5d0bddd3debb9bdf73ee1d1153d7cafa693e";

     

       2360
       2360
       -
             sha256 = "0495n0l9isi7pgfgc2axkk0v4g7r4dpbzxg5dl4hg7qkw6la7l5k";

     

       2371
       2371
       +
             rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8";

     

       2372
       2372
       +
             sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8";

     

       2361
       2373
        
           };

     

       2362
       2374
        
           meta.homepage = "https://github.com/kassio/neoterm/";

     

       2363
       2375
        
         };

     
···

       2424
       2436
        
       

     

       2425
       2437
        
         nerdtree-git-plugin = buildVimPluginFrom2Nix {

     

       2426
       2438
        
           pname = "nerdtree-git-plugin";

     

       2427
       2427
       -
           version = "2020-09-11";

     

       2439
       2439
       +
           version = "2020-09-20";

     

       2428
       2440
        
           src = fetchFromGitHub {

     

       2429
       2441
        
             owner = "Xuyuanp";

     

       2430
       2442
        
             repo = "nerdtree-git-plugin";

     

       2431
       2431
       -
             rev = "a8c031f11dd312f53357729ca47ad493e798aa86";

     

       2432
       2432
       -
             sha256 = "1d64cmywhj43q9fkrh0kcfsxa7ijxcb1fbz38pxaacg082y6l0jy";

     

       2443
       2443
       +
             rev = "97eeaee46308a39cadfd2273280fcc4906988dd0";

     

       2444
       2444
       +
             sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb";

     

       2433
       2445
        
           };

     

       2434
       2446
        
           meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";

     

       2435
       2447
        
         };

     
···

       2556
       2568
        
       

     

       2557
       2569
        
         nvim-treesitter = buildVimPluginFrom2Nix {

     

       2558
       2570
        
           pname = "nvim-treesitter";

     

       2559
       2559
       -
           version = "2020-09-17";

     

       2571
       2571
       +
           version = "2020-09-23";

     

       2560
       2572
        
           src = fetchFromGitHub {

     

       2561
       2573
        
             owner = "nvim-treesitter";

     

       2562
       2574
        
             repo = "nvim-treesitter";

     

       2563
       2563
       -
             rev = "b2e1ea1edf2cb42d20a941595cd0b4fcb871a0b5";

     

       2564
       2564
       -
             sha256 = "1lg7mmp87r35h9rsf8pkngnxkgrjwg43a3aig6zmg37v58kgwv1j";

     

       2575
       2575
       +
             rev = "98c12ec23a6df2f2f505304b61c4b2eefc0a568f";

     

       2576
       2576
       +
             sha256 = "138rsbk2kx929cih6r3rqmgrygamnc1l9kh62pqsrphi28jh5178";

     

       2565
       2577
        
           };

     

       2566
       2578
        
           meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

     

       2567
       2579
        
         };

     
···

       2964
       2976
        
       

     

       2965
       2977
        
         rust-vim = buildVimPluginFrom2Nix {

     

       2966
       2978
        
           pname = "rust-vim";

     

       2967
       2967
       -
           version = "2020-09-10";

     

       2979
       2979
       +
           version = "2020-09-18";

     

       2968
       2980
        
           src = fetchFromGitHub {

     

       2969
       2981
        
             owner = "rust-lang";

     

       2970
       2982
        
             repo = "rust.vim";

     

       2971
       2971
       -
             rev = "2a6736852cbe64e2883adc70a427cb47cb3305bc";

     

       2972
       2972
       -
             sha256 = "1zykkq674rg7b6bh57bpfrw5fwhk4fij7mqgdcxi5sk6blcld5j0";

     

       2983
       2983
       +
             rev = "96e79e397126be1a64fb53d8e3656842fe1a4532";

     

       2984
       2984
       +
             sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3";

     

       2973
       2985
        
           };

     

       2974
       2986
        
           meta.homepage = "https://github.com/rust-lang/rust.vim/";

     

       2975
       2987
        
         };

     
···

       3060
       3072
        
       

     

       3061
       3073
        
         sideways-vim = buildVimPluginFrom2Nix {

     

       3062
       3074
        
           pname = "sideways-vim";

     

       3063
       3063
       -
           version = "2020-09-13";

     

       3075
       3075
       +
           version = "2020-09-21";

     

       3064
       3076
        
           src = fetchFromGitHub {

     

       3065
       3077
        
             owner = "AndrewRadev";

     

       3066
       3078
        
             repo = "sideways.vim";

     

       3067
       3067
       -
             rev = "ea78de9eda97728d3489c29eb3e9c8a9b2fdd868";

     

       3068
       3068
       -
             sha256 = "0kn1qpkwsv7m58gr3jydynnm12gqns503dhnfqcw7yshbq5sr9rr";

     

       3079
       3079
       +
             rev = "19c5a21206b6c9f999004256a10e7381450ea83f";

     

       3080
       3080
       +
             sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6";

     

       3069
       3081
        
           };

     

       3070
       3082
        
           meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";

     

       3071
       3083
        
         };

     
···

       3144
       3156
        
       

     

       3145
       3157
        
         Spacegray-vim = buildVimPluginFrom2Nix {

     

       3146
       3158
        
           pname = "Spacegray-vim";

     

       3147
       3147
       -
           version = "2019-02-23";

     

       3159
       3159
       +
           version = "2020-09-18";

     

       3148
       3160
        
           src = fetchFromGitHub {

     

       3149
       3161
        
             owner = "ajh17";

     

       3150
       3162
        
             repo = "Spacegray.vim";

     

       3151
       3151
       -
             rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1";

     

       3152
       3152
       -
             sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896";

     

       3163
       3163
       +
             rev = "338b319da09b5e62744a54c79148262ba0f24bf3";

     

       3164
       3164
       +
             sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb";

     

       3153
       3165
        
           };

     

       3154
       3166
        
           meta.homepage = "https://github.com/ajh17/Spacegray.vim/";

     

       3155
       3167
        
         };

     
···

       3204
       3216
        
       

     

       3205
       3217
        
         splitjoin-vim = buildVimPluginFrom2Nix {

     

       3206
       3218
        
           pname = "splitjoin-vim";

     

       3207
       3207
       -
           version = "2020-07-21";

     

       3219
       3219
       +
           version = "2020-09-21";

     

       3208
       3220
        
           src = fetchFromGitHub {

     

       3209
       3221
        
             owner = "AndrewRadev";

     

       3210
       3222
        
             repo = "splitjoin.vim";

     

       3211
       3211
       -
             rev = "46efa9796716fe645d43f6018de3e06296978c7b";

     

       3212
       3212
       -
             sha256 = "126a9v4j217g1kflfabqx0bz02k0xkwqfagzhk51n7drh2r2m7k6";

     

       3223
       3223
       +
             rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20";

     

       3224
       3224
       +
             sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm";

     

       3213
       3225
        
             fetchSubmodules = true;

     

       3214
       3226
        
           };

     

       3215
       3227
        
           meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

     
···

       3265
       3277
        
       

     

       3266
       3278
        
         syntastic = buildVimPluginFrom2Nix {

     

       3267
       3279
        
           pname = "syntastic";

     

       3268
       3268
       -
           version = "2020-09-09";

     

       3280
       3280
       +
           version = "2020-09-17";

     

       3269
       3281
        
           src = fetchFromGitHub {

     

       3270
       3282
        
             owner = "vim-syntastic";

     

       3271
       3283
        
             repo = "syntastic";

     

       3272
       3272
       -
             rev = "3e31762a26f7c29c0f6344c4215ca9074f4ead8d";

     

       3273
       3273
       -
             sha256 = "11wbxnvqgkgmcb3yl5zsn4v6va17p20nnrqxrqbr6y8ia39n7wa0";

     

       3284
       3284
       +
             rev = "20fb41cb3ee7efd041866fad7384668d131a0029";

     

       3285
       3285
       +
             sha256 = "1gmk9hlyz8k5880gzs0pqbpmscjzfj3cwfdkg950w5ky2lm0i7n2";

     

       3274
       3286
        
           };

     

       3275
       3287
        
           meta.homepage = "https://github.com/vim-syntastic/syntastic/";

     

       3276
       3288
        
         };

     
···

       3313
       3325
        
       

     

       3314
       3326
        
         tagbar = buildVimPluginFrom2Nix {

     

       3315
       3327
        
           pname = "tagbar";

     

       3316
       3316
       -
           version = "2020-09-13";

     

       3328
       3328
       +
           version = "2020-09-23";

     

       3317
       3329
        
           src = fetchFromGitHub {

     

       3318
       3330
        
             owner = "preservim";

     

       3319
       3331
        
             repo = "tagbar";

     

       3320
       3320
       -
             rev = "30fb229937d640889448de9c4f8b71b19946c67b";

     

       3321
       3321
       -
             sha256 = "01vl3id1fmkd8p9hb2x2mb5iyyfad5a84ibfl6fkr7sm59jfgc2j";

     

       3332
       3332
       +
             rev = "6099093050d84094001f2f226ddc09d7c2edcdd6";

     

       3333
       3333
       +
             sha256 = "1gvyq1gra9k3fjjzr4lh9kwf0h2a5di242kxlwyj78p9606cdf9g";

     

       3322
       3334
        
           };

     

       3323
       3335
        
           meta.homepage = "https://github.com/preservim/tagbar/";

     

       3324
       3336
        
         };

     
···

       4058
       4070
        
       

     

       4059
       4071
        
         vim-clap = buildVimPluginFrom2Nix {

     

       4060
       4072
        
           pname = "vim-clap";

     

       4061
       4061
       -
           version = "2020-09-17";

     

       4073
       4073
       +
           version = "2020-09-21";

     

       4062
       4074
        
           src = fetchFromGitHub {

     

       4063
       4075
        
             owner = "liuchengxu";

     

       4064
       4076
        
             repo = "vim-clap";

     

       4065
       4065
       -
             rev = "415fd21e109ca05e22a38613f93baf1f96ede08c";

     

       4066
       4066
       -
             sha256 = "066k0mdcxqv2hl9jdy93i6v5mi8mhr3q8zr1cd5xrxsxzgv9r476";

     

       4077
       4077
       +
             rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf";

     

       4078
       4078
       +
             sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx";

     

       4067
       4079
        
           };

     

       4068
       4080
        
           meta.homepage = "https://github.com/liuchengxu/vim-clap/";

     

       4069
       4081
        
         };

     
···

       4562
       4574
        
       

     

       4563
       4575
        
         vim-fireplace = buildVimPluginFrom2Nix {

     

       4564
       4576
        
           pname = "vim-fireplace";

     

       4565
       4565
       -
           version = "2020-09-14";

     

       4577
       4577
       +
           version = "2020-09-23";

     

       4566
       4578
        
           src = fetchFromGitHub {

     

       4567
       4579
        
             owner = "tpope";

     

       4568
       4580
        
             repo = "vim-fireplace";

     

       4569
       4569
       -
             rev = "72f4b6d4ec8aac44ea6f5ee6e3693b7388cd3449";

     

       4570
       4570
       -
             sha256 = "07wcpc7kr113m574zfxjlh65pyhfm24a2f7lyadmhr1sah05iv6s";

     

       4581
       4581
       +
             rev = "f936a7671888638dec54b86f2e49001a0e5e6005";

     

       4582
       4582
       +
             sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446";

     

       4571
       4583
        
           };

     

       4572
       4584
        
           meta.homepage = "https://github.com/tpope/vim-fireplace/";

     

       4573
       4585
        
         };

     
···

       4670
       4682
        
       

     

       4671
       4683
        
         vim-fugitive = buildVimPluginFrom2Nix {

     

       4672
       4684
        
           pname = "vim-fugitive";

     

       4673
       4673
       -
           version = "2020-08-26";

     

       4685
       4685
       +
           version = "2020-09-24";

     

       4674
       4686
        
           src = fetchFromGitHub {

     

       4675
       4687
        
             owner = "tpope";

     

       4676
       4688
        
             repo = "vim-fugitive";

     

       4677
       4677
       -
             rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f";

     

       4678
       4678
       -
             sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23";

     

       4689
       4689
       +
             rev = "49315d0c74acb983f2902260ebc9d86f85758ea4";

     

       4690
       4690
       +
             sha256 = "0i2lhfw542c7xm7d10b0q5isw3398ycyn06mnp429nwb7fldv1ww";

     

       4679
       4691
        
           };

     

       4680
       4692
        
           meta.homepage = "https://github.com/tpope/vim-fugitive/";

     

       4681
       4693
        
         };

     
···

       4706
       4718
        
       

     

       4707
       4719
        
         vim-gista = buildVimPluginFrom2Nix {

     

       4708
       4720
        
           pname = "vim-gista";

     

       4709
       4709
       -
           version = "2020-01-04";

     

       4721
       4721
       +
           version = "2020-09-19";

     

       4710
       4722
        
           src = fetchFromGitHub {

     

       4711
       4723
        
             owner = "lambdalisue";

     

       4712
       4724
        
             repo = "vim-gista";

     

       4713
       4713
       -
             rev = "af13c0062a46d73384f15abee5a54e164fcaad8e";

     

       4714
       4714
       -
             sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd";

     

       4725
       4725
       +
             rev = "c046de1b9d4cf97ff6f80cf3bdbb75b1094f2aaf";

     

       4726
       4726
       +
             sha256 = "0q08hs4y9d4c4zdd0lh4k054133y0455fkn47gi7h16m01g92imc";

     

       4715
       4727
        
           };

     

       4716
       4728
        
           meta.homepage = "https://github.com/lambdalisue/vim-gista/";

     

       4717
       4729
        
         };

     
···

       4766
       4778
        
       

     

       4767
       4779
        
         vim-go = buildVimPluginFrom2Nix {

     

       4768
       4780
        
           pname = "vim-go";

     

       4769
       4769
       -
           version = "2020-09-15";

     

       4781
       4781
       +
           version = "2020-09-21";

     

       4770
       4782
        
           src = fetchFromGitHub {

     

       4771
       4783
        
             owner = "fatih";

     

       4772
       4784
        
             repo = "vim-go";

     

       4773
       4773
       -
             rev = "b919c60a6d1ca70a93d56fa4ee13dbcf412a8554";

     

       4774
       4774
       -
             sha256 = "0sz08nbmk8pqlc4b1vypwv6xbhg7nrns6g1abp7xkzwn07lnrqb2";

     

       4785
       4785
       +
             rev = "0a9792612fb87c5581906a9cc410b472c25a0d78";

     

       4786
       4786
       +
             sha256 = "1gwswqmxd29hpj8rvf2v866877xc4fz3jhymkf0whhw62ya5gr9v";

     

       4775
       4787
        
           };

     

       4776
       4788
        
           meta.homepage = "https://github.com/fatih/vim-go/";

     

       4777
       4789
        
         };

     
···

       5355
       5367
        
       

     

       5356
       5368
        
         vim-lsc = buildVimPluginFrom2Nix {

     

       5357
       5369
        
           pname = "vim-lsc";

     

       5358
       5358
       -
           version = "2020-08-29";

     

       5370
       5370
       +
           version = "2020-09-21";

     

       5359
       5371
        
           src = fetchFromGitHub {

     

       5360
       5372
        
             owner = "natebosch";

     

       5361
       5373
        
             repo = "vim-lsc";

     

       5362
       5362
       -
             rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630";

     

       5363
       5363
       -
             sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc";

     

       5374
       5374
       +
             rev = "8262f528ca50832826efd0605ddc17a3830b53d1";

     

       5375
       5375
       +
             sha256 = "0s1ayrprv59dki7xhzzlzxdfrkm3i70p8wh8sf48higvcrsjjylv";

     

       5364
       5376
        
           };

     

       5365
       5377
        
           meta.homepage = "https://github.com/natebosch/vim-lsc/";

     

       5366
       5378
        
         };

     

       5367
       5379
        
       

     

       5368
       5380
        
         vim-lsp = buildVimPluginFrom2Nix {

     

       5369
       5381
        
           pname = "vim-lsp";

     

       5370
       5370
       -
           version = "2020-09-17";

     

       5382
       5382
       +
           version = "2020-09-24";

     

       5371
       5383
        
           src = fetchFromGitHub {

     

       5372
       5384
        
             owner = "prabirshrestha";

     

       5373
       5385
        
             repo = "vim-lsp";

     

       5374
       5374
       -
             rev = "46330cd0cbab3780b59a53c16fde6273bb217071";

     

       5375
       5375
       -
             sha256 = "121pr3s13bcy1hqc4bcx0x7isg0x5izbrsvir33d39q2x0wj44my";

     

       5386
       5386
       +
             rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800";

     

       5387
       5387
       +
             sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6";

     

       5376
       5388
        
           };

     

       5377
       5389
        
           meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

     

       5378
       5390
        
         };

     

       5379
       5391
        
       

     

       5380
       5392
        
         vim-maktaba = buildVimPluginFrom2Nix {

     

       5381
       5393
        
           pname = "vim-maktaba";

     

       5382
       5382
       -
           version = "2020-08-06";

     

       5394
       5394
       +
           version = "2020-09-23";

     

       5383
       5395
        
           src = fetchFromGitHub {

     

       5384
       5396
        
             owner = "google";

     

       5385
       5397
        
             repo = "vim-maktaba";

     

       5386
       5386
       -
             rev = "f60443777137a0f91e489b1757c6602c63fb3731";

     

       5387
       5387
       -
             sha256 = "1r6raxhwg78azcqv7brvas3w4xr7aja1gmcapm7j6mv69izf1fzw";

     

       5398
       5398
       +
             rev = "cdf8247c0abd251475be26a044b2e95698df6c09";

     

       5399
       5399
       +
             sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq";

     

       5388
       5400
        
           };

     

       5389
       5401
        
           meta.homepage = "https://github.com/google/vim-maktaba/";

     

       5390
       5402
        
         };

     
···

       5727
       5739
        
       

     

       5728
       5740
        
         vim-osc52 = buildVimPluginFrom2Nix {

     

       5729
       5741
        
           pname = "vim-osc52";

     

       5730
       5730
       -
           version = "2017-06-23";

     

       5742
       5742
       +
           version = "2020-09-19";

     

       5731
       5743
        
           src = fetchFromGitHub {

     

       5732
       5744
        
             owner = "fcpg";

     

       5733
       5745
        
             repo = "vim-osc52";

     

       5734
       5734
       -
             rev = "01a311169b2678d853c87b371201205daf8fdf1a";

     

       5735
       5735
       -
             sha256 = "1nxla8r4036shbmyx6wpxy9ncy1s2c5ghi5n5ip22b01lcv6lnv5";

     

       5746
       5746
       +
             rev = "551f20e62e68684a5b745ae08b0c4236d86e4c2b";

     

       5747
       5747
       +
             sha256 = "0yxjs32ab27l3kmh5lpinj15m11winqsnmykjq7lizs15v7gd2s9";

     

       5736
       5748
        
           };

     

       5737
       5749
        
           meta.homepage = "https://github.com/fcpg/vim-osc52/";

     

       5738
       5750
        
         };

     
···

       5919
       5931
        
       

     

       5920
       5932
        
         vim-polyglot = buildVimPluginFrom2Nix {

     

       5921
       5933
        
           pname = "vim-polyglot";

     

       5922
       5922
       -
           version = "2020-09-16";

     

       5934
       5934
       +
           version = "2020-09-24";

     

       5923
       5935
        
           src = fetchFromGitHub {

     

       5924
       5936
        
             owner = "sheerun";

     

       5925
       5937
        
             repo = "vim-polyglot";

     

       5926
       5926
       -
             rev = "06548fe61765d8a68a289741ce8d30f04a037e60";

     

       5927
       5927
       -
             sha256 = "18yiqj62vpkvnxgcy1hqbdy846g4c3i807d3bbiz1kgwf9jh50ik";

     

       5938
       5938
       +
             rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709";

     

       5939
       5939
       +
             sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9";

     

       5928
       5940
        
           };

     

       5929
       5941
        
           meta.homepage = "https://github.com/sheerun/vim-polyglot/";

     

       5930
       5942
        
         };

     
···

       6123
       6135
        
       

     

       6124
       6136
        
         vim-rooter = buildVimPluginFrom2Nix {

     

       6125
       6137
        
           pname = "vim-rooter";

     

       6126
       6126
       -
           version = "2020-09-08";

     

       6138
       6138
       +
           version = "2020-09-18";

     

       6127
       6139
        
           src = fetchFromGitHub {

     

       6128
       6140
        
             owner = "airblade";

     

       6129
       6141
        
             repo = "vim-rooter";

     

       6130
       6130
       -
             rev = "98595736d4d91552647ea0130e704cd1a3d5d1d1";

     

       6131
       6131
       -
             sha256 = "1b6224f4q4lpd3sdn3ka8gdcnyi82ii8bh4baxf8mp9c0r6qwcns";

     

       6142
       6142
       +
             rev = "45ea40da3f223fff83fce0a643875e560ed20aae";

     

       6143
       6143
       +
             sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2";

     

       6132
       6144
        
           };

     

       6133
       6145
        
           meta.homepage = "https://github.com/airblade/vim-rooter/";

     

       6134
       6146
        
         };

     
···

       6159
       6171
        
       

     

       6160
       6172
        
         vim-salve = buildVimPluginFrom2Nix {

     

       6161
       6173
        
           pname = "vim-salve";

     

       6162
       6162
       -
           version = "2019-11-13";

     

       6174
       6174
       +
           version = "2020-09-22";

     

       6163
       6175
        
           src = fetchFromGitHub {

     

       6164
       6176
        
             owner = "tpope";

     

       6165
       6177
        
             repo = "vim-salve";

     

       6166
       6166
       -
             rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e";

     

       6167
       6167
       -
             sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj";

     

       6178
       6178
       +
             rev = "5958a99c4ac783cec668380917ac1f62b27466fe";

     

       6179
       6179
       +
             sha256 = "1vs2rfhcxm9v4ndnsx85b1i29h67qv748k3nvdxc145v1hjcnapm";

     

       6168
       6180
        
           };

     

       6169
       6181
        
           meta.homepage = "https://github.com/tpope/vim-salve/";

     

       6170
       6182
        
         };

     
···

       6387
       6399
        
       

     

       6388
       6400
        
         vim-snippets = buildVimPluginFrom2Nix {

     

       6389
       6401
        
           pname = "vim-snippets";

     

       6390
       6390
       -
           version = "2020-09-05";

     

       6402
       6402
       +
           version = "2020-09-24";

     

       6391
       6403
        
           src = fetchFromGitHub {

     

       6392
       6404
        
             owner = "honza";

     

       6393
       6405
        
             repo = "vim-snippets";

     

       6394
       6394
       -
             rev = "791c72d53399c7db9ec5a19922efee15d8f5a94b";

     

       6395
       6395
       -
             sha256 = "0ap477g8265w7rprk4z402m3xxpci35xq602z1g7x86488afgsrw";

     

       6406
       6406
       +
             rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7";

     

       6407
       6407
       +
             sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1";

     

       6396
       6408
        
           };

     

       6397
       6409
        
           meta.homepage = "https://github.com/honza/vim-snippets/";

     

       6398
       6410
        
         };

     
···

       6579
       6591
        
       

     

       6580
       6592
        
         vim-terraform = buildVimPluginFrom2Nix {

     

       6581
       6593
        
           pname = "vim-terraform";

     

       6582
       6582
       -
           version = "2020-09-15";

     

       6594
       6594
       +
           version = "2020-09-23";

     

       6583
       6595
        
           src = fetchFromGitHub {

     

       6584
       6596
        
             owner = "hashivim";

     

       6585
       6597
        
             repo = "vim-terraform";

     

       6586
       6586
       -
             rev = "4c0ae1aa9324dc37e0d8bb672ecdcb313f97f75c";

     

       6587
       6587
       -
             sha256 = "1rg9r0zpxwbzj710rm3jh9bvgdngmn8c4ikcv0rjk7d7wy2pclkn";

     

       6598
       6598
       +
             rev = "f77a07617a649684148de97e5a9115e659166f6a";

     

       6599
       6599
       +
             sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic";

     

       6588
       6600
        
           };

     

       6589
       6601
        
           meta.homepage = "https://github.com/hashivim/vim-terraform/";

     

       6590
       6602
        
         };

     
···

       6736
       6748
        
       

     

       6737
       6749
        
         vim-tmux-navigator = buildVimPluginFrom2Nix {

     

       6738
       6750
        
           pname = "vim-tmux-navigator";

     

       6739
       6739
       -
           version = "2020-04-23";

     

       6751
       6751
       +
           version = "2020-09-18";

     

       6740
       6752
        
           src = fetchFromGitHub {

     

       6741
       6753
        
             owner = "christoomey";

     

       6742
       6754
        
             repo = "vim-tmux-navigator";

     

       6743
       6743
       -
             rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b";

     

       6744
       6744
       -
             sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d";

     

       6755
       6755
       +
             rev = "2fd76aa930e34838335c1aa125b88e7ea671e6c0";

     

       6756
       6756
       +
             sha256 = "1xy0vp9sgqjm6qpfic2bbla4mxihw7j41gvi8cn0wsira6qcwda0";

     

       6745
       6757
        
           };

     

       6746
       6758
        
           meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";

     

       6747
       6759
        
         };

     
···

       6868
       6880
        
       

     

       6869
       6881
        
         vim-visual-multi = buildVimPluginFrom2Nix {

     

       6870
       6882
        
           pname = "vim-visual-multi";

     

       6871
       6871
       -
           version = "2020-09-15";

     

       6883
       6883
       +
           version = "2020-09-20";

     

       6872
       6884
        
           src = fetchFromGitHub {

     

       6873
       6885
        
             owner = "mg979";

     

       6874
       6886
        
             repo = "vim-visual-multi";

     

       6875
       6875
       -
             rev = "d74c0b97ab0514ac924daa6dde87bee005d3469a";

     

       6876
       6876
       -
             sha256 = "0jg2prsdfhs0vq43flsm8clhbamnddpafn2ajwjcxgyjb6dn6ndj";

     

       6887
       6887
       +
             rev = "68c9570285f067020f0358623cafe63dbc2bd63f";

     

       6888
       6888
       +
             sha256 = "1dpv6v449bcn6n72jjgvlnc9mnq3cpfy9b8m6mmjgvzgzkc1wj10";

     

       6877
       6889
        
           };

     

       6878
       6890
        
           meta.homepage = "https://github.com/mg979/vim-visual-multi/";

     

       6879
       6891
        
         };

     
···

       6892
       6904
        
       

     

       6893
       6905
        
         vim-vsnip = buildVimPluginFrom2Nix {

     

       6894
       6906
        
           pname = "vim-vsnip";

     

       6895
       6895
       -
           version = "2020-09-17";

     

       6907
       6907
       +
           version = "2020-09-23";

     

       6896
       6908
        
           src = fetchFromGitHub {

     

       6897
       6909
        
             owner = "hrsh7th";

     

       6898
       6910
        
             repo = "vim-vsnip";

     

       6899
       6899
       -
             rev = "3d2d4b8e6cb219d615d54e3fa31288ff85879711";

     

       6900
       6900
       -
             sha256 = "1iadzwzf0v64a89zavw9dh1n6cp7388npm7zihcfdflhisrbrk22";

     

       6911
       6911
       +
             rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f";

     

       6912
       6912
       +
             sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90";

     

       6901
       6913
        
           };

     

       6902
       6914
        
           meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

     

       6903
       6915
        
         };

     
···

       6952
       6964
        
       

     

       6953
       6965
        
         vim-which-key = buildVimPluginFrom2Nix {

     

       6954
       6966
        
           pname = "vim-which-key";

     

       6955
       6955
       -
           version = "2020-09-14";

     

       6967
       6967
       +
           version = "2020-09-22";

     

       6956
       6968
        
           src = fetchFromGitHub {

     

       6957
       6969
        
             owner = "liuchengxu";

     

       6958
       6970
        
             repo = "vim-which-key";

     

       6959
       6959
       -
             rev = "2109edb1706b26dab64a1851bd934571d5b48dc1";

     

       6960
       6960
       -
             sha256 = "12zmhv49wx1h1zd28l9591iglipx2avmfwg7qk918sgx96bym1sf";

     

       6971
       6971
       +
             rev = "89644adb8cc75ea96b4ab8e8218f22f1cc0deb23";

     

       6972
       6972
       +
             sha256 = "1cyzfj86qizqnqi3ypf0cx4pvl9bsas77pxd1jpb5f3lslh2xhh8";

     

       6961
       6973
        
           };

     

       6962
       6974
        
           meta.homepage = "https://github.com/liuchengxu/vim-which-key/";

     

       6963
       6975
        
         };

     
···

       7144
       7156
        
       

     

       7145
       7157
        
         vimspector = buildVimPluginFrom2Nix {

     

       7146
       7158
        
           pname = "vimspector";

     

       7147
       7147
       -
           version = "2020-09-11";

     

       7159
       7159
       +
           version = "2020-09-19";

     

       7148
       7160
        
           src = fetchFromGitHub {

     

       7149
       7161
        
             owner = "puremourning";

     

       7150
       7162
        
             repo = "vimspector";

     

       7151
       7151
       -
             rev = "173f2d6f375bc58bffc6b871c5786ba183af09ee";

     

       7152
       7152
       -
             sha256 = "0gyqp71c21yd134065c6brf3avlwy4s9zzf471gal7y41kap5ya4";

     

       7163
       7163
       +
             rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c";

     

       7164
       7164
       +
             sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3";

     

       7153
       7165
        
             fetchSubmodules = true;

     

       7154
       7166
        
           };

     

       7155
       7167
        
           meta.homepage = "https://github.com/puremourning/vimspector/";

     
···

       7157
       7169
        
       

     

       7158
       7170
        
         vimtex = buildVimPluginFrom2Nix {

     

       7159
       7171
        
           pname = "vimtex";

     

       7160
       7160
       -
           version = "2020-09-16";

     

       7172
       7172
       +
           version = "2020-09-24";

     

       7161
       7173
        
           src = fetchFromGitHub {

     

       7162
       7174
        
             owner = "lervag";

     

       7163
       7175
        
             repo = "vimtex";

     

       7164
       7164
       -
             rev = "9b53bb31a04e4ad4aaad43f3b5200f2494c256ae";

     

       7165
       7165
       -
             sha256 = "180w0ajhjvwscl1f0w15yrb1lhvxm878izici1wj0sn06gkb51cp";

     

       7176
       7176
       +
             rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde";

     

       7177
       7177
       +
             sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq";

     

       7166
       7178
        
           };

     

       7167
       7179
        
           meta.homepage = "https://github.com/lervag/vimtex/";

     

       7168
       7180
        
         };

     
···

       7205
       7217
        
       

     

       7206
       7218
        
         vista-vim = buildVimPluginFrom2Nix {

     

       7207
       7219
        
           pname = "vista-vim";

     

       7208
       7208
       -
           version = "2020-09-17";

     

       7220
       7220
       +
           version = "2020-09-22";

     

       7209
       7221
        
           src = fetchFromGitHub {

     

       7210
       7222
        
             owner = "liuchengxu";

     

       7211
       7223
        
             repo = "vista.vim";

     

       7212
       7212
       -
             rev = "7972a7c6ebb3d5a1ab505605477b0fb79b5a7700";

     

       7213
       7213
       -
             sha256 = "0qh8kwvl5dbc3k3pqfpc7liqvisjh08v7w9igrh719v0zdhdlyhv";

     

       7224
       7224
       +
             rev = "9c9adf16db3445005181751f0d3db143d58fe24d";

     

       7225
       7225
       +
             sha256 = "0d1c2p63kkvhgwcrj97qc4yahnx7z9q14qwadbj924w8qlvylmff";

     

       7214
       7226
        
           };

     

       7215
       7227
        
           meta.homepage = "https://github.com/liuchengxu/vista.vim/";

     

       7216
       7228
        
         };

     
···

       7338
       7350
        
       

     

       7339
       7351
        
         YouCompleteMe = buildVimPluginFrom2Nix {

     

       7340
       7352
        
           pname = "YouCompleteMe";

     

       7341
       7341
       -
           version = "2020-09-16";

     

       7353
       7353
       +
           version = "2020-09-20";

     

       7342
       7354
        
           src = fetchFromGitHub {

     

       7343
       7355
        
             owner = "ycm-core";

     

       7344
       7356
        
             repo = "YouCompleteMe";

     

       7345
       7345
       -
             rev = "d98f896ada495c3687007313374b2f945a2f2fb4";

     

       7346
       7346
       -
             sha256 = "1p6x5qd6zvzg3ypllsgl7n9vk18g67dqyqg4zg9j07c9fsqs6383";

     

       7357
       7357
       +
             rev = "4891999f055167cf845671c231d7740c104074bd";

     

       7358
       7358
       +
             sha256 = "0cgbrgw1ppk7a8vwg0j2zf123clczkf9qv6gaaqmm8kz9j2n4pkb";

     

       7347
       7359
        
             fetchSubmodules = true;

     

       7348
       7360
        
           };

     

       7349
       7361
        
           meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";

     
···

       7387
       7399
        
       

     

       7388
       7400
        
         zig-vim = buildVimPluginFrom2Nix {

     

       7389
       7401
        
           pname = "zig-vim";

     

       7390
       7390
       -
           version = "2020-09-14";

     

       7402
       7402
       +
           version = "2020-09-20";

     

       7391
       7403
        
           src = fetchFromGitHub {

     

       7392
       7404
        
             owner = "ziglang";

     

       7393
       7405
        
             repo = "zig.vim";

     

       7394
       7394
       -
             rev = "9e26b43ada8959f533604be3622fa56bf1d54752";

     

       7395
       7395
       -
             sha256 = "1hlqnq83fl0jma0w7pra1iwq174gc2v32sfcjg39yd3hv9dmkl4v";

     

       7406
       7406
       +
             rev = "9979e503e675b432c55a83891238c631f7f16a01";

     

       7407
       7407
       +
             sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c";

     

       7396
       7408
        
           };

     

       7397
       7409
        
           meta.homepage = "https://github.com/ziglang/zig.vim/";

     

       7398
       7410
        
         };

pkgs/misc/vim-plugins/vim-plugin-names

···

       492
       492
        
       thosakwe/vim-flutter

     

       493
       493
        
       tiagofumo/vim-nerdtree-syntax-highlight

     

       494
       494
        
       tikhomirov/vim-glsl

     

       495
       495
       +
       tjdevries/lsp_extensions.nvim

     

       495
       496
        
       tmhedberg/SimpylFold

     

       496
       497
        
       tmsvg/pear-tree

     

       497
       498
        
       tmux-plugins/vim-tmux

+12

pkgs/misc/vscode-extensions/default.nix

···

       60
       60
        
           };

     

       61
       61
        
         };

     

       62
       62
        
       

     

       63
       63
       +
         haskell.haskell = buildVscodeMarketplaceExtension {

     

       64
       64
       +
           mktplcRef = {

     

       65
       65
       +
             name = "haskell";

     

       66
       66
       +
             publisher = "haskell";

     

       67
       67
       +
             version = "1.1.0";

     

       68
       68
       +
             sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb";

     

       69
       69
       +
           };

     

       70
       70
       +
           meta = with stdenv.lib; {

     

       71
       71
       +
             license = licenses.mit;

     

       72
       72
       +
           };

     

       73
       73
       +
         };

     

       74
       74
       +
       

     

       63
       75
        
         james-yu.latex-workshop = buildVscodeMarketplaceExtension {

     

       64
       76
        
           mktplcRef = {

     

       65
       77
        
             name = "latex-workshop";

+7 -8

pkgs/os-specific/linux/cryptodev/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, kernel ? false }:

     

       1
       1
       +
       { fetchFromGitHub, stdenv, kernel ? false }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "cryptodev-linux-1.9";

     

       4
       4
       +
         pname = "cryptodev-linux-1.11";

     

       5
       5
        
         name = "${pname}-${kernel.version}";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           urls = [

     

       9
       9
       -
             "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz"

     

       10
       10
       -
           ];

     

       11
       11
       -
           sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z";

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "cryptodev-linux";

     

       9
       9
       +
           repo = "cryptodev-linux";

     

       10
       10
       +
           rev = pname;

     

       11
       11
       +
           sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         hardeningDisable = [ "pic" ];

     
···

       22
       22
        
           homepage = "http://cryptodev-linux.org/";

     

       23
       23
        
           license = stdenv.lib.licenses.gpl2Plus;

     

       24
       24
        
           platforms = stdenv.lib.platforms.linux;

     

       25
       25
       -
           broken = !stdenv.lib.versionOlder kernel.version "4.13";

     

       26
       25
        
         };

     

       27
       26
        
       }

+38

pkgs/os-specific/linux/firmware/firmware-manager/default.nix

···

       1
       1
       +
       { rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:

     

       2
       2
       +
       rustPlatform.buildRustPackage rec {

     

       3
       3
       +
         pname = "firmware-manager";

     

       4
       4
       +
         version = "0.1.1";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchFromGitHub {

     

       7
       7
       +
           owner = "pop-os";

     

       8
       8
       +
           repo = pname;

     

       9
       9
       +
           rev = version;

     

       10
       10
       +
           sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];

     

       16
       16
       +
       

     

       17
       17
       +
         depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen";

     

       18
       18
       +
       

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           sed -i 's|etc|$(prefix)/etc|' Makefile

     

       21
       21
       +
         '';

     

       22
       22
       +
       

     

       23
       23
       +
         buildPhase = "make prefix='$(out)'";

     

       24
       24
       +
       

     

       25
       25
       +
         installPhase = "make prefix='$(out)' install";

     

       26
       26
       +
       

     

       27
       27
       +
         cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg";

     

       28
       28
       +
       

     

       29
       29
       +
         doCheck = false;

     

       30
       30
       +
       

     

       31
       31
       +
         meta = {

     

       32
       32
       +
           description = "Graphical frontend for firmware management";

     

       33
       33
       +
           homepage = "https://github.com/pop-os/firmware-manager";

     

       34
       34
       +
           license = lib.licenses.gpl3;

     

       35
       35
       +
           maintainers = [ lib.maintainers.shlevy ];

     

       36
       36
       +
           platforms = lib.platforms.linux;

     

       37
       37
       +
         };

     

       38
       38
       +
       }

+39

pkgs/os-specific/linux/firmware/system76-firmware/default.nix

···

       1
       1
       +
       { rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }:

     

       2
       2
       +
       rustPlatform.buildRustPackage rec {

     

       3
       3
       +
         pname = "system76-firmware";

     

       4
       4
       +
         # Check Makefile when updating, make sure postInstall matches make install

     

       5
       5
       +
         version = "1.0.17";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "pop-os";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         nativeBuildInputs = [ pkgconfig makeWrapper ];

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ lzma openssl dbus ];

     

       17
       17
       +
       

     

       18
       18
       +
         cargoBuildFlags = [ "--workspace" ];

     

       19
       19
       +
       

     

       20
       20
       +
         cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s";

     

       21
       21
       +
       

     

       22
       22
       +
         # Purposefully don't install systemd unit file, that's for NixOS

     

       23
       23
       +
         postInstall = ''

     

       24
       24
       +
           install -D -m -0644 data/system76-firmware-daemon.conf $out/etc/dbus-1/system.d/system76-firmware-daemon.conf

     

       25
       25
       +
       

     

       26
       26
       +
           for bin in $out/bin/system76-firmware-*

     

       27
       27
       +
           do

     

       28
       28
       +
             wrapProgram $bin --prefix PATH : "${efibootmgr}/bin"

     

       29
       29
       +
           done

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "Tools for managing firmware updates for system76 devices.";

     

       34
       34
       +
           homepage = "https://github.com/pop-os/system76-firmware";

     

       35
       35
       +
           license = lib.licenses.gpl3;

     

       36
       36
       +
           maintainers = [ lib.maintainers.shlevy ];

     

       37
       37
       +
           platforms = lib.platforms.linux;

     

       38
       38
       +
         };

     

       39
       39
       +
       }

+2 -2

pkgs/os-specific/linux/fwts/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "fwts";

     

       6
       6
       -
         version = "20.07.00";

     

       6
       6
       +
         version = "20.08.00";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchzip {

     

       9
       9
        
           url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0azhcnlfziwn8wvw3fly2jfjyg53m8zba3jlcxgzrasgb0kvzb1c";

     

       10
       10
       +
           sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q";

     

       11
       11
        
           stripRoot = false;

     

       12
       12
        
         };

     

       13
       13

+2 -2

pkgs/os-specific/linux/iw/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "iw";

     

       5
       5
       -
         version = "5.4";

     

       5
       5
       +
         version = "5.8";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "0prrgb11pjrr6dw71v7nx2bic127qzrjifvz183v3mw8f1kryim2";

     

       9
       9
       +
           sha256 = "1d1dfynrzh52zdia1l23ajv4q5wixgffnc1gkz05qrxnn2n4p75m";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ pkgconfig ];

+6 -6

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       10
       10
        
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch"

     

       11
       11
        
           },

     

       12
       12
        
           "5.4": {

     

       13
       13
       -
               "name": "linux-hardened-5.4.65.a.patch",

     

       14
       14
       -
               "sha256": "028nxwjy2sp5bvi9m76nl9x1gyrk4752p376bwvz1h47ljw2hwni",

     

       15
       15
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.65.a/linux-hardened-5.4.65.a.patch"

     

       13
       13
       +
               "name": "linux-hardened-5.4.67.a.patch",

     

       14
       14
       +
               "sha256": "0jpjc1magvlhfwrx43n68xcxxk1g5w2g0rvp92n7yli0db97k1bm",

     

       15
       15
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.67.a/linux-hardened-5.4.67.a.patch"

     

       16
       16
        
           },

     

       17
       17
        
           "5.7": {

     

       18
       18
        
               "name": "linux-hardened-5.7.19.a.patch",

     
···

       20
       20
        
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch"

     

       21
       21
        
           },

     

       22
       22
        
           "5.8": {

     

       23
       23
       -
               "name": "linux-hardened-5.8.10.a.patch",

     

       24
       24
       -
               "sha256": "0myfn5iz7gljj977fwsi3vzvm3n66yihrj2w207m3sr9mw9hp6d9",

     

       25
       25
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.10.a/linux-hardened-5.8.10.a.patch"

     

       23
       23
       +
               "name": "linux-hardened-5.8.11.a.patch",

     

       24
       24
       +
               "sha256": "0cbmlwfzh9ppcvih437sp832rkhr7dfhx97drnkz4gysfyiyh07l",

     

       25
       25
       +
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.11.a/linux-hardened-5.8.11.a.patch"

     

       26
       26
        
           }

     

       27
       27
        
       }

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.198";

     

       6
       6
       +
         version = "4.14.199";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "00xmij2l4qmx1s07hplxkn9ddlwiyalh2l5fqdk6d8v031cbmyhy";

     

       16
       16
       +
           sha256 = "1yflafb0n783igghk6d392pk6lbk3p2w7y01ams08f1b4qm47wq2";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.19.146";

     

       6
       6
       +
         version = "4.19.147";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim";

     

       16
       16
       +
           sha256 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.4.nix

···

       1
       1
        
       { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.4.236";

     

       4
       4
       +
         version = "4.4.237";

     

       5
       5
        
         extraMeta.branch = "4.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1v1mx16x1crnxf4pix0bhw40lq89n7wpd66gjc2mhxi75h6x6i80";

     

       9
       9
       +
           sha256 = "1q6hwjwvlsikgr8b04l7v2jia2wyqxgbli6i7y20aq49h13ap2qk";

     

       10
       10
        
         };

     

       11
       11
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.9.nix

···

       1
       1
        
       { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

     

       2
       2
        
       

     

       3
       3
        
       buildLinux (args // rec {

     

       4
       4
       -
         version = "4.9.236";

     

       4
       4
       +
         version = "4.9.237";

     

       5
       5
        
         extraMeta.branch = "4.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       9
       9
       -
           sha256 = "1ma2z0nvby4qyxzi3vxa28f0wvlnl74njk6cryjrqaksq6161qp7";

     

       9
       9
       +
           sha256 = "07w6mwgh7i3bvg1w3w5i9kgxjmvqr7cv7nzrmx7j9p6cq295gv41";

     

       10
       10
        
         };

     

       11
       11
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.4.66";

     

       6
       6
       +
         version = "5.4.67";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz";

     

       16
       16
       +
           sha256 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.8.nix

···

       3
       3
        
       with stdenv.lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.8.10";

     

       6
       6
       +
         version = "5.8.11";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx";

     

       16
       16
       +
           sha256 = "0jy0yrrixzql9dlk9305w98pja2pm6ijrdbai326595pnk740n9y";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+3 -3

pkgs/os-specific/linux/kernel/linux-rt-5.4.nix

···

       6
       6
        
       , ... } @ args:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         version = "5.4.61-rt37"; # updated by ./update-rt.sh

     

       9
       9
       +
         version = "5.4.66-rt38"; # updated by ./update-rt.sh

     

       10
       10
        
         branch = lib.versions.majorMinor version;

     

       11
       11
        
         kversion = builtins.elemAt (lib.splitString "-" version) 0;

     

       12
       12
        
       in buildLinux (args // {

     
···

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

     

       17
       17
       -
           sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6";

     

       17
       17
       +
           sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         kernelPatches = let rt-patch = {

     

       21
       21
        
           name = "rt";

     

       22
       22
        
           patch = fetchurl {

     

       23
       23
        
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

     

       24
       24
       -
             sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj";

     

       24
       24
       +
             sha256 = "1w0v5wl5fhxl5axd4701dljxhv9rywpgiix3yv7l6i3c5b8iw1zi";

     

       25
       25
        
           };

     

       26
       26
        
         }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

     

       27
       27

+37 -6

pkgs/os-specific/linux/lockdep/default.nix

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, bash, flex, bison, valgrind }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "lockdep";

     

       5
       5
       -
         version = "4.1.2";

     

       6
       6
       -
         fullver = "4.1.2";

     

       7
       5
        
       

     

       6
       6
       +
         # it would be nice to be able to pick a kernel version in sync with something

     

       7
       7
       +
         # else we already ship, but it seems userspace lockdep isn't very well maintained

     

       8
       8
       +
         # and appears broken in many kernel releases

     

       9
       9
       +
         version = "5.0.21";

     

       10
       10
       +
         fullver = "5.0.21";

     

       8
       11
        
         src = fetchurl {

     

       9
       9
       -
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       10
       10
       -
           sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";

     

       12
       12
       +
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       13
       13
       +
           sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq";

     

       11
       14
        
         };

     

       12
       15
        
       

     

       13
       13
       -
         preConfigure = "cd tools/lib/lockdep";

     

       16
       16
       +
         # ensure *this* kernel's userspace-headers are picked up before we

     

       17
       17
       +
         # fall back to those in glibc, as they will be from a mismatched

     

       18
       18
       +
         # kernel version

     

       19
       19
       +
         postPatch = ''

     

       20
       20
       +
           substituteInPlace tools/lib/lockdep/Makefile \

     

       21
       21
       +
             --replace 'CONFIG_INCLUDES =' $'CONFIG_INCLUDES = -I../../../usr/include\n#'

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [ flex bison ];

     

       25
       25
       +
       

     

       26
       26
       +
         buildPhase = ''

     

       27
       27
       +
           make defconfig

     

       28
       28
       +
           make headers_install

     

       29
       29
       +
           cd tools/lib/lockdep

     

       30
       30
       +
           make

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         doCheck = true;

     

       34
       34
       +
         checkInputs = [ valgrind ];

     

       35
       35
       +
         checkPhase = ''

     

       36
       36
       +
           # there are more /bin/bash references than just shebangs

     

       37
       37
       +
           for f in lockdep run_tests.sh tests/*.sh; do

     

       38
       38
       +
             substituteInPlace $f \

     

       39
       39
       +
               --replace '/bin/bash' '${bash}/bin/bash'

     

       40
       40
       +
           done

     

       41
       41
       +
       

     

       42
       42
       +
           ./run_tests.sh

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       14
       45
        
         installPhase = ''

     

       15
       46
        
           mkdir -p $out/bin $out/lib $out/include

     

       16
       47

+11

pkgs/os-specific/linux/nvidia-x11/default.nix

···

       32
       32
        
         # No active beta right now

     

       33
       33
        
         beta = stable;

     

       34
       34
        
       

     

       35
       35
       +
         # Vulkan developer beta driver

     

       36
       36
       +
         vulkan_beta = generic {

     

       37
       37
       +
           version = "450.56.11";

     

       38
       38
       +
           persistencedVersion = "450.57";

     

       39
       39
       +
           settingsVersion = "450.57";

     

       40
       40
       +
           sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010";

     

       41
       41
       +
           settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan";

     

       42
       42
       +
           persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5";

     

       43
       43
       +
           url = "https://developer.nvidia.com/vulkan-beta-4505611-linux";

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       35
       46
        
         # Last one supporting x86

     

       36
       47
        
         legacy_390 = generic {

     

       37
       48
        
           version = "390.138";

+7 -3

pkgs/os-specific/linux/nvidia-x11/generic.nix

···

       1
       1
        
       { version

     

       2
       2
       +
       , url ? null

     

       2
       3
        
       , sha256_32bit ? null

     

       3
       4
        
       , sha256_64bit

     

       4
       5
        
       , settingsSha256

     

       6
       6
       +
       , settingsVersion ? version

     

       5
       7
        
       , persistencedSha256

     

       8
       8
       +
       , persistencedVersion ? version

     

       6
       9
        
       , useGLVND ? true

     

       7
       10
        
       , useProfiles ? true

     

       8
       11
        
       , preferGtk2 ? false

     
···

       11
       14
        
       , prePatch ? ""

     

       12
       15
        
       , patches ? []

     

       13
       16
        
       , broken ? false

     

       14
       14
       -
       }:

     

       17
       17
       +
       }@args:

     

       15
       18
        
       

     

       16
       19
        
       { stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl

     

       17
       20
        
       , kernel ? null, perl, nukeReferences

     
···

       46
       49
        
           src =

     

       47
       50
        
             if stdenv.hostPlatform.system == "x86_64-linux" then

     

       48
       51
        
               fetchurl {

     

       49
       49
       -
                 url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";

     

       52
       52
       +
                 url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";

     

       50
       53
        
                 sha256 = sha256_64bit;

     

       51
       54
        
               }

     

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

     

       53
       56
        
               fetchurl {

     

       54
       54
       -
                 url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";

     

       57
       57
       +
                 url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";

     

       55
       58
        
                 sha256 = sha256_32bit;

     

       56
       59
        
               }

     

       57
       60
        
             else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";

     
···

       89
       92
        
               withGtk3 = !preferGtk2;

     

       90
       93
        
             };

     

       91
       94
        
             persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;

     

       95
       95
       +
             inherit persistencedVersion settingsVersion;

     

       92
       96
        
           };

     

       93
       97
        
       

     

       94
       98
        
           meta = with stdenv.lib; {

+3 -3

pkgs/os-specific/linux/nvidia-x11/persistenced.nix

···

       2
       2
        
       

     

       3
       3
        
       { stdenv, fetchFromGitHub, m4 }:

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation {

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "nvidia-persistenced";

     

       7
       7
       -
         inherit (nvidia_x11) version;

     

       7
       7
       +
         version = nvidia_x11.persistencedVersion;

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "NVIDIA";

     

       11
       11
        
           repo = "nvidia-persistenced";

     

       12
       12
       -
           rev = nvidia_x11.version;

     

       12
       12
       +
           rev = nvidia_x11.persistencedVersion;

     

       13
       13
        
           inherit sha256;

     

       14
       14
        
         };

     

       15
       15

+3 -3

pkgs/os-specific/linux/nvidia-x11/settings.nix

···

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "NVIDIA";

     

       11
       11
        
           repo = "nvidia-settings";

     

       12
       12
       -
           rev = nvidia_x11.version;

     

       12
       12
       +
           rev = nvidia_x11.settingsVersion;

     

       13
       13
        
           inherit sha256;

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         libXNVCtrl = stdenv.mkDerivation {

     

       17
       17
        
           pname = "libXNVCtrl";

     

       18
       18
       -
           inherit (nvidia_x11) version;

     

       18
       18
       +
           version = nvidia_x11.settingsVersion;

     

       19
       19
        
           inherit src;

     

       20
       20
        
       

     

       21
       21
        
           buildInputs = [ libXrandr libXext ];

     
···

       42
       42
        
       

     

       43
       43
        
       stdenv.mkDerivation {

     

       44
       44
        
         pname = "nvidia-settings";

     

       45
       45
       -
         inherit (nvidia_x11) version;

     

       45
       45
       +
         version = nvidia_x11.settingsVersion;

     

       46
       46
        
         inherit src;

     

       47
       47
        
       

     

       48
       48
        
         nativeBuildInputs = [ pkgconfig m4 ];

pkgs/os-specific/linux/system76-acpi/default.nix

···

       25
       25
        
       

     

       26
       26
        
         installPhase = ''

     

       27
       27
        
           install -D system76_acpi.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76_acpi.ko

     

       28
       28
       +
           mkdir -p $out/lib/udev/hwdb.d

     

       29
       29
       +
           mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d

     

       28
       30
        
         '';

     

       29
       31
        
       

     

       30
       32
        
         meta = with stdenv.lib; {

pkgs/os-specific/linux/system76/default.nix

···

       25
       25
        
       

     

       26
       26
        
         installPhase = ''

     

       27
       27
        
           install -D system76.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76.ko

     

       28
       28
       +
           mkdir -p $out/lib/udev/hwdb.d

     

       29
       29
       +
           mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d

     

       28
       30
        
         '';

     

       29
       31
        
       

     

       30
       32
        
         meta = with stdenv.lib; {

+3 -3

pkgs/servers/amqp/rabbitmq-server/default.nix

···

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "rabbitmq-server";

     

       10
       10
        
       

     

       11
       11
       -
         version = "3.8.5";

     

       11
       11
       +
         version = "3.8.8";

     

       12
       12
        
       

     

       13
       13
        
         # when updating, consider bumping elixir version in all-packages.nix

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456";

     

       16
       16
       +
           sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs =

     
···

       62
       62
        
         meta = {

     

       63
       63
        
           homepage = "https://www.rabbitmq.com/";

     

       64
       64
        
           description = "An implementation of the AMQP messaging protocol";

     

       65
       65
       -
           license = stdenv.lib.licenses.mpl11;

     

       65
       65
       +
           license = stdenv.lib.licenses.mpl20;

     

       66
       66
        
           platforms = stdenv.lib.platforms.unix;

     

       67
       67
        
           maintainers = with stdenv.lib.maintainers; [ Profpatsch ];

     

       68
       68
        
         };

+11 -12

pkgs/servers/dns/bind/default.nix

···

       1
       1
        
       { config, stdenv, lib, fetchurl, fetchpatch

     

       2
       2
       -
       , perl

     

       3
       3
       -
       , libcap, libtool, libxml2, openssl

     

       2
       2
       +
       , perl, pkg-config

     

       3
       3
       +
       , libcap, libtool, libxml2, openssl, libuv

     

       4
       4
        
       , enablePython ? config.bind.enablePython or false, python3 ? null

     

       5
       5
       -
       , enableSeccomp ? false, libseccomp ? null, buildPackages

     

       5
       5
       +
       , enableSeccomp ? false, libseccomp ? null, buildPackages, nixosTests

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       assert enableSeccomp -> libseccomp != null;

     
···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "bind";

     

       13
       13
       -
         version = "9.14.12";

     

       13
       13
       +
         version = "9.16.7";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
       -
           url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";

     

       17
       17
       -
           sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw";

     

       16
       16
       +
           url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";

     

       17
       17
       +
           sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

     
···

       24
       24
        
           ./remove-mkdir-var.patch

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       -
         nativeBuildInputs = [ perl ];

     

       28
       28
       -
         buildInputs = [ libtool libxml2 openssl ]

     

       27
       27
       +
         nativeBuildInputs = [ perl pkg-config ];

     

       28
       28
       +
         buildInputs = [ libtool libxml2 openssl libuv ]

     

       29
       29
        
           ++ lib.optional stdenv.isLinux libcap

     

       30
       30
        
           ++ lib.optional enableSeccomp libseccomp

     

       31
       31
        
           ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));

     
···

       35
       35
        
         configureFlags = [

     

       36
       36
        
           "--localstatedir=/var"

     

       37
       37
        
           "--with-libtool"

     

       38
       38
       -
           "--with-libxml2=${libxml2.dev}"

     

       39
       39
       -
           "--with-openssl=${openssl.dev}"

     

       40
       38
        
           (if enablePython then "--with-python" else "--without-python")

     

       41
       39
        
           "--without-atf"

     

       42
       40
        
           "--without-dlopen"

     
···

       59
       57
        
       

     

       60
       58
        
         postInstall = ''

     

       61
       59
        
           moveToOutput bin/bind9-config $dev

     

       62
       62
       -
           moveToOutput bin/isc-config.sh $dev

     

       63
       60
        
       

     

       64
       61
        
           moveToOutput bin/host $host

     

       65
       62
        
       

     
···

       68
       65
        
           moveToOutput bin/nslookup $dnsutils

     

       69
       66
        
           moveToOutput bin/nsupdate $dnsutils

     

       70
       67
        
       

     

       71
       71
       -
           for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do

     

       68
       68
       +
           for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do

     

       72
       69
        
             sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'

     

       73
       70
        
           done

     

       74
       71
        
         '';

     

       75
       72
        
       

     

       76
       73
        
         doCheck = false; # requires root and the net

     

       74
       74
       +
       

     

       75
       75
       +
         passthru.tests = { inherit (nixosTests) bind; };

     

       77
       76
        
       

     

       78
       77
        
         meta = with stdenv.lib; {

     

       79
       78
        
           homepage = "https://www.isc.org/downloads/bind/";

+22 -25

pkgs/servers/dns/bind/dont-keep-configure-flags.patch

···

       1
       1
       -
       diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h

     

       2
       2
       -
       index b8e356b..cbe6c94 100644

     

       3
       3
       -
       --- a/bin/named/include/named/globals.h

     

       4
       4
       -
       +++ b/bin/named/include/named/globals.h

     

       5
       5
       -
       @@ -68,7 +68,9 @@ EXTERN const char *		named_g_version		INIT(VERSION);

     

       6
       6
       -
        EXTERN const char *		named_g_product		INIT(PRODUCT);

     

       7
       7
       -
        EXTERN const char *		named_g_description	INIT(DESCRIPTION);

     

       8
       8
       -
        EXTERN const char *		named_g_srcid		INIT(SRCID);

     

       1
       1
       +
       diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h

     

       2
       2
       +
       --- a/bin/named/include/named/globals.h	2020-09-24 17:43:49.398977491 +0200

     

       3
       3
       +
       +++ b/bin/named/include/named/globals.h	2020-09-24 17:44:36.826590553 +0200

     

       4
       4
       +
       @@ -69,7 +69,9 @@

     

       5
       5
       +
        EXTERN const char *named_g_product     INIT(PRODUCT);

     

       6
       6
       +
        EXTERN const char *named_g_description INIT(DESCRIPTION);

     

       7
       7
       +
        EXTERN const char *named_g_srcid       INIT(SRCID);

     

       9
       8
        
       +#if 0

     

       10
       10
       -
        EXTERN const char *		named_g_configargs	INIT(CONFIGARGS);

     

       9
       9
       +
        EXTERN const char *named_g_configargs  INIT(CONFIGARGS);

     

       11
       10
        
       +#endif

     

       12
       12
       -
        EXTERN const char *		named_g_builder		INIT(BUILDER);

     

       13
       13
       -
        EXTERN in_port_t		named_g_port		INIT(0);

     

       14
       14
       -
        EXTERN isc_dscp_t		named_g_dscp		INIT(-1);

     

       15
       15
       -
       diff --git a/bin/named/main.c b/bin/named/main.c

     

       16
       16
       -
       index 62d9ce3..342abdc 100644

     

       17
       17
       -
       --- a/bin/named/main.c

     

       18
       18
       -
       +++ b/bin/named/main.c

     

       19
       19
       -
       @@ -459,8 +459,10 @@ printversion(bool verbose) {

     

       11
       11
       +
        EXTERN const char *named_g_builder     INIT(BUILDER);

     

       12
       12
       +
        EXTERN in_port_t named_g_port	       INIT(0);

     

       13
       13
       +
        EXTERN isc_dscp_t named_g_dscp	       INIT(-1);

     

       14
       14
       +
       diff -ru a/bin/named/main.c b/bin/named/main.c

     

       15
       15
       +
       --- a/bin/named/main.c	2020-09-24 17:43:49.399977504 +0200

     

       16
       16
       +
       +++ b/bin/named/main.c	2020-09-24 17:44:24.102426273 +0200

     

       17
       17
       +
       @@ -506,7 +506,9 @@

     

       20
       18
        
        	}

     

       21
       19
        
        

     

       22
       20
        
        	printf("running on %s\n", named_os_uname());

     

       23
       21
        
       +#if 0

     

       24
       24
       -
        	printf("built by %s with %s\n",

     

       25
       25
       -
        	       named_g_builder, named_g_configargs);

     

       22
       22
       +
        	printf("built by %s with %s\n", named_g_builder, named_g_configargs);

     

       26
       23
        
       +#endif

     

       27
       24
        
        #ifdef __clang__

     

       28
       25
        
        	printf("compiled by CLANG %s\n", __VERSION__);

     

       29
       29
       -
        #else

     

       30
       30
       -
       @@ -1001,9 +1003,11 @@ setup(void) {

     

       31
       31
       -
        		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,

     

       32
       32
       -
        		      "running on %s", named_os_uname());

     

       26
       26
       +
        #else /* ifdef __clang__ */

     

       27
       27
       +
       @@ -1102,9 +1104,11 @@

     

       28
       28
       +
        		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s",

     

       29
       29
       +
        		      named_os_uname());

     

       33
       30
        
        

     

       34
       31
        
       +#if 0

     

       35
       32
        
        	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

     

       36
       36
       -
        		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE,

     

       37
       37
       -
        		      "built with %s", named_g_configargs);

     

       33
       33
       +
        		      NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s",

     

       34
       34
       +
        		      named_g_configargs);

     

       38
       35
        
       +#endif

     

       39
       36
        
        

     

       40
       37
        
        	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,

+3 -3

pkgs/servers/imgproxy/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "imgproxy";

     

       5
       5
       -
         version = "2.14.1";

     

       5
       5
       +
         version = "2.15.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

       10
       10
       -
           sha256 = "048bfkazjijf7p0wb5y09qhl7pgg297xxshgmkfyr025d7d50lf4";

     

       10
       10
       +
           sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w";

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "1pvyr3lazza89njdl6q3h2nd0mkvjvbryyrfqv11kd3s52055ckz";

     

       14
       14
       +
         vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+1 -1

pkgs/servers/mail/dovecot/default.nix

···

       84
       84
        
         meta = {

     

       85
       85
        
           homepage = "https://dovecot.org/";

     

       86
       86
        
           description = "Open source IMAP and POP3 email server written with security primarily in mind";

     

       87
       87
       -
           maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ];

     

       87
       87
       +
           maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ];

     

       88
       88
        
           platforms = stdenv.lib.platforms.unix;

     

       89
       89
        
         };

     

       90
       90
        
         passthru.tests = {

+1 -1

pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix

···

       32
       32
        
           homepage = "http://pigeonhole.dovecot.org/";

     

       33
       33
        
           description = "A sieve plugin for the Dovecot IMAP server";

     

       34
       34
        
           license = licenses.lgpl21;

     

       35
       35
       -
           maintainers = with maintainers; [ rickynils globin ];

     

       35
       35
       +
           maintainers = with maintainers; [ globin ];

     

       36
       36
        
           platforms = platforms.unix;

     

       37
       37
        
         };

     

       38
       38
        
       }

+1 -1

pkgs/servers/mail/opensmtpd/default.nix

···

       57
       57
        
           '';

     

       58
       58
        
           license = licenses.isc;

     

       59
       59
        
           platforms = platforms.linux;

     

       60
       60
       -
           maintainers = with maintainers; [ rickynils obadz ekleog ];

     

       60
       60
       +
           maintainers = with maintainers; [ obadz ekleog ];

     

       61
       61
        
         };

     

       62
       62
        
         passthru.tests = {

     

       63
       63
        
           basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd;

+1 -1

pkgs/servers/mail/postfix/default.nix

···

       101
       101
        
           description = "A fast, easy to administer, and secure mail server";

     

       102
       102
        
           license = with licenses; [ ipl10 epl20 ];

     

       103
       103
        
           platforms = platforms.linux;

     

       104
       104
       -
           maintainers = with maintainers; [ rickynils globin ];

     

       104
       104
       +
           maintainers = with maintainers; [ globin ];

     

       105
       105
        
         };

     

       106
       106
        
       

     

       107
       107
        
       }

+4 -4

pkgs/servers/monitoring/grafana/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "grafana";

     

       5
       5
       -
         version = "7.1.5";

     

       5
       5
       +
         version = "7.2.0";

     

       6
       6
        
       

     

       7
       7
        
         excludedPackages = [ "release_publisher" ];

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "grafana";

     

       12
       12
        
           repo = "grafana";

     

       13
       13
       -
           sha256 = "089z2x6jhiv5cx70vm7f1pyj5avappnaxrwah8jbnlkaz2kisp79";

     

       13
       13
       +
           sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         srcStatic = fetchurl {

     

       17
       17
        
           url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";

     

       18
       18
       -
           sha256 = "0l1lw3y5w4s6qfkmclzc6h6hqwxqmxlppnwsq1zpm2hmrndy440j";

     

       18
       18
       +
           sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         vendorSha256 = "0i0qdfh6cjdjg2mrrabm42427aaxs6a90ydb554ds14k6r4jdf8b";

     

       21
       21
       +
         vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1";

     

       22
       22
        
       

     

       23
       23
        
         postPatch = ''

     

       24
       24
        
           substituteInPlace pkg/cmd/grafana-server/main.go \

+2 -2

pkgs/servers/search/groonga/default.nix

···

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
        
       

     

       9
       9
        
         pname = "groonga";

     

       10
       10
       -
         version = "10.0.5";

     

       10
       10
       +
         version = "10.0.6";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";

     

       14
       14
       -
           sha256 = "04rjqmlhv55jmdc159q5ckrakq5iwp18wi72lzl6zy21yk5hxmp0";

     

       14
       14
       +
           sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         buildInputs = with stdenv.lib;

+2 -2

pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pg_auto_failover";

     

       5
       5
       -
         version = "1.3";

     

       5
       5
       +
         version = "1.4.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "citusdata";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4";

     

       11
       11
       +
           sha256 = "1q5gy1jaklk885xjda9dhf6jd5q3sc7jd8p1zdlwv4srxf6sgf10";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ postgresql openssl zlib readline ];

+2 -2

pkgs/shells/dash/default.nix

···

       1
       1
        
       { stdenv, buildPackages, autoreconfHook, fetchurl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "dash-0.5.11.1";

     

       4
       4
       +
         name = "dash-0.5.11.2";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";

     

       8
       8
       -
           sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k";

     

       8
       8
       +
           sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
        
         hardeningDisable = [ "format" ];

+3 -3

pkgs/tools/backup/kopia/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "kopia";

     

       5
       5
       -
         version = "0.6.4";

     

       5
       5
       +
         version = "0.7.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = pname;

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1mq3vx8vrvvh3jrdqhrkbnnfkjsjw5ipw15d0602i1x05fxah4v4";

     

       11
       11
       +
           sha256 = "0k0d9fb9f7zfyh7lifaviz8xnx1ansnh1f4q0rhc547m1y4kdw46";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii";

     

       14
       14
       +
         vendorSha256 = "0br641lh2bqz18p5riv6dh01kr11vbbnrn4i5r80b0lgjy1774sl";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+2 -2

pkgs/tools/filesystems/orangefs/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "orangefs";

     

       7
       7
       -
         version = "2.9.7";

     

       7
       7
       +
         version = "2.9.8";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "http://download.orangefs.org/current/source/orangefs-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "15669f5rcvn44wkas0mld0qmyclrmhbrw4bbbp66sw3a12vgn4sm";

     

       11
       11
       +
           sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ bison flex perl autoreconfHook ];

+40

pkgs/tools/filesystems/ubidump/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, python3, makeWrapper }:

     

       2
       2
       +
       

     

       3
       3
       +
       python3.pkgs.buildPythonApplication rec {

     

       4
       4
       +
       

     

       5
       5
       +
         pname = "ubidump";

     

       6
       6
       +
         version = "unstable-2019-09-11";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "nlitsme";

     

       10
       10
       +
           repo = pname;

     

       11
       11
       +
           rev = "0691f1a9a38604c2baf8c9af6b826eb2632af74a";

     

       12
       12
       +
           sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ];

     

       16
       16
       +
       

     

       17
       17
       +
         phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ];

     

       18
       18
       +
       

     

       19
       19
       +
         patchPhase = ''

     

       20
       20
       +
           sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py

     

       21
       21
       +
           patchShebangs ubidump.py

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           install -D -m755 ubidump.py $out/bin/ubidump

     

       26
       26
       +
           wrapProgram $out/bin/ubidump --set PYTHONPATH $PYTHONPATH

     

       27
       27
       +
         '';

     

       28
       28
       +
       

     

       29
       29
       +
         installCheckPhase = ''

     

       30
       30
       +
           $out/bin/ubidump -h  > /dev/null

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = with stdenv.lib; {

     

       34
       34
       +
           description = "View or extract the contents of UBIFS images";

     

       35
       35
       +
           homepage = "https://github.com/nlitsme/ubidump";

     

       36
       36
       +
           license = licenses.mit;

     

       37
       37
       +
           maintainers = with maintainers; [ sgo ];

     

       38
       38
       +
         };

     

       39
       39
       +
       }

     

       40
       40
       +

+2 -2

pkgs/tools/graphics/gmic/default.nix

···

       15
       15
        
       

     

       16
       16
        
       stdenv.mkDerivation rec {

     

       17
       17
        
         pname = "gmic";

     

       18
       18
       -
         version = "2.9.1";

     

       18
       18
       +
         version = "2.9.2";

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "lib" "dev" "man" ];

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";

     

       24
       24
       -
           sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah";

     

       24
       24
       +
           sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

+2 -2

pkgs/tools/misc/fet-sh/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation rec {

     

       4
       4
        
         pname = "fet-sh";

     

       5
       5
       -
         version = "1.5";

     

       5
       5
       +
         version = "1.7";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "6gk";

     

       9
       9
        
           repo = "fet.sh";

     

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

     

       11
       11
       -
           sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35";

     

       11
       11
       +
           sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         dontBuild = true;

+5 -5

pkgs/tools/misc/miniserve/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pkg-config

     

       5
       5
        
       , zlib

     

       6
       6
       -
       , openssl

     

       7
       6
        
       , Security

     

       8
       7
        
       }:

     

       9
       8
        
       

     

       10
       9
        
       rustPlatform.buildRustPackage rec {

     

       11
       10
        
         pname = "miniserve";

     

       12
       12
       -
         version = "0.8.0";

     

       11
       11
       +
         version = "0.9.0";

     

       13
       12
        
       

     

       14
       13
        
         src = fetchFromGitHub {

     

       15
       14
        
           owner = "svenstaro";

     

       16
       15
        
           repo = "miniserve";

     

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

     

       18
       18
       -
           sha256 = "1h4872jb0xz8yzs02q8wfvqrp20y7kdva5ka6bh6nq4jrnnky8zb";

     

       17
       17
       +
           sha256 = "1abmg2zk1qipqdl1yfj8ibm1w8n7fazxqccsg1gq4xzlhhfp3m2l";

     

       19
       18
        
         };

     

       20
       19
        
       

     

       21
       21
       -
         cargoSha256 = "1vq1rrav9r9z4y0v7hpn0fcq64slq4zrm2pybmnmb7h9nfxxyr6k";

     

       20
       20
       +
         cargoSha256 = "0l750067x8k92ngg32bb8mnbq09aj65sdnpzdhij9n1mh90rkck9";

     

       22
       21
        
       

     

       23
       22
        
         RUSTC_BOOTSTRAP = 1;

     

       24
       23
        
       

     

       25
       24
        
         nativeBuildInputs = [ pkg-config zlib ];

     

       26
       26
       -
         buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];

     

       25
       25
       +
         buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];

     

       27
       26
        
       

     

       28
       27
        
         meta = with stdenv.lib; {

     

       29
       28
        
           description = "For when you really just want to serve some files over HTTP right now!";

     
···

       31
       30
        
           license = with licenses; [ mit ];

     

       32
       31
        
           maintainers = with maintainers; [ nequissimus zowoq ];

     

       33
       32
        
           platforms = platforms.unix;

     

       33
       33
       +
           broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/98181

     

       34
       34
        
         };

     

       35
       35
        
       }

+2 -2

pkgs/tools/misc/wootility/default.nix

···

       9
       9
        
       }:

     

       10
       10
        
       let

     

       11
       11
        
         pname = "wootility";

     

       12
       12
       -
         version = "3.5.10";

     

       12
       12
       +
         version = "3.5.12";

     

       13
       13
        
       in

     

       14
       14
        
       appimageTools.wrapType2 rec {

     

       15
       15
        
         name = "${pname}-${version}";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage";

     

       19
       19
       -
           sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y";

     

       19
       19
       +
           sha256 = "13bhckk25fzq9r9cdsg3yqjd4kn47asqdx8kw0in8iky4ri41vnc";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         profile = ''

+2 -2

pkgs/tools/misc/yubikey-manager/default.nix

···

       3
       3
        
       

     

       4
       4
        
       python3Packages.buildPythonPackage rec {

     

       5
       5
        
         pname = "yubikey-manager";

     

       6
       6
       -
         version = "3.1.0";

     

       6
       6
       +
         version = "3.1.1";

     

       7
       7
        
       

     

       8
       8
        
         srcs = fetchurl {

     

       9
       9
        
           url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1";

     

       10
       10
       +
           sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs =

+3 -5

pkgs/tools/networking/amass/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "amass";

     

       8
       8
       -
         version = "3.10.1";

     

       8
       8
       +
         version = "3.10.3";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "OWASP";

     

       12
       12
        
           repo = "Amass";

     

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

     

       14
       14
       -
           sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y";

     

       14
       14
       +
           sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w";

     

       18
       18
        
       

     

       19
       19
       -
         doCheck = false;

     

       20
       20
       -
       

     

       21
       19
        
         outputs = [ "out" "wordlists" ];

     

       22
       20
        
       

     

       23
       21
        
         postInstall = ''

     

       24
       22
        
           mkdir -p $wordlists

     

       25
       25
       -
           cp -R $src/examples/wordlists/*.txt $wordlists

     

       23
       23
       +
           cp -R examples/wordlists/*.txt $wordlists

     

       26
       24
        
           gzip $wordlists/*.txt

     

       27
       25
        
         '';

     

       28
       26

+2 -2

pkgs/tools/networking/dnsperf/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "dnsperf";

     

       7
       7
       -
         version = "2.3.1";

     

       7
       7
       +
         version = "2.3.4";

     

       8
       8
        
       

     

       9
       9
        
         # The same as the initial commit of the new GitHub repo (only readme changed).

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "DNS-OARC";

     

       12
       12
        
           repo = "dnsperf";

     

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

     

       14
       14
       -
           sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w";

     

       14
       14
       +
           sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         outputs = [ "out" "man" "doc" ];

+3 -3

pkgs/tools/networking/findomain/default.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "findomain";

     

       12
       12
       -
         version = "2.1.1";

     

       12
       12
       +
         version = "2.1.3";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Edu4rdSHL";

     

       16
       16
        
           repo = pname;

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "0v6m0c329wmba2fihnqvrmfnrb5b1l4nm6xr0dsjiwsjpclrmy86";

     

       18
       18
       +
           sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoSha256 = "130kjjig5jsv3kdywj6ag2s55d5hwsslpcnaanrqyl70a6pvgpb2";

     

       21
       21
       +
         cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk";

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ installShellFiles perl ];

     

       24
       24
        
         buildInputs = lib.optional stdenv.isDarwin Security;

+2 -2

pkgs/tools/networking/tridactyl-native/default.nix

···

       7
       7
        
         pname = "tridactyl-native";

     

       8
       8
        
         # this is actually the version of tridactyl itself; the native messenger will

     

       9
       9
        
         # probably not change with every tridactyl version

     

       10
       10
       -
         version = "1.20.0";

     

       10
       10
       +
         version = "1.20.1";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "tridactyl";

     

       14
       14
        
           repo = "tridactyl";

     

       15
       15
        
           rev = version;

     

       16
       16
       -
           sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8";

     

       16
       16
       +
           sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32";

     

       17
       17
        
         };

     

       18
       18
        
         sourceRoot = "source/native";

     

       19
       19

+2 -2

pkgs/tools/security/1password-gui/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "1password";

     

       16
       16
       -
         version = "0.8.6-2";

     

       16
       16
       +
         version = "0.8.7";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";

     

       20
       20
       -
           sha256 = "1m7sql2y2kj94gr607n48m0h4b3rijyzvxrssyizv75spmxr4d5r";

     

       20
       20
       +
           sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ makeWrapper ];

+4 -3

pkgs/tools/security/bettercap/default.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
        
       , buildGoModule

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pkg-config

     
···

       24
       24
        
         doCheck = false;

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [ pkg-config ];

     

       27
       27
       -
         buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ];

     

       27
       27
       +
         buildInputs = [ libpcap libusb1 ]

     

       28
       28
       +
           ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ];

     

       28
       29
        
       

     

       29
       29
       -
         meta = with lib; {

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       30
       31
        
           description = "A man in the middle tool";

     

       31
       32
        
           longDescription = ''

     

       32
       33
        
             BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more.

pkgs/tools/security/fierce/default.nix

···

       11
       11
        
           sha256 = "11yaz8ap9swx95j3wpqh0b6jhw6spqgfnsyn1liw9zqi4jwgiax7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         postPatch = ''

     

       15
       15
       +
           substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython'

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       14
       18
        
         propagatedBuildInputs = [ python3.pkgs.dns ];

     

       19
       19
       +
       

     

       20
       20
       +
         # tests require network access

     

       21
       21
       +
         doCheck = false;

     

       22
       22
       +
         pythonImportsCheck = [ "fierce" ];

     

       15
       23
        
       

     

       16
       24
        
         meta = with stdenv.lib; {

     

       17
       25
        
           homepage = "https://github.com/mschwager/fierce";

+2 -2

pkgs/tools/system/facter/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "facter";

     

       5
       5
       -
         version = "3.14.12";

     

       5
       5
       +
         version = "3.14.13";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
       -
           sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc";

     

       8
       8
       +
           sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39";

     

       9
       9
        
           rev = version;

     

       10
       10
        
           repo = pname;

     

       11
       11
        
           owner = "puppetlabs";

+2 -2

pkgs/tools/system/freeipmi/default.nix

···

       1
       1
        
       { fetchurl, stdenv, libgcrypt, readline, libgpgerror }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "1.6.5";

     

       4
       4
       +
         version = "1.6.6";

     

       5
       5
        
         pname = "freeipmi";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

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

     

       9
       9
       -
           sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1";

     

       9
       9
       +
           sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ libgcrypt readline libgpgerror ];

+1 -1

pkgs/tools/system/rocm-smi/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonApplication rec {

     

       4
       4
        
         pname = "rocm-smi";

     

       5
       5
       -
         version = "3.7.0";

     

       5
       5
       +
         version = "3.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RadeonOpenCompute";

+2 -2

pkgs/tools/text/discount/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "2.2.6";

     

       4
       4
       +
         version = "2.2.7";

     

       5
       5
        
         pname = "discount";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Orc";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w";

     

       11
       11
       +
           sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patches = ./fix-configure-path.patch;

+2 -2

pkgs/tools/text/kdiff3/default.nix

···

       6
       6
        
       

     

       7
       7
        
       mkDerivation rec {

     

       8
       8
        
         pname = "kdiff3";

     

       9
       9
       -
         version = "1.8.3";

     

       9
       9
       +
         version = "1.8.4";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";

     

       13
       13
       -
           sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g";

     

       13
       13
       +
           sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

+51 -25

pkgs/top-level/all-packages.nix

···

       4605
       4605
        
         iperf3 = callPackage ../tools/networking/iperf/3.nix { };

     

       4606
       4606
        
         iperf = iperf3;

     

       4607
       4607
        
       

     

       4608
       4608
       -
         ipfs = callPackage ../applications/networking/ipfs {

     

       4609
       4609
       -
           buildGoModule = buildGo114Module;

     

       4610
       4610
       -
         };

     

       4608
       4608
       +
         ipfs = callPackage ../applications/networking/ipfs { };

     

       4611
       4609
        
         ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };

     

       4612
       4610
        
         ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {

     

       4613
       4611
        
           buildGoModule = buildGo114Module;

     
···

       7597
       7595
        
       

     

       7598
       7596
        
         ua = callPackage ../tools/networking/ua { };

     

       7599
       7597
        
       

     

       7598
       7598
       +
         ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { };

     

       7599
       7599
       +
       

     

       7600
       7600
        
         ubridge = callPackage ../tools/networking/ubridge { };

     

       7601
       7601
        
       

     

       7602
       7602
        
         ucl = callPackage ../development/libraries/ucl { };

     
···

       9376
       9376
        
       

     

       9377
       9377
        
         lizardfs = callPackage ../tools/filesystems/lizardfs { };

     

       9378
       9378
        
       

     

       9379
       9379
       +
         lobster = callPackage ../development/compilers/lobster {

     

       9380
       9380
       +
           inherit (darwin) cf-private;

     

       9381
       9381
       +
           inherit (darwin.apple_sdk.frameworks)

     

       9382
       9382
       +
             Cocoa AudioToolbox OpenGL Foundation ForceFeedback;

     

       9383
       9383
       +
         };

     

       9384
       9384
       +
       

     

       9379
       9385
        
         lld = llvmPackages.lld;

     

       9380
       9386
        
         lld_5 = llvmPackages_5.lld;

     

       9381
       9387
        
         lld_6 = llvmPackages_6.lld;

     
···

       9734
       9740
        
           inherit (darwin.apple_sdk.frameworks) Security;

     

       9735
       9741
        
         };

     

       9736
       9742
        
         cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };

     

       9743
       9743
       +
         cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {};

     

       9737
       9744
        
         cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {

     

       9738
       9745
        
           inherit (darwin.apple_sdk.frameworks) CoreServices Security;

     

       9739
       9746
        
         };

     
···

       10225
       10232
        
       

     

       10226
       10233
        
         pythonInterpreters = callPackage ./../development/interpreters/python {

     

       10227
       10234
        
           # Overrides that apply to all Python interpreters

     

       10228
       10228
       -
           pkgs = pkgs // {

     

       10229
       10229
       -
             qt5 = pkgs.qt514;

     

       10230
       10230
       -
             libsForQt5 = pkgs.libsForQt514;

     

       10231
       10231
       -
           };

     

       10235
       10235
       +
           pkgs = pkgs.extend (final: _: {

     

       10236
       10236
       +
             qt5 = final.qt514;

     

       10237
       10237
       +
             libsForQt5 = final.libsForQt514;

     

       10238
       10238
       +
           });

     

       10232
       10239
        
         };

     

       10233
       10240
        
         inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;

     

       10234
       10241
        
       

     
···

       11924
       11931
        
       

     

       11925
       11932
        
         aubio = callPackage ../development/libraries/aubio { };

     

       11926
       11933
        
       

     

       11934
       11934
       +
         audiality2 = callPackage ../development/libraries/audiality2 { };

     

       11935
       11935
       +
       

     

       11927
       11936
        
         audiofile = callPackage ../development/libraries/audiofile {

     

       11928
       11937
        
           inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;

     

       11929
       11938
        
         };

     
···

       13287
       13296
        
         libavc1394 = callPackage ../development/libraries/libavc1394 { };

     

       13288
       13297
        
       

     

       13289
       13298
        
         libb2 = callPackage ../development/libraries/libb2 { };

     

       13299
       13299
       +
       

     

       13300
       13300
       +
         libbacktrace = callPackage ../development/libraries/libbacktrace { };

     

       13290
       13301
        
       

     

       13291
       13302
        
         libbap = callPackage ../development/libraries/libbap {

     

       13292
       13303
        
           inherit (ocaml-ng.ocamlPackages_4_06) bap ocaml findlib ctypes;

     
···

       17476
       17487
        
       

     

       17477
       17488
        
         fwupd = callPackage ../os-specific/linux/firmware/fwupd { };

     

       17478
       17489
        
       

     

       17490
       17490
       +
         firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };

     

       17491
       17491
       +
       

     

       17479
       17492
        
         fwts = callPackage ../os-specific/linux/fwts { };

     

       17480
       17493
        
       

     

       17481
       17494
        
         gobi_loader = callPackage ../os-specific/linux/gobi_loader { };

     
···

       17914
       17927
        
       

     

       17915
       17928
        
           nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });

     

       17916
       17929
        
       

     

       17917
       17917
       -
           nvidia_x11_legacy304 = nvidiaPackages.legacy_304;

     

       17918
       17918
       -
           nvidia_x11_legacy340 = nvidiaPackages.legacy_340;

     

       17919
       17919
       -
           nvidia_x11_legacy390 = nvidiaPackages.legacy_390;

     

       17920
       17920
       -
           nvidia_x11_beta      = nvidiaPackages.beta;

     

       17921
       17921
       -
           nvidia_x11           = nvidiaPackages.stable;

     

       17930
       17930
       +
           nvidia_x11_legacy304   = nvidiaPackages.legacy_304;

     

       17931
       17931
       +
           nvidia_x11_legacy340   = nvidiaPackages.legacy_340;

     

       17932
       17932
       +
           nvidia_x11_legacy390   = nvidiaPackages.legacy_390;

     

       17933
       17933
       +
           nvidia_x11_beta        = nvidiaPackages.beta;

     

       17934
       17934
       +
           nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;

     

       17935
       17935
       +
           nvidia_x11             = nvidiaPackages.stable;

     

       17922
       17936
        
       

     

       17923
       17937
        
           openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };

     

       17924
       17938
        
       

     
···

       18284
       18298
        
       

     

       18285
       18299
        
         nvme-cli = callPackage ../os-specific/linux/nvme-cli { };

     

       18286
       18300
        
       

     

       18301
       18301
       +
         system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { };

     

       18302
       18302
       +
       

     

       18287
       18303
        
         open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { };

     

       18288
       18304
        
         open-vm-tools-headless = open-vm-tools.override { withX = false; };

     

       18289
       18305
        
       

     
···

       21765
       21781
        
       

     

       21766
       21782
        
         linuxband = callPackage ../applications/audio/linuxband { };

     

       21767
       21783
        
       

     

       21784
       21784
       +
         littlegptracker = callPackage ../applications/audio/littlegptracker {

     

       21785
       21785
       +
           inherit (darwin.apple_sdk.frameworks) Foundation;

     

       21786
       21786
       +
         };

     

       21787
       21787
       +
       

     

       21768
       21788
        
         ledger = callPackage ../applications/office/ledger { };

     

       21769
       21789
        
       

     

       21770
       21790
        
         ledger-autosync = callPackage  ../applications/office/ledger-autosync { };

     
···

       22966
       22986
        
         quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };

     

       22967
       22987
        
       

     

       22968
       22988
        
         qutebrowser = let

     

       22969
       22969
       -
           libsForQt5 = libsForQt515;

     

       22970
       22970
       -
           qt5 = qt515;

     

       22971
       22971
       -
           python = python3.override {

     

       22972
       22972
       -
             packageOverrides = self: super: {

     

       22973
       22973
       -
               pkgs = pkgs // {

     

       22974
       22974
       -
                 inherit libsForQt5 qt5;

     

       22975
       22975
       -
               };

     

       22976
       22976
       -
             };

     

       22977
       22977
       -
             self = python3;

     

       22978
       22978
       -
           };

     

       22979
       22979
       -
         in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {

     

       22980
       22980
       -
           python3 = python;

     

       22981
       22981
       -
         };

     

       22989
       22989
       +
           pkgs_ = pkgs.extend(_: prev: {

     

       22990
       22990
       +
             pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {

     

       22991
       22991
       +
               pkgs = oldAttrs.pkgs.extend(_: _: {

     

       22992
       22992
       +
                 inherit (pkgs) qt5 libsForQt5;

     

       22993
       22993
       +
               });

     

       22994
       22994
       +
             });

     

       22995
       22995
       +
           });

     

       22996
       22996
       +
         in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };

     

       22982
       22997
        
       

     

       22983
       22998
        
         rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

     

       22984
       22999
        
       

     
···

       23768
       23783
        
         vbindiff = callPackage ../applications/editors/vbindiff { };

     

       23769
       23784
        
       

     

       23770
       23785
        
         vcprompt = callPackage ../applications/version-management/vcprompt { };

     

       23786
       23786
       +
       

     

       23787
       23787
       +
         vcs = callPackage ../applications/video/vcs { };

     

       23771
       23788
        
       

     

       23772
       23789
        
         vcv-rack = callPackage ../applications/audio/vcv-rack { };

     

       23773
       23790
        
       

     
···

       25077
       25094
        
       

     

       25078
       25095
        
         kobodeluxe = callPackage ../games/kobodeluxe { };

     

       25079
       25096
        
       

     

       25097
       25097
       +
         koboredux = callPackage ../games/koboredux { };

     

       25098
       25098
       +
       

     

       25099
       25099
       +
         koboredux-free = callPackage ../games/koboredux {

     

       25100
       25100
       +
           useProprietaryAssets = false;

     

       25101
       25101
       +
         };

     

       25102
       25102
       +
       

     

       25080
       25103
        
         leela-zero = libsForQt5.callPackage ../games/leela-zero { };

     

       25081
       25104
        
       

     

       25082
       25105
        
         legendary-gl = python38Packages.callPackage ../games/legendary-gl { };

     
···

       25970
       25993
        
       

     

       25971
       25994
        
         manta = callPackage ../applications/science/biology/manta { };

     

       25972
       25995
        
       

     

       25996
       25996
       +
         obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { };

     

       25997
       25997
       +
       

     

       25973
       25998
        
         octopus-caller = callPackage ../applications/science/biology/octopus { };

     

       25974
       25999
        
       

     

       25975
       26000
        
         paml = callPackage ../applications/science/biology/paml { };

     
···

       26287
       26312
        
       

     

       26288
       26313
        
         cvc3 = callPackage ../applications/science/logic/cvc3 {

     

       26289
       26314
        
           gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; });

     

       26315
       26315
       +
           stdenv = gccStdenv;

     

       26290
       26316
        
         };

     

       26291
       26317
        
         cvc4 = callPackage ../applications/science/logic/cvc4 {

     

       26292
       26318
        
           jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

-2

pkgs/top-level/ocaml-packages.nix

···

       352
       352
        
       

     

       353
       353
        
           ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { };

     

       354
       354
        
       

     

       355
       355
       -
           irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { };

     

       356
       356
       -
       

     

       357
       355
        
           iso8601 = callPackage ../development/ocaml-modules/iso8601 { };

     

       358
       356
        
       

     

       359
       357
        
           iter = callPackage ../development/ocaml-modules/iter { };

+16

pkgs/top-level/python-packages.nix

···

       150
       150
        
       

     

       151
       151
        
         accupy = callPackage ../development/python-modules/accupy { };

     

       152
       152
        
       

     

       153
       153
       +
         acebinf = callPackage ../development/python-modules/acebinf { };

     

       154
       154
       +
       

     

       153
       155
        
         acme = callPackage ../development/python-modules/acme { };

     

       154
       156
        
       

     

       155
       157
        
         acme-tiny = callPackage ../development/python-modules/acme-tiny { };

     
···

       981
       983
        
       

     

       982
       984
        
         bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; };

     

       983
       985
        
       

     

       986
       986
       +
         bwapy = callPackage ../development/python-modules/bwapy { };

     

       987
       987
       +
       

     

       984
       988
        
         bytecode = callPackage ../development/python-modules/bytecode { };

     

       985
       989
        
       

     

       986
       990
        
         bz2file = callPackage ../development/python-modules/bz2file { };

     
···

       1188
       1192
        
       

     

       1189
       1193
        
         clize = callPackage ../development/python-modules/clize { };

     

       1190
       1194
        
       

     

       1195
       1195
       +
         clldutils = callPackage ../development/python-modules/clldutils { };

     

       1196
       1196
       +
       

     

       1191
       1197
        
         closure-linter = callPackage ../development/python-modules/closure-linter { };

     

       1192
       1198
        
       

     

       1193
       1199
        
         cloudflare = callPackage ../development/python-modules/cloudflare { };

     
···

       1354
       1360
        
         cssutils = callPackage ../development/python-modules/cssutils { };

     

       1355
       1361
        
       

     

       1356
       1362
        
         csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { };

     

       1363
       1363
       +
       

     

       1364
       1364
       +
         csvw = callPackage ../development/python-modules/csvw { };

     

       1357
       1365
        
       

     

       1358
       1366
        
         cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };

     

       1359
       1367
        
       

     
···

       2463
       2471
        
       

     

       2464
       2472
        
         google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };

     

       2465
       2473
        
       

     

       2474
       2474
       +
         google-crc32c = callPackage ../development/python-modules/google-crc32c {

     

       2475
       2475
       +
           inherit (pkgs) crc32c;

     

       2476
       2476
       +
         };

     

       2477
       2477
       +
       

     

       2466
       2478
        
         google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };

     

       2467
       2479
        
       

     

       2468
       2480
        
         google-music = callPackage ../development/python-modules/google-music { };

     
···

       5427
       5439
        
       

     

       5428
       5440
        
         pysvn = callPackage ../development/python-modules/pysvn { };

     

       5429
       5441
        
       

     

       5442
       5442
       +
         pytabix = callPackage ../development/python-modules/pytabix { };

     

       5443
       5443
       +
       

     

       5430
       5444
        
         pytado = callPackage ../development/python-modules/pytado { };

     

       5431
       5445
        
       

     

       5432
       5446
        
         pytaglib = callPackage ../development/python-modules/pytaglib { };

     
···

       6356
       6370
        
         secure = callPackage ../development/python-modules/secure { };

     

       6357
       6371
        
       

     

       6358
       6372
        
         seekpath = callPackage ../development/python-modules/seekpath { };

     

       6373
       6373
       +
       

     

       6374
       6374
       +
         segments = callPackage ../development/python-modules/segments { };

     

       6359
       6375
        
       

     

       6360
       6376
        
         selectors2 = callPackage ../development/python-modules/selectors2 { };

     

       6361
       6377

pkgs/top-level/static.nix

···

       191
       191
        
         gsm = super.gsm.override {

     

       192
       192
        
           staticSupport = true;

     

       193
       193
        
         };

     

       194
       194
       +
         crc32c = super.crc32c.override {

     

       195
       195
       +
           staticOnly = true;

     

       196
       196
       +
         };

     

       194
       197
        
         parted = super.parted.override {

     

       195
       198
        
           enableStatic = true;

     

       196
       199
        
         };