diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml index 126698d0a9ed..d881e712a041 100644 --- a/doc/builders/images/dockertools.xml +++ b/doc/builders/images/dockertools.xml @@ -132,11 +132,11 @@ buildImage { By default buildImage will use a static date of one second past the UNIX Epoch. This allows buildImage to produce binary reproducible images. When listing images with docker images, the newly created images will be listed like this: - +$ docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest 08c791c7846e 48 years ago 25.2MB -]]> + You can break binary reproducibility but have a sorted, meaningful CREATED column by setting created to now. @@ -152,11 +152,11 @@ pkgs.dockerTools.buildImage { ]]> and now the Docker CLI will display a reasonable date and sort the images as expected: - +$ docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest de2bf4786de6 About a minute ago 25.2MB -]]> + however, the produced images will not be binary reproducible. diff --git a/doc/builders/images/ocitools.xml b/doc/builders/images/ocitools.xml index e8cd3472f54d..f26ed8644276 100644 --- a/doc/builders/images/ocitools.xml +++ b/doc/builders/images/ocitools.xml @@ -38,8 +38,7 @@ buildContainer { readonly = false; } - - + diff --git a/doc/builders/packages/citrix.xml b/doc/builders/packages/citrix.xml index 16f1bc6f8f21..803eb2e4fc40 100644 --- a/doc/builders/packages/citrix.xml +++ b/doc/builders/packages/citrix.xml @@ -22,10 +22,10 @@ In order to set this up, you first have to download the .cr file from the Netscaler Gateway. After that you can configure the selfservice like this: - - $ storebrowse -C ~/Downloads/receiverconfig.cr - $ selfservice - + +$ storebrowse -C ~/Downloads/receiverconfig.cr +$ selfservice + diff --git a/doc/builders/packages/urxvt.xml b/doc/builders/packages/urxvt.xml index 135cc82a0b51..330e056b6560 100644 --- a/doc/builders/packages/urxvt.xml +++ b/doc/builders/packages/urxvt.xml @@ -18,10 +18,13 @@ includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as - rxvt-unicode.override { configure = { availablePlugins, ... }: { + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { plugins = with availablePlugins; [ perls resize-font vtwheel ]; - } -} + }; +} + If the configure function returns an attrset without the plugins attribute, availablePlugins will be used automatically. @@ -30,18 +33,22 @@ In order to add plugins but also keep all default plugins installed, it is possible to use the following method: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; - }; -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; +} + To get a list of all the plugins available, open the Nix REPL and run - $ nix repl + +$ nix repl :l <nixpkgs> map (p: p.name) pkgs.rxvt-unicode.plugins - + Alternatively, if your shell is bash or zsh and have completion enabled, simply type nixpkgs.rxvt-unicode.plugins.<tab>. @@ -53,18 +60,24 @@ map (p: p.name) pkgs.rxvt-unicode.plugins extraDeps can be used, for example, to provide xsel (a clipboard manager) to the clipboard plugin, without installing it globally: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - pluginsDeps = [ xsel ]; - } -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + pluginsDeps = [ xsel ]; + }; +} + perlDeps is a handy way to provide Perl packages to your custom plugins (in $HOME/.urxvt/ext). For example, if you need AnyEvent you can do: - rxvt-unicode.override { configure = { availablePlugins, ... }: { - perlDeps = with perlPackages; [ AnyEvent ]; - } -} + +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + perlDeps = with perlPackages; [ AnyEvent ]; + }; +} + @@ -90,7 +103,8 @@ map (p: p.name) pkgs.rxvt-unicode.plugins If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough: - passthru.perlPackages = [ "self" ]; + +passthru.perlPackages = [ "self" ]; This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly. diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index a88965f5cc60..22389c24ea26 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -209,12 +209,12 @@ Additional information. - (fetchpatch { - name = "CVE-2019-11068.patch"; - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; - }) - +(fetchpatch { + name = "CVE-2019-11068.patch"; + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; + sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; +}) + 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. diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 1d307e1d6dcf..addab24f7f6d 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -72,9 +72,9 @@ To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3: - - $ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 - + +$ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 +
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 7cff7a85c62c..ebdcf616054c 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -38,11 +38,7 @@ pet = buildGoModule rec { vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; - subPackages = [ "." ]; - - deleteVendor = true; - - runVend = true; + runVend = true; meta = with lib; { description = "Simple command-line snippet manager, written in Go"; @@ -64,16 +60,6 @@ pet = buildGoModule rec { - - subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - - - deleteVendor 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. - - - runVend 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. @@ -82,12 +68,7 @@ pet = buildGoModule rec { - vendorSha256 can also take null 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;' + vendorSha256 can also take null 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;'
@@ -106,7 +87,6 @@ deis = buildGoPackage rec { version = "1.13.0"; goPackagePath = "github.com/deis/deis"; - subPackages = [ "client" ]; src = fetchFromGitHub { owner = "deis"; @@ -115,11 +95,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.nix; - - deleteVendor = true; - - buildFlags = [ "--tags" "release" ]; + goDeps = ./deps.nix; } @@ -133,28 +109,10 @@ deis = buildGoPackage rec { - - subPackages limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - In this example only github.com/deis/deis/client will be built. - - - goDeps 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 deps.nix file for readability. The dependency data structure is described below. - - - deleteVendor removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - - - - - buildFlags is a list of flags passed to the go build command. - - @@ -221,4 +179,70 @@ done + +
+ Attributes used by the builders + + + Both buildGoModule and buildGoPackage can be tweaked to behave slightly differently, if the following attributes are used: + + + + + + buildFlagsArray and buildFlags + + + + These attributes set build flags supported by go build. We recommend using buildFlagsArray. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: + + + buildFlagsArray + + buildFlagsArray = [ + "-ldflags=-X main.Version=${version} -X main.Commit=${version}" + ]; + + + + + + Note: single quotes are not needed. + + + + + buildFlagsArray + + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + -X main.Commit=${version} + ''; + + + + + + + deleteVendor + + + + Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + + + + + + subPackages + + + + Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. + + + + +
diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index ff0f350e99ca..b017c028f64c 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -8,28 +8,28 @@ When executing a Perl script, it is possible you get an error such as ./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory. This happens when the script expects Perl to be installed at /usr/bin/perl, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to: - - #!/usr/bin/env perl - + +#!/usr/bin/env perl + to take the Perl installation from the PATH environment variable, or invoke Perl directly with: - - $ perl ./myscript.pl - + +$ perl ./myscript.pl + When the script is using a Perl library that is not installed globally, you might get an error such as Can't locate DB_File.pm in @INC (you may need to install the DB_File module). In that case, you can use nix-shell to start an ad-hoc shell with that library installed, for instance: - - $ nix-shell -p perl perlPackages.DBFile --run ./myscript.pl - + +$ nix-shell -p perl perlPackages.DBFile --run ./myscript.pl + If you are always using the script in places where nix-shell is available, you can embed the nix-shell invocation in the shebang like this: - - #!/usr/bin/env nix-shell - #! nix-shell -i perl -p perl perlPackages.DBFile - + +#!/usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.DBFile + @@ -44,30 +44,30 @@ Perl packages from CPAN are defined in pkgs/top-level/perl-packages.nix, rather than pkgs/all-packages.nix. 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 perl-packages.nix. However, more complicated packages should be put in a separate file, typically in pkgs/development/perl-modules. Here is an example of the former: - - ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; - }; - }; - + +ClassC3 = buildPerlPackage rec { + name = "Class-C3-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + }; +}; + Note the use of mirror://cpan/, and the ${name} 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 all-packages.nix through the variable perlPackages. For instance, if you have a package that needs ClassC3, you would typically write - - foo = import ../path/to/foo.nix { - inherit stdenv fetchurl ...; - inherit (perlPackages) ClassC3; - }; - + +foo = import ../path/to/foo.nix { + inherit stdenv fetchurl ...; + inherit (perlPackages) ClassC3; +}; + in all-packages.nix. You can test building a Perl package as follows: - - $ nix-build -A perlPackages.ClassC3 - + +$ nix-build -A perlPackages.ClassC3 + buildPerlPackage adds perl- to the start of the name attribute, so the package above is actually called perl-Class-C3-0.21. So to install it, you can say: - - $ nix-env -i perl-Class-C3 - + +$ nix-env -i perl-Class-C3 + (Of course you can also install using the attribute name: nix-env -i -A perlPackages.ClassC3.) @@ -94,61 +94,61 @@ buildPerlPackage is built on top of stdenv, so everything can be customised in the usual way. For instance, the BerkeleyDB module has a preConfigure hook to generate a configuration file used by Makefile.PL: - - { buildPerlPackage, fetchurl, db }: + +{ buildPerlPackage, fetchurl, db }: - buildPerlPackage rec { - name = "BerkeleyDB-0.36"; +buildPerlPackage rec { + name = "BerkeleyDB-0.36"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; - }; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + }; - preConfigure = '' - echo "LIB = ${db.out}/lib" > config.in - echo "INCLUDE = ${db.dev}/include" >> config.in - ''; - } - + preConfigure = '' + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in + ''; +} + Dependencies on other Perl packages can be specified in the buildInputs and propagatedBuildInputs attributes. If something is exclusively a build-time dependency, use buildInputs; if it’s (also) a runtime dependency, use propagatedBuildInputs. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: - - ClassC3Componentised = buildPerlPackage rec { - name = "Class-C3-Componentised-1.0004"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; - sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; - }; - propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat - ]; - }; - + +ClassC3Componentised = buildPerlPackage rec { + name = "Class-C3-Componentised-1.0004"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; + sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; + }; + propagatedBuildInputs = [ + ClassC3 ClassInspector TestException MROCompat + ]; +}; + On Darwin, if a script has too many -Idir flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the shortenPerlShebang function from the postInstall phase: - - { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: + +{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: - ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "11.50"; +ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; + version = "11.50"; - src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; - sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; - }; + src = fetchurl { + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + }; - buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optional stdenv.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - }; - + buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optional stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; +}; + This will remove the -I flags from the shebang line, rewrite them in the use lib 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. @@ -159,27 +159,27 @@ Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program nix-generate-from-cpan, which can be installed as follows: - - $ nix-env -i nix-generate-from-cpan - + +$ nix-env -i nix-generate-from-cpan + 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: - - $ nix-generate-from-cpan XML::Simple - XMLSimple = buildPerlPackage rec { - name = "XML-Simple-2.22"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; - sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; - }; - propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; - meta = { - description = "An API for simple XML files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - + +$ nix-generate-from-cpan XML::Simple + XMLSimple = buildPerlPackage rec { + name = "XML-Simple-2.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; + sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; + }; + propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; + meta = { + description = "An API for simple XML files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + The output can be pasted into pkgs/top-level/perl-packages.nix or wherever else you need it. diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 8d97de504ad3..ec95621d8ff2 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ qtbase ]; } - + diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 9b36801fb966..9b579d6804f4 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -12,14 +12,14 @@ - Gemfile +$ cd pkgs/servers/monitoring +$ mkdir sensu +$ cd sensu +$ cat > Gemfile source 'https://rubygems.org' gem 'sensu' -$ $(nix-build '' -A bundix --no-out-link)/bin/bundix --magic -$ cat > default.nix +$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic +$ cat > default.nix { lib, bundlerEnv, ruby }: bundlerEnv rec { @@ -37,7 +37,7 @@ bundlerEnv rec { maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; -}]]> +} @@ -49,17 +49,16 @@ bundlerEnv rec { - +$ cd pkgs/servers/monitoring/sensu +$ nix-shell -p bundler --run 'bundle lock --update' +$ nix-shell -p bundix --run 'bundix' For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. rake at the command line, there is an alternative builder called bundlerApp. Set up the gemset.nix the same way, and then, for example: - + - + The chief advantage of bundlerApp over bundlerEnv is the executables introduced in the environment are precisely those selected in the exes list, as opposed to bundlerEnv which adds all the executables made available by gems in the gemset, which can mean e.g. rspec or rake in unpredictable versions available from various packages. diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index a581ec5911cb..141c46e5a623 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -44,11 +44,11 @@ texlive.combine { You can list packages e.g. by nix repl. - :l -nix-repl> texlive.collection- -]]> + +$ nix repl +nix-repl> :l <nixpkgs> +nix-repl> texlive.collection- + diff --git a/doc/manual.xml b/doc/manual.xml index 1f69872d2a72..4ca497e234ea 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,7 +1,7 @@ - Nixpkgs Users and Contributors Guide + Nixpkgs Manual Version diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml index 0f177ec719f9..20658918db72 100644 --- a/doc/stdenv/multiple-output.xml +++ b/doc/stdenv/multiple-output.xml @@ -67,7 +67,7 @@ nix-env silenty disregards the outputs selected by the user, and instead installs the outputs from meta.outputsToInstall. For example, -$ nix-env -iA nixpkgs.coreutils.info +$ nix-env -iA nixpkgs.coreutils.info installs the "out" output (coreutils.meta.outputsToInstall is [ "out" ]) instead of the requested "info". diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index b670f78f28bc..3e21b0e22843 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -66,7 +66,7 @@ For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_BROKEN=1 +$ export NIXPKGS_ALLOW_BROKEN=1 @@ -92,7 +92,7 @@ For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 +$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 @@ -122,7 +122,7 @@ To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_UNFREE=1 +$ export NIXPKGS_ALLOW_UNFREE=1 @@ -187,7 +187,7 @@ To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: -$ export NIXPKGS_ALLOW_INSECURE=1 +$ export NIXPKGS_ALLOW_INSECURE=1 diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index f6e02b969eac..4937e9508857 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -240,7 +240,7 @@ self: super: lapackProvider = self.mkl; } } - + This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime @@ -248,9 +248,9 @@ self: super: libblas.so.3 and liblapack.so.3. For instance: - -$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave - + +$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave + Intel MKL requires an openmp implementation when running with multiple processors. By default, @@ -288,7 +288,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation { ... } - + diff --git a/lib/modules.nix b/lib/modules.nix index 412c7f1df712..02a669df6593 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -117,7 +117,7 @@ rec { if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then let firstDef = head merged.unmatchedDefns; - baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."; + baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; in if attrNames options == [ "_module" ] then throw '' @@ -449,7 +449,13 @@ rec { # Handle properties, check types, and merge everything together. res = if opt.readOnly or false && length defs' > 1 then - throw "The option `${showOption loc}' is read-only, but it's set multiple times." + let + # For a better error message, evaluate all readOnly definitions as + # if they were the only definition. + separateDefs = map (def: def // { + value = (mergeDefinitions loc opt.type [ def ]).mergedValue; + }) defs'; + in throw "The option `${showOption loc}' is read-only, but it's set multiple times. Definition values:${showDefs separateDefs}" else mergeDefinitions loc opt.type defs'; @@ -497,8 +503,8 @@ rec { mergedValue = if isDefined then if all (def: type.check def.value) defsFinal then type.merge loc defsFinal - else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal; - in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'." + else let allInvalid = filter (def: ! type.check def.value) defsFinal; + in throw "A definition for option `${showOption loc}' is not of type `${type.description}'. Definition values:${showDefs allInvalid}" else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) diff --git a/lib/options.nix b/lib/options.nix index 0494a597ab80..5b7482c80937 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -96,12 +96,12 @@ rec { else if all isBool list then foldl' lib.or false list else if all isString list then lib.concatStrings list else if all isInt list && all (x: x == head list) list then head list - else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; + else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}"; mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." else if length defs != 1 then - throw "The unique option `${showOption loc}' is defined multiple times, in:\n - ${concatStringsSep "\n - " (getFiles defs)}." + throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}" else (head defs).value; /* "Merge" option definitions by checking that they all have the same value. */ @@ -111,11 +111,11 @@ rec { # This also makes it work for functions, because the foldl' below would try # to compare the first element with itself, which is false for functions else if length defs == 1 then (elemAt defs 0).value - else foldl' (val: def: - if def.value != val then - throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + else (foldl' (first: def: + if def.value != first.value then + throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" else - val) (head defs).value defs; + first) (head defs) defs).value; /* Extracts values of all "value" keys of the given list. @@ -213,6 +213,24 @@ rec { else escaped; in (concatStringsSep ".") (map escapeOptionPart parts); showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files); + + showDefs = defs: concatMapStrings (def: + let + # Pretty print the value for display, if successful + prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value); + # Split it into its lines + lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value); + # Only display the first 5 lines, and indent them for better visibility + value = concatStringsSep "\n " (take 5 lines ++ optional (length lines > 5) "..."); + result = + # Don't print any value if evaluating the value strictly fails + if ! prettyEval.success then "" + # Put it on a new line if it consists of multiple + else if length lines > 1 then ":\n " + value + else ": " + value; + in "\n- In `${def.file}'${result}" + ) defs; + unknownModule = ""; } diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index cfe474d4ded2..309c5311361c 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -49,7 +49,7 @@ checkConfigError() { reportFailure "$@" return 1 else - if echo "$err" | grep --silent "$errorContains" ; then + if echo "$err" | grep -zP --silent "$errorContains" ; then pass=$((pass + 1)) return 0; else @@ -62,17 +62,17 @@ checkConfigError() { # Check boolean option. checkConfigOutput "false" config.enable ./declare-enable.nix -checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./define-enable.nix # Check integer types. # unsigned checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix -checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +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 # positive -checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix +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 # between checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix -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 +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 # Check either types # types.either @@ -125,7 +125,7 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable set -- config.enable ./define-enable.nix ./declare-enable.nix checkConfigOutput "true" "$@" checkConfigOutput "false" "$@" ./disable-define-enable.nix -checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix +checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix @@ -142,17 +142,17 @@ checkConfigError 'infinite recursion encountered' "$@" # Check _module.check. set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix -checkConfigError 'The option .* defined in .* does not exist.' "$@" +checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix +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 # Check coerced value with unsound coercion checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix -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 +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 checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix # Check mkAliasOptionModule. @@ -183,7 +183,7 @@ checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.ni checkConfigOutput "true" config.enable ./disable-recursive/main.nix checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix} checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix} -checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} # Check that imports can depend on derivations checkConfigOutput "true" config.enable ./import-from-store.nix @@ -207,7 +207,7 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c # Even with multiple assignments, a type error should be thrown if any of them aren't valid -checkConfigError 'The option value .* in .* is not of type .*' \ +checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix ## Freeform modules @@ -216,7 +216,7 @@ checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.n # No freeform assigments shouldn't make it error checkConfigOutput '{ }' config ./freeform-attrsOf.nix # but only if the type matches -checkConfigError 'The option value .* in .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix # and properties should be applied checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix # Options should still be declarable, and be able to have a type that doesn't match the freeform type @@ -251,7 +251,7 @@ checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix # Functions can't be merged together -checkConfigError "The option .* has conflicting definitions" config.value.multiple-lambdas ./types-anything/functions.nix +checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix checkConfigOutput '' config.value.single-lambda ./types-anything/functions.nix # Check that all mk* modifiers are applied checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix diff --git a/lib/types.nix b/lib/types.nix index aae45366b8fb..77105740bc23 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -299,16 +299,14 @@ rec { check = isList; merge = loc: defs: map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def: - if isList def.value then - imap1 (m: def': - (mergeDefinitions - (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) - elemType - [{ inherit (def) file; value = def'; }] - ).optionalValue - ) def.value - else - throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs))); + imap1 (m: def': + (mergeDefinitions + (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) + elemType + [{ inherit (def) file; value = def'; }] + ).optionalValue + ) def.value + ) defs))); emptyValue = { value = {}; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fd1b47603a80..7928b6d2ab5e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3149,6 +3149,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ghuntley = { + email = "ghuntley@ghuntley.com"; + github = "ghuntley"; + githubId = 127353; + name = "Geoffrey Huntley"; + }; gila = { email = "jeffry.molanus@gmail.com"; github = "gila"; @@ -3739,6 +3745,12 @@ githubId = 5283991; name = "Jake Waksbaum"; }; + jamiemagee = { + email = "jamie.magee@gmail.com"; + github = "JamieMagee"; + githubId = 1358764; + name = "Jamie Magee"; + }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 435ed230f513..bc19acf9f690 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -14,18 +14,18 @@ You create a container with identifier foo as follows: -# nixos-container create foo +# nixos-container create foo This creates the container’s root directory in - /var/lib/containers/foo and a small configuration file - in /etc/containers/foo.conf. It also builds the + /var/lib/containers/foo and a small configuration file + in /etc/containers/foo.conf. It also builds the container’s initial system configuration and stores it in - /nix/var/nix/profiles/per-container/foo/system. You can + /nix/var/nix/profiles/per-container/foo/system. You can modify the initial configuration of the container on the command line. For instance, to create a container that has sshd running, with the given public key for root: -# nixos-container create foo --config ' +# nixos-container create foo --config ' = true; users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"]; ' @@ -34,7 +34,7 @@ as container IP. This behavior can be altered by setting --host-address and --local-address: -# nixos-container create test --config-file test-container.nix \ +# nixos-container create test --config-file test-container.nix \ --local-address 10.235.1.2 --host-address 10.235.1.1 @@ -42,7 +42,7 @@ Creating a container does not start it. To start the container, run: -# nixos-container start foo +# nixos-container start foo This command will return as soon as the container has booted and has reached multi-user.target. On the host, the container runs within @@ -51,7 +51,7 @@ Thus, if something went wrong, you can get status info using systemctl: -# systemctl status container@foo +# systemctl status container@foo @@ -59,22 +59,22 @@ If the container has started successfully, you can log in as root using the root-login operation: -# nixos-container root-login foo -[root@foo:~]# +# nixos-container root-login foo +[root@foo:~]# Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the login operation, which is available to all users on the host: -# nixos-container login foo +# nixos-container login foo foo login: alice Password: *** With nixos-container run, you can execute arbitrary commands in the container: -# nixos-container run foo -- uname -a +# nixos-container run foo -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux @@ -85,18 +85,18 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux /var/lib/container/name/etc/nixos/configuration.nix, and run -# nixos-container update foo +# nixos-container update foo This will build and activate the new configuration. You can also specify a new configuration on the command line: -# nixos-container update foo --config ' +# nixos-container update foo --config ' = true; = "foo@example.org"; = [ 80 ]; ' -# curl http://$(nixos-container show-ip foo)/ +# curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… However, note that this will overwrite the container’s @@ -117,7 +117,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux by using systemctl on the container’s service unit. To destroy a container, including its file system, do -# nixos-container destroy foo +# nixos-container destroy foo diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml index 71e3f9ea665d..74abfdd7c663 100644 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -8,7 +8,7 @@ You can enter rescue mode by running: -# systemctl rescue +# systemctl rescue This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell. diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml index 570f58358845..1035e4e056a9 100644 --- a/nixos/doc/manual/administration/network-problems.xml +++ b/nixos/doc/manual/administration/network-problems.xml @@ -16,12 +16,12 @@ disable the use of the binary cache by adding , e.g. -# nixos-rebuild switch --option use-binary-caches false +# nixos-rebuild switch --option use-binary-caches false If you have an alternative binary cache at your disposal, you can use it instead: -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml index a5abd6f02588..c57d885c5f3c 100644 --- a/nixos/doc/manual/administration/rebooting.xml +++ b/nixos/doc/manual/administration/rebooting.xml @@ -7,20 +7,20 @@ The system can be shut down (and automatically powered off) by doing: -# shutdown +# shutdown This is equivalent to running systemctl poweroff. To reboot the system, run -# reboot +# reboot which is equivalent to systemctl reboot. Alternatively, you can quickly reboot the system using kexec, which bypasses the BIOS by directly loading the new kernel into memory: -# systemctl kexec +# systemctl kexec diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index fb87810ba461..80d79e1a53f1 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -20,16 +20,16 @@ has booted, you can make the selected configuration the default for subsequent boots: -# /run/current-system/bin/switch-to-configuration boot +# /run/current-system/bin/switch-to-configuration boot Second, you can switch to the previous configuration in a running system: -# nixos-rebuild switch --rollback +# nixos-rebuild switch --rollback This is equivalent to running: -# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch +# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch where N is the number of the NixOS system configuration. To get a list of the available configurations, do: diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 1b9c745eb59f..1c5d48a5bcf0 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -58,9 +58,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. Units can be stopped, started or restarted: -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service +# systemctl stop postgresql.service +# systemctl start postgresql.service +# systemctl restart postgresql.service These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml index 80daf6bdbff0..9acb147ac1a6 100644 --- a/nixos/doc/manual/administration/user-sessions.xml +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -39,7 +39,7 @@ c3 - root (0) can terminate a session in a way that ensures that all the session’s processes are gone: -# loginctl terminate-session c3 +# loginctl terminate-session c3 diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index 02cb78f47e8b..19eb2429d0a0 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -25,7 +25,7 @@ xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs and you run nixos-rebuild, specifying your own Nixpkgs tree: -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs +# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 644d3a33ffd2..dbdcc9414954 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -126,13 +126,13 @@ nixpkgs.config.packageOverrides = pkgs: mellanox drivers. -' -A linuxPackages.kernel.dev -$ nix-shell '' -A linuxPackages.kernel -$ unpackPhase -$ cd linux-* -$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko -]]> + +$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +$ nix-shell '<nixpkgs>' -A linuxPackages.kernel +$ unpackPhase +$ cd linux-* +$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko + diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 8a8168c095f0..405a50a9e430 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -11,7 +11,7 @@ you create an encrypted Ext4 file system on the device /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d +# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d WARNING! ======== @@ -21,17 +21,17 @@ Are you sure? (Type uppercase yes): YES Enter LUKS passphrase: *** Verify passphrase: *** -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** -# mkfs.ext4 /dev/mapper/crypted +# mkfs.ext4 /dev/mapper/crypted To ensure that this file system is automatically mounted at boot time as /, add the following to configuration.nix: -boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -."/".device = "/dev/mapper/crypted"; +boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; +."/".device = "/dev/mapper/crypted"; Should grub be used as bootloader, and /boot is located on an encrypted partition, it is necessary to add the following grub option: @@ -45,11 +45,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** and add it as a new key to our existing device /dev/sda2: -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" +# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" +# fido2luks credential "$FIDO2_LABEL" f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 Password: Password (again): Old password: @@ -60,13 +60,13 @@ Added to key to device /dev/sda2, slot: 2 To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to configuration.nix: boot.initrd.luks.fido2Support = true; -boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +boot.initrd.luks.devices."/dev/sda2".fido2.credential = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; 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 Trezor. -boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; +boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess = true; diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 68324cc85b54..cbec83814c9a 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -62,24 +62,24 @@ uid = 1000; useradd, groupmod and so on. For instance, to create a user account named alice: -# useradd -m alice +# useradd -m alice To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run: -# su - alice -c "true" +# su - alice -c "true" The flag causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the passwd utility: -# passwd alice +# passwd alice Enter new UNIX password: *** Retype new UNIX password: *** A user can be deleted using userdel: -# userdel -r alice +# userdel -r alice The flag deletes the user’s home directory. Accounts can be modified using usermod. Unix groups can be managed using groupadd, groupmod and diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 18f0be5e7f39..b33f6cf82b52 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -58,7 +58,7 @@ The X server can then be started manually: -# systemctl start display-manager.service +# systemctl start display-manager.service diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index 3d019a4987e1..c626ef30e9d5 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -57,7 +57,7 @@ linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual: -$ nix-build nixos/release.nix -A manual +$ nix-build nixos/release.nix -A manual diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 2183937ad0da..32e00544ceff 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -24,8 +24,8 @@ - $ cd /path/to/nixpkgs/nixos/doc/manual - $ make +$ cd /path/to/nixpkgs/nixos/doc/manual +$ make diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml index c1ef638e876e..6788882aa8c0 100644 --- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml @@ -27,13 +27,13 @@ networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; Setup the proxy environment variables in the shell where you are running nixos-install. - -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" - + +# proxy_url="http://user:password@proxy:port/" +# export http_proxy="$proxy_url" +# export HTTP_PROXY="$proxy_url" +# export https_proxy="$proxy_url" +# export HTTPS_PROXY="$proxy_url" + diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index d2d1245c57ac..8aac3226473b 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -325,14 +325,14 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot to boot on a USB rescue disk and do something along these lines: -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot +# mkdir root +# mount /dev/sdaX root +# mkdir root/nixos-root +# mv -v root/* root/nixos-root/ +# mv -v root/nixos-root/old-root/* root/ +# mv -v root/boot.bak root/boot # We had renamed this by hand earlier +# umount root +# reboot This may work as is or you might also need to reinstall the boot loader diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e5e02aa07526..08780051d5f6 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -67,32 +67,32 @@ nixos-20.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: -# nix-channel --list | grep nixos +# nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do -# nix-channel --add https://nixos.org/channels/channel-name nixos +# nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 20.03 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos And if you want to live on the bleeding edge: -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos You can then upgrade NixOS to the latest version in your chosen channel by running -# nixos-rebuild switch --upgrade +# nixos-rebuild switch --upgrade which is equivalent to the more verbose nix-channel --update nixos; nixos-rebuild switch. diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index f533d66099d3..41f0e6b97515 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -136,13 +136,13 @@ /mnt: -# nixos-enter --root /mnt +# nixos-enter --root /mnt Run a shell command: -# nixos-enter -c 'ls -l /; cat /proc/mounts' +# nixos-enter -c 'ls -l /; cat /proc/mounts' Run a non-shell command: diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index aada08c5b4a9..fae25721e394 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -33,7 +33,7 @@ This command shows the version of the currently active NixOS configuration. For example: -$ nixos-version +$ nixos-version 16.03.1011.6317da4 (Emu) The version consists of the following elements: @@ -111,7 +111,7 @@ Show the full SHA1 hash of the Git commit from which this configuration was built, e.g. -$ nixos-version --hash +$ nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 543c8a8882ea..c9dfdbed99a3 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -2,6 +2,11 @@ pkgs: with pkgs.lib; rec { + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; + # Check whenever fileSystem is needed for boot. NOTE: Make sure # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c # is in the list, put /a and /a/b in as well. diff --git a/nixos/modules/hardware/system-76.nix b/nixos/modules/hardware/system-76.nix new file mode 100644 index 000000000000..48eb63f4f22d --- /dev/null +++ b/nixos/modules/hardware/system-76.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkOption mkEnableOption types mkIf mkMerge optional versionOlder; + cfg = config.hardware.system76; + + kpkgs = config.boot.kernelPackages; + modules = [ "system76" "system76-io" ] ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi"); + modulePackages = map (m: kpkgs.${m}) modules; + moduleConfig = mkIf cfg.kernel-modules.enable { + boot.extraModulePackages = modulePackages; + + boot.kernelModules = modules; + + services.udev.packages = modulePackages; + }; + + firmware-pkg = pkgs.system76-firmware; + firmwareConfig = mkIf cfg.firmware-daemon.enable { + services.dbus.packages = [ firmware-pkg ]; + + systemd.services.system76-firmware-daemon = { + description = "The System76 Firmware Daemon"; + + serviceConfig = { + ExecStart = "${firmware-pkg}/bin/system76-firmware-daemon"; + + Restart = "on-failure"; + }; + + wantedBy = [ "multi-user.target" ]; + }; + }; +in { + options = { + hardware.system76 = { + enableAll = mkEnableOption "all recommended configuration for system76 systems"; + + firmware-daemon.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to enable the system76 firmware daemon"; + type = types.bool; + }; + + kernel-modules.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to make the system76 out-of-tree kernel modules available"; + type = types.bool; + }; + }; + }; + + config = mkMerge [ moduleConfig firmwareConfig ]; +} diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6328971492c5..2acb891f1a9a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -16,6 +16,8 @@ let kernelPackages.nvidia_x11 else if elem "nvidiaBeta" drivers then kernelPackages.nvidia_x11_beta + else if elem "nvidiaVulkanBeta" drivers then + kernelPackages.nvidia_x11_vulkan_beta else if elem "nvidiaLegacy304" drivers then kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7e5fbb4f3f2..96529424e8f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/steam-hardware.nix + ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml index a197f38ffb9d..8f623c936568 100644 --- a/nixos/modules/services/backup/borgbackup.xml +++ b/nixos/modules/services/backup/borgbackup.xml @@ -69,10 +69,10 @@ access this single repository. You need the output of the generate pub file. - -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos + +# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +# cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos Add the following snippet to your NixOS configuration: diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index ab922a38e5c6..c787c36b877c 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -877,6 +877,37 @@ in description = "Configure the SAML integration."; }; }; + + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/codimd/codimd.env"; + description = '' + Environment file as defined in + systemd.exec5 + . + + Secrets may be passed to the service without adding them to the world-readable + Nix store, by specifying placeholder variables as the option value in Nix and + setting these variables accordingly in the environment file. + + + # snippet of CodiMD-related config + services.codimd.configuration.dbURL = "postgres://codimd:\''${DB_PASSWORD}@db-host:5432/codimddb"; + services.codimd.configuration.minio.secretKey = "$MINIO_SECRET_KEY"; + + + + # content of the environment file + DB_PASSWORD=verysecretdbpassword + MINIO_SECRET_KEY=verysecretminiokey + + + Note that this file needs to be available on the host on which + CodiMD is running. + ''; + }; }; config = mkIf cfg.enable { @@ -900,11 +931,17 @@ in description = "CodiMD Service"; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; + preStart = '' + ${pkgs.envsubst}/bin/envsubst \ + -o ${cfg.workDir}/config.json \ + -i ${prettyJSON cfg.configuration} + ''; serviceConfig = { WorkingDirectory = cfg.workDir; ExecStart = "${pkgs.codimd}/bin/codimd"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ - "CMD_CONFIG_FILE=${prettyJSON cfg.configuration}" + "CMD_CONFIG_FILE=${cfg.workDir}/config.json" "NODE_ENV=production" ]; Restart = "always"; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index fb8644dd13a6..2724d9f9cb6f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -159,9 +159,9 @@ in To switch to a specialised configuration (e.g. fewJobsManyCores) at runtime, run: - - # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test - + + # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test + ''; type = types.attrsOf (types.submodule ( { ... }: { diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 0c1be71cf532..f7c2940049e5 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -218,6 +218,7 @@ done # Create device nodes in /dev. @preDeviceCommands@ echo "running udev..." +ln -sfn /proc/self/fd /dev/fd mkdir -p /etc/systemd ln -sfn @linkUnits@ /etc/systemd/network mkdir -p /etc/udev diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index de97ba3f7bb0..997edf77ba99 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.containers; @@ -13,10 +13,6 @@ let json2toml "$valuePath" "$out" ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { meta = { @@ -136,7 +132,7 @@ in environment.etc."containers/policy.json".source = if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else copyFile "${pkgs.skopeo.src}/default-policy.json"; + else utils.copyFile "${pkgs.skopeo.src}/default-policy.json"; }; } diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 70e7c8794d43..aa416e7990a8 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -1,16 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; - let cfg = config.virtualisation.cri-o; crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { imports = [ @@ -78,12 +73,19 @@ in The final CRI-O package (including extra packages). ''; }; + + networkDir = mkOption { + type = types.nullOr types.path; + default = null; + description = "Override the network_dir option."; + internal = true; + }; }; config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] @@ -95,6 +97,7 @@ in [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''} [crio.runtime] cgroup_manager = "systemd" @@ -109,8 +112,8 @@ in ''} ''; - environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index e0e2f04e24c1..f554aeffb451 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.podman; @@ -21,11 +21,6 @@ let done ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; - in { imports = [ @@ -88,7 +83,7 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix index b1acbf4a8322..aa581dfeb584 100644 --- a/nixos/tests/codimd.nix +++ b/nixos/tests/codimd.nix @@ -21,7 +21,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { codimd = { enable = true; - configuration.dbURL = "postgres://codimd:snakeoilpassword@localhost:5432/codimddb"; + configuration.dbURL = "postgres://codimd:\${DB_PASSWORD}@localhost:5432/codimddb"; + + /* + * Do not use pkgs.writeText for secrets as + * they will end up in the world-readable Nix store. + */ + environmentFile = pkgs.writeText "codimd-env" '' + DB_PASSWORD=snakeoilpassword + ''; }; postgresql = { enable = true; diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix index 6770d32358e8..e79a728b2ac8 100644 --- a/nixos/tests/magnetico.nix +++ b/nixos/tests/magnetico.nix @@ -27,12 +27,13 @@ in start_all() machine.wait_for_unit("magneticod") machine.wait_for_unit("magneticow") + machine.wait_for_open_port(${toString port}) machine.succeed( - "${pkgs.curl}/bin/curl " + "${pkgs.curl}/bin/curl --fail " + "-u user:password http://localhost:${toString port}" ) - assert "Unauthorised." in machine.succeed( - "${pkgs.curl}/bin/curl " + machine.fail( + "${pkgs.curl}/bin/curl --fail " + "-u user:wrongpwd http://localhost:${toString port}" ) machine.shutdown() diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 8c956c53fb37..7a6acb25e802 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.15"; + version = "0.9.16"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab"; + sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 55c0d7c597c2..8969f3a47b23 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nu774"; repo = pname; - rev = version; - sha256 = "16iwqmwagnb929byz8kj79pmmr0anbyv26drbavhppmxhk7rrpgh"; + rev = "v${version}"; + sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index b8763f07b45b..7a5887d4f92b 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.9"; + version = "3.5.10"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; + sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch b/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch new file mode 100644 index 000000000000..3cabd2a2c56c --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch @@ -0,0 +1,52 @@ +From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta +Date: Wed, 19 Aug 2020 15:06:19 +0200 +Subject: [PATCH 1/2] Remove coherency checks >:) + +As far as I can see, they are just to make sure that the types can fit +in the word length, but this check was written when 64 bits weren't a +possibility and didn't take that into account, +so although the types do fit, the checks fail. +Indeed, the program seems to work well on 64 bits. +More info here: +https://github.com/Mdashdotdashn/LittleGPTracker/issues/4 +--- + sources/Externals/Soundfont/DATATYPE.H | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H +index 762a724..f6b031f 100644 +--- a/sources/Externals/Soundfont/DATATYPE.H ++++ b/sources/Externals/Soundfont/DATATYPE.H +@@ -123,28 +123,6 @@ typedef short SHORT; /* 16 bit signed value was: INT */ + ********************************************************************/ + typedef unsigned short EMUSTAT; + +-/******************************************************************** +-* Compare values with SoundFont Enabler limits. Fail compile +-* if discrepency. If compile fails due to one of these errors, then +-* the SoundFont enabler will not work with your system or the state of your +-* development environment. +-********************************************************************/ +-#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL) +- #error : char is out of range! +-#endif +- +-#if (SHRT_MAX != SHRT_MAXVAL) +- #error : short is out of range! +-#endif +- +-#if (LONG_MAX != LONG_MAXVAL) +- #error : long is out of range! +-#endif +- +-#if (ULONG_MAX != DWORD_MAXVAL) +- #error : unsigned long is out of range! +-#endif +- + #ifdef __BYTE_COHERENT + + /******************************************************************** +-- +2.25.4 + diff --git a/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch new file mode 100644 index 000000000000..3e1c822be2ae --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch @@ -0,0 +1,27 @@ +From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta +Date: Wed, 19 Aug 2020 15:06:58 +0200 +Subject: [PATCH 2/2] Set the initial directory to the current directory + +otherwise the user has to navigate from the nix store, which makes the program +crash due to its size +--- + sources/Adapters/DEB/System/DEBSystem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp +index 6e86693..65d2cdd 100644 +--- a/sources/Adapters/DEB/System/DEBSystem.cpp ++++ b/sources/Adapters/DEB/System/DEBSystem.cpp +@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) { + } + Path::SetAlias("bin",dirname(buff)) ; + +- Path::SetAlias("root","bin:..") ; ++ Path::SetAlias("root",".") ; + + #ifdef _DEBUG + Trace::GetInstance()->SetLogger(*(new StdOutLogger())); +-- +2.25.4 + diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix new file mode 100644 index 000000000000..91d709687949 --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, fetchFromGitHub +, SDL +, jack2 +, Foundation +}: + +stdenv.mkDerivation rec { + pname = "littlegptracker"; + version = "unstable-2019-04-14"; + + src = fetchFromGitHub { + owner = "Mdashdotdashn"; + repo = "littlegptracker"; + rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891"; + sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b"; + }; + + buildInputs = [ + SDL + ] + ++ stdenv.lib.optional stdenv.isDarwin Foundation + ++ stdenv.lib.optional stdenv.isLinux jack2; + + patches = [ + # Remove outdated (pre-64bit) checks that would fail on modern platforms + # (see description in patch file) + ./0001-Remove-coherency-checks.patch + # Set starting directory to cwd, default is in /nix/store and causes a crash + # (see description in patch file) + ./0002-Set-the-initial-directory-to-the-current-directory.patch + ]; + + preBuild = "cd projects"; + + makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] + ++ stdenv.lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + + NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ + stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation"; + + installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; + + meta = with stdenv.lib; { + description = "A music tracker similar to lsdj optimised to run on portable game consoles"; + longDescription = '' + LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised + to run on portable game consoles. It is currently running on Game Park's + GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian). + + It implements the user interface of littlesounddj, a very famous tracker + for the Gameboy platform that has been tried and tested by many users over + the years, leading to a little complex but yet extremely efficent way of + working. + + Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback + channels. Additionally, the program can drive MIDI instruments (with the + gp32 and gp2x a custom MIDI interface is required). + ''; + homepage = "http://www.littlegptracker.com/"; + downloadPage = "http://www.littlegptracker.com/download.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 21dffa8d509e..f3203566a134 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,5 +1,9 @@ { stdenv -, fetchurl, alsaLib +, fetchurl +, makeWrapper + +, alsaLib +, perl }: stdenv.mkDerivation rec { @@ -10,12 +14,30 @@ stdenv.mkDerivation rec { sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; }; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + outputs = [ "out" "conplay" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = stdenv.lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + postInstall = '' + mkdir -p $conplay/bin + mv scripts/conplay $conplay/bin/ + ''; + + preFixup = '' + patchShebangs $conplay/bin/conplay + ''; + + postFixup = '' + wrapProgram $conplay/bin/conplay \ + --prefix PATH : $out/bin + ''; + meta = { description = "Fast console MPEG Audio Player and decoder library"; homepage = "http://mpg123.org"; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2aeae1f18901..9274044090b0 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah"; + sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 1058cfcf93c0..4d4489efa3cb 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -770,13 +770,13 @@ in [ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { name = "Microsoft.CSharp"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index bedc8c60c707..a99cba67d3cf 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr"; - x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn"; + x86_64-linux = "1kgvwcwkdvywsiyg86srfzcq6jcas6hyi9ds4qvndsnd64j0fgkn"; + x86_64-darwin = "03jci05psxkknpjrrgjpdxsii2xyf5cfpkhrp5nnfafb5acfvs1x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.2"; + version = "1.49.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index eeaf8d561852..34b9b21f57d5 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.1.1"; + version = "1.7.0"; src = if stdenv.isLinux then fetchzip { url = { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; - "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw"; + "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index bed673ef8d49..fab83b75e7c9 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.8"; + version = "6.4.12"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96"; + sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index 7844a6a593ce..8b3ca1e2d8de 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b"; + sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; }; vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index b1985be2c946..02544812eb12 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.1"; + name = "grip-4.2.0"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; + sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index fdfed065321f..7894bc2f5e4c 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,41 +1,48 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, installShellFiles }: stdenv.mkDerivation rec { - version = "2.4.1"; - pname = "weather"; + version = "2.4.1"; + pname = "weather"; - src = fetchurl { - url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; - }; + src = fetchurl { + url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; + sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; + }; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ + installShellFiles + pythonPackages.wrapPython + ]; - buildInputs = [ pythonPackages.python ]; + dontConfigure = true; + dontBuild = true; - phases = [ "unpackPhase" "installPhase" ]; + # Upstream doesn't provide a setup.py or alike, so we follow: + # http://fungi.yuggoth.org/weather/doc/install.rst#id3 + installPhase = '' + site_packages=$out/${pythonPackages.python.sitePackages} + install -Dt $out/bin -m 755 weather + install -Dt $site_packages weather.py + install -Dt $out/share/weather-util \ + airports overrides.{conf,log} places slist stations \ + zctas zlist zones + install -Dt $out/etc weatherrc - installPhase = '' - site_packages=$out/${pythonPackages.python.sitePackages} - mkdir -p $out/{share/{man,weather-util},bin,etc} $site_packages - cp weather $out/bin/ - cp weather.py $site_packages/ - chmod +x $out/bin/weather - cp airports overrides.{conf,log} places slist stations zctas zlist zones $out/share/weather-util/ - cp weatherrc $out/etc - cp weather.1 weatherrc.5 $out/share/man/ - sed -i \ - -e "s|/etc|$out/etc|g" \ - -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ - $site_packages/weather.py - wrapPythonPrograms - ''; + sed -i \ + -e "s|/etc|$out/etc|g" \ + -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ + $site_packages/weather.py - meta = with stdenv.lib; { - homepage = "http://fungi.yuggoth.org/weather"; - description = "Quick access to current weather conditions and forecasts"; - license = licenses.isc; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux ++ platforms.darwin; - }; + wrapPythonPrograms + + installManPage weather.1 weatherrc.5 + ''; + + meta = with stdenv.lib; { + homepage = "http://fungi.yuggoth.org/weather"; + description = "Quick access to current weather conditions and forecasts"; + license = licenses.isc; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index dae7f741b357..ec8fc3407d25 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,17 +1,17 @@ { "stable": { - "version": "85.0.4183.102", - "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", - "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + "version": "85.0.4183.121", + "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670", + "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca" }, "beta": { - "version": "86.0.4240.30", - "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", - "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + "version": "86.0.4240.42", + "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa", + "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj" }, "dev": { - "version": "87.0.4252.0", - "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", - "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + "version": "87.0.4263.3", + "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk", + "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m" } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e7f064b2f6bb..403ef9bea1f3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0.1"; + version = "81.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ach/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d3297316b481d6fa10cf71e7d1331f407e6167fbd1b6a854fc39fe2aca466250"; + sha256 = "7ff2b7ec6f3f55fccfb7988d7a42bc9cbe572af6edc64ac9b42ea15aaed9cd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/af/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "464726f6cf660a8f5d6059ee85fdd0b87cd97c51abf578fdb851a181c94b110a"; + sha256 = "c1a29b1473583d28f87c764c8ccf67f7cba874fd85e5820f968230c9ce29670b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/an/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3fcc891f53ed5986554c5f595fa75631402ae35eb484ae22c15cdcf3d1885311"; + sha256 = "bddab1deeaf3c6474586beb41ad9c720ed6e84f9e999a856b17bb4e7c9d97991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ar/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d30299d7e707c7528a87d3094612bff6013bf135f4ca5e2cc2105bcd434baddf"; + sha256 = "3c4e339627fc94df273ba7e1e1c150188033331def09678b2e0abb54e52f2120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ast/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c766b9c3fc2b63e0e61e113678afa783efabb96620d1715fb72bd17f4a93188d"; + sha256 = "e421c32fefef657287ad52dc11f2f3166e549ef9d54065099f84e5f35c8a52af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/az/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "49264b6f35bc0cc5198782fd2fa62a0388e04141b1580a44f71c48e6b44853df"; + sha256 = "e1099ab7b028d8124446a21056e55dc4b87d1f20972dea60125347b1b099e35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/be/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "391f9423e7211790509e03822a4186117320da8f660a1e3b44ff44712235762e"; + sha256 = "a216a2cd652905d946aff1cb3a0fc8738a1e3d5746d080dd863d34be244a2a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bg/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "45e04e624329abe7704242581599a11e177ff3418adc49cd5bd59f45b2f0d517"; + sha256 = "68a8a4ec3d0c1fb8a174a7466abbfb6c806bb8a263ab852b15dfdd15c35487aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "36c1ce02ae8b4ed1dd78ade3dadfb24042c6fe7d942c9e3be6b9c94dd7fa96df"; + sha256 = "3eaae9060b690391cbc63aacdb1d833b2895c7aaf6da36c32cb117e7994d94d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/br/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "83c0b3ec0fcf7d26a45c7e59a7c467c64fbc7d9fcce5358451e51828aa57acde"; + sha256 = "806b366419eb6edab57c8f3af9f0465d3547e3e28047983af7cb2f08ad822a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d1c1dbb0060ab256ca932f1ae2a8df8e8b130242c8a1d9014a047eae79d95687"; + sha256 = "025a79c350f35f8bba1a5fdd894d0eb237d22be8ee5825e6a657f18b0c99bd87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca-valencia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8b4b1b7bb92287b4049712335c6da52f7bd825490996a48e4b376a3811700790"; + sha256 = "806f26efe0a6317cb5dd1b631f8b96bceeaa6e8fced624d15ac334d0d2d78dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "34a48e1d85e7557b318590faccf621fd4c32e51060dc5d06f40ec933599ac4b6"; + sha256 = "dfa651a556e024d2d27a27d97eec87750d8f4e692345a0f4e12c7a3480ac1d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cak/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8db14d21c578d8e238b3a0882bcce70bb48d66fe60fc74053acf5bcf212fd243"; + sha256 = "7225d8cf7a529d8688aa7386fe14e50e4e208d55732523d5407690f63b6ab775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "361414fede99694a9b8f31076b1a9d7c871d857870cfe0ef01cb3e02a5be0b3f"; + sha256 = "17d22031176a4604d498743eea242fe257c74620ac8ab88f8f197d57f8615663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cy/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bde481d7acfca3e0c33c63d7dffd9772adbd11c252dc4e92367476c5fc347cd5"; + sha256 = "82581e54dc72e188a5d4976bed58bcb8ba4153e72854fc439d3a903a5f60e6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/da/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bca4e7d4690cb950d9fa87623da30b93f54d0efd005e440b1af9acb06833baf2"; + sha256 = "87a600d73b3fb74ff8aaf26e1d915afa52692501ce67f13e308a7c9af63e6853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/de/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e4deb64c304ec7b5c06c0f8ec8299d6c513def1e0524cb93dba2fb3e22fca8e4"; + sha256 = "a15fdfafe598fe5e2d5c5854755e316844518eb1b4634aad6cbe99fefc3e5986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/dsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "809080cde0646ed2e4a64e2e70beb25aa3dcc47f7f749f2722c898f8efd9271b"; + sha256 = "abb71f8df0de953ab2c27e50c9b49a69c012fbe52a0d6eb66744b03754d494ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/el/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7f5abfb89c70187b9b8e954c21b566da9b28781f1de80634da6c47d149363cff"; + sha256 = "ed3782c6e619f9e0e59b2eb1f36e5c94a92e2f7b617b2ef87e0a2da0c4e65032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-CA/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "61d6a1cf59a89d2e690423f38779dc7c776757ed39a1fd66b9bfa6b5e63e68b4"; + sha256 = "5c5ae0e8345f13c346e2b756a57f465776e8d5a1ea62dd00dc6fe5a3b7c904fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-GB/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "75b1808a6d5ea0b70df3bbb7d9b8890418069c5fa9bd8a5dce6b0f18f5e3b2de"; + sha256 = "3ed2a11824c00fd157b9b3d02dcde95ae8347b6add687f4bbc3284601360c1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-US/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3ac0c9c4454647ce986bbe6f3567b0e1de5c0719ed6b6627344292c581a2afd3"; + sha256 = "689d75035303b47266a3819e8aa3bb9026559b819aec2f6e95faa67b86888ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eo/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5c61e9348fe69bbd32d9501730b9cc12c14b55746b5b670379ab0c463f2d71c2"; + sha256 = "cbebf5a97e5b2fb58c187553c8fcfd6474dae4a911c97cd8730977b8bee6c6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-AR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0203caa38c1526c8c3df9c315e205770b43594f222364f9bebb3e89485a1803d"; + sha256 = "e664214c7b2809919b672426c5d35e467eadf69fcbf43d20e00f379e5ab6f558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-CL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c2b7e09dce573ef945379a7a5f7691d877efa14e226bcd20ad48a3dedba1d1d2"; + sha256 = "10b07cafb315ef4497d9b2caaac0a83c86701506adab2f0e154a7873f39b3066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-ES/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0653d855ff0e04b6f6a6e44de558de69fac582996c7b944dec043810c8faa704"; + sha256 = "aeb7d0af26b7fa4be27eb0b82da4051ab57ee1406eb20d3b5d12ec5d32d0104b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-MX/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9c6f7b6208b390a73dfe778ac0a798b4999abe93840b4224a5852143f3588f2a"; + sha256 = "c515c089afe6e4ef46df7ace24260118ed464a62146f59cce064ca465bb7affe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/et/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "786495f0ef9af4475755378d9ae3095041c4f329e9cbca197eaff0199d6bdf02"; + sha256 = "930c174be085acb50b18b4ee5b20b158c9a790ca19232cc25a1e34628a7b4346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "91c9baea255e46ebc3ef8702eb8e233b395cd39c9c092c0812adcdcb60f5f3ae"; + sha256 = "2f0e39cece971b12f6f5c325277e77e5a3f053ab57cdc2a2905d9f7f3e739fe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fa/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1baf78177598c3e0fa6714ed85a305b6a811baa26b1d0c6d7d6d05c8bb8b8595"; + sha256 = "98029d664de21403cb54276a30d650a124e5b5250939c7e315a0435ebcc2bf26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ff/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "20e44b613633e84c8808c76ccd61a78bb8dce1a09bdaa1d6aa95dae1eacaafc6"; + sha256 = "097747294c73df707c7652c239330c106c69f77868fad65d490d1b896f90e689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d6f634e7aa109d368bb2b7e8b3c3682117d350ad7630d6283006f8d22f98201c"; + sha256 = "c915afc5e73f837e1e09ac0d14510271602ef5527ebf270b399be880c183b5a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a0c7326670acb7b097c17905b23410819429b2357534eade971a9c3b22b268ba"; + sha256 = "775fee38f2033be70e4d68d985602bce3df69f9106d1c427a06b3f8233e7c30f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fy-NL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f28ae560003555ded4590f0640a89090cbe0e732449973aa2b42d530e3829b73"; + sha256 = "49efc463dfe6b7b7a8dc0bf351cc903160bef3e1886c8faee6f11cca3abd3e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ga-IE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04b260885b755f9c7fe93a82ad10855abfbd14706ec81f0fe38c96c2355c833d"; + sha256 = "6dcf0be88e5fad96c79ccd4b6a612d721b792099d9f1bc029ff5b592c4004922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gd/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b8f4529a7970906654a6df2f91a5687d49dccf8f1438ed86bcc4d9608a2f26fc"; + sha256 = "924d9190a1d5dc85abcb1f23aacffb98c0116c5cbd430ec04c5275317639772e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "234c4f3ddb6e5a59f8eaae2b58d8a1dc302f66a5e7edc6337d9b1e6e1e1dab24"; + sha256 = "256c1b81294bc262770c655e2fdb5e36684286f4eb1857d6d38b87beba2b3d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0c7688233efc95bcbefa8b2faaced313d69c0fb246a91564b3629ec24026843b"; + sha256 = "2d9d55f4755f372e18a7d07786d64f09a4b4f76e6a80d8904e06188bc6edff41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gu-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "12c45963b4b7e4976f656b60e9c4964ad871f96cefeb5e898c3a830c85d92d78"; + sha256 = "86a64d446efcaa014fbbb05787223a025d99947ae4aa8e704661f1236c08bbcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/he/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8e0c8c06f5e9665a7bc9733e3afe514620c2b6071451c9ca05f0a1fa9b953c58"; + sha256 = "64b1fcd9c454d1248eb1f2d02877f964e50dce38ffbdd93ca4c367246121eed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hi-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "008d5f194b9572ecee09ea67481ed1fa91f6a7987105d90c53924fd9d8e7ec7b"; + sha256 = "5d5f52e34c735df3ec5571e03e834919001fe3417a4190515f86f1e479690ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2ce4d27f389f2f4137d8f8487c4f4d32bf6833870592755e13694f48ab6966f2"; + sha256 = "e6085effe2607a416e80a310ace23381fcdd752bba8e58ad7611f05885e01e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2c540fc55a0bebe2886123e3edcaaedf793e022eb0244c2eead9e1fba337d129"; + sha256 = "6a35c1657d78cfa843a24bea346fd98aeae041fdeb65297693f89b012f0c3786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8f2c14860f0a97c2aea13b262a7f4ba62efbf643eb285f2282ba3467d7aa59c3"; + sha256 = "3717f43d3d771cbf4dee43889e0bfac3eb60dff8989c06496cbf14ace5753ca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hy-AM/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c003e6572b150a9c0f33f1fe0d2d2e537e1d5bd901b937663cbdb8c50a0b2639"; + sha256 = "c376e1f35c8067b41415175bcb597c331b5f5352d4262f5a38d08296a307343d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b8da547a7236c08b681d33d405f6ddf3f17a5342f8354a3565c6dfc39d3cabd4"; + sha256 = "99e0aafd820a965cd85fe9094b7465d700f8e62cbba86ef9746a44445e5bba2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/id/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7c3adc7ec426b3f8a2da36fba744d07774037fa8dbadbf727eae3fdbb19a3bf7"; + sha256 = "ada432c2d6a04fe928416980b0f3575e2a42668c7298f68c32071ae2c4f5bb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/is/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "57bbfd97596d9d2c557186d729ea74f233bc50833d8a1d768402cf6d25cb8dd7"; + sha256 = "df304bee0b2235222c97e49e0ad8bc0e3fe1cbe3ec0ffbf1b996902a6817d863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/it/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0de8a984c4a328020d351edfefe717325d4c50403f126b8c211b2798062c854c"; + sha256 = "8c35e143b73d3019b284a006501f93aa2550b32688d7d3285e56f92703df959d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ja/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5a718d304fd3dd30abb9b9b5f6a54aca5c9a6cd1c9ccc3bd5859773112432f8a"; + sha256 = "39c23321100cee799e7024ac27d547a6cd7672485f07125d02c75dcd8e38f268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ka/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2422236d92428e2a0f921433f6bbcb87505aac7110cacc6ca61173a28555ba35"; + sha256 = "b40137c85d1783ee9a8a11fbd72e33bb9a2d3baa4bc2cc9f31a0c0bf020c2233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kab/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ab81137395002af2626e534e5133b455d4b50f441cf71f9a11b8f92444221535"; + sha256 = "61dab84674aef3fd91db859900de4709744816f621fecdb3df46a63f4426289b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "daba81c27dc36bcd267a0c77255b8333b8ab0f3e0e338a74eb17a36cd83af7db"; + sha256 = "a9e8e32cd7441a4b78c5c7b9ea7943c756f5b362a9e6a9028e20dfcb461bb056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/km/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "021f7787bfe87ccc8bc33ed6668196f4a7d528672ba14eff1ca4fa4efe0c2768"; + sha256 = "f003c7a5eab166f29c37aaaf2c5cc4669d90fff33854d43e157130f606011820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "973259c5b54672b0f5aedbb5c2126716cc7b8792f3b2c6f9d6d745eb9e6d9529"; + sha256 = "f23a998f16c3a93c210b7f08337bb3e739311ada223e85ac4599819b89bf7110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ko/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3bda308c8bce3b00250827d7b505c9cbe9574cd7809dd866ffe7a230dbdbb7bb"; + sha256 = "b6748a4a86fe9864a3378e32357c0fbc542846308ae8ac8005460d40f4f869b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lij/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c57dccdb4f9281b31c1b359bd2a07b3376a693f3f37c513223029fa854b61644"; + sha256 = "267633fa63849ae002ebffd892ea3f520d59bace0a7dafe1f92dcbbfcaa7cf00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lt/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ce04853033bb00b760c4814b436a67e151f54842ab736b440f118c44945e53d1"; + sha256 = "a985da29e6d91efed407bc9d898e8bd8f68d42cd4673b6ea163b99d8bb9cd642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lv/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "79b71529569df018e86925e8df25dae43cc54629eee50035fe515c9299d2664f"; + sha256 = "05a05361cd3b5772c30c2a8cef03e8753311245caea3ee94e03fbb3b5b6ae9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3a015b82f1f966e1ecc49af369ff80bd922dd1dd4d93a642c9b7bb8f9ea078bd"; + sha256 = "0433579dfaa3dff715129cc45e72d83f93b7dc3a928b65744dece0a5b5687916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4fbf77e82ac6739eb4f557ef9fbf2d86574c50260d2661964ee01b99d496a10b"; + sha256 = "38177842df2df76fda10791eaa518d30b92f03016705eb555630fa356992416f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ms/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c6e07a8f1eff5239ee19eec7d4828ca175535656fd130fcb72552e4585e1d9e8"; + sha256 = "34b724fc82f330d897b1073fd4383f5fbfaec9d312cc7991f395d37d98416da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/my/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a98a72b72665fda08f2b834af3a7c060d07cd638a69cad4f165f9af4730b642e"; + sha256 = "a527914488954bdf8aea31a6ab406791cc723b88c11a5a27f161aef970e00d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nb-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "948454e67ed57e47f3879c866c9ef72245b552066689d1e5d7e95431c06c72ac"; + sha256 = "ccfa39917b8b0c2704a011bd41b0cfe4e890b0c1bc14bbbf641b7add2bf0750b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ne-NP/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "280857446256df49b901eae8d64f4255fb279dae7f67ff83beefd59d227ea466"; + sha256 = "a3deb02b843fa9ff7a12590ad86195a9deb1be1eae055b493c34614fb361edf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6e50983c69ac40ddb403c1e2a5b6ac1fb713bd1d169d8dd402516f827907d457"; + sha256 = "864ab1ee8d70e0968570fabc1e110bd97c86d27ce5d8106a70a31c6843e16db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nn-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "27178fe7b5bf19c4b9fdc42c90651f4c53379996ba67b743485decce0fd9e18d"; + sha256 = "46d109379dba5dd3e5c9c413e54ff2578117960ac3c85ca937b48baf08bcdb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/oc/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "aa517e0e68aff16ccd693a7a282ee8aef1df8486b68b546af166bf39ef67baba"; + sha256 = "71638cc84a7eccb4a563b7640c84557bc203cbb91114e433e1400554a16b2c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pa-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cb5ea9559d416f44c0830cb1bc85fffd3ee02a63697ffed7c0d5ec9bee8bf1e8"; + sha256 = "8fb76633497115f927ce2be5064f6c6bb70d552c53491ccd6558df163941ef52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "36d0b84933e689b36701b50c1145b6f64e8f09af4ab8a7aafa53e1d33d8148f2"; + sha256 = "e6d38535433cc0a0c4aa07ab9aa33bad4d019041d4a2b30ccfc5553a10579a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-BR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "24093debf351c29812350c5feb68f741fd0d05cadad962ec5acb5ea0d9450bec"; + sha256 = "399ef81afd3b05dbcb43553cdd36a2fd95e681296a21e7476cfa0c64c0c13ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-PT/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bac0a7f9f902ec3a1006a45a330b52520377b43c61aba4b6fb3a45eb126379ef"; + sha256 = "d6d87228f6a46237583ad8520c6758fd53d778e1905d019978a8da5fe0819cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/rm/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e86c79a49f0c980ff4ad60f151e9350e66df0ecf8b9bfcd08586cbae9abad957"; + sha256 = "46dd4f4ddc69d82964289463baf67c05eab92a4500ad17f691a06fa0ea72830e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ro/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "32d089bfa4ebed3c6938abea0e16a9527cf303f6b9c5fd68e3adb2cd967ac3b2"; + sha256 = "8720bf2abd57615d098360e7ddb384c0d570d4422f18d509c8b2b7759dd84550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ru/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "75a470c503f19282b3b1730cfc1bfef450634f1166d094b4e4f30a8f872da1ff"; + sha256 = "6a8db970a3be16e8a0524c2bb576e4c368d33f8bd874ae201d000d112f86282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/si/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f919ae9b3f2b6e1df1d073e3e7556091bc3586584c39a8dcbe91b8c29a4396d4"; + sha256 = "1ee0f867be47f5a7884577caf08778152d8ee08d8fd1b25440a69fe8bb0d1174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "de6b476f015fad31e80a504c29c05d60c95c0dce18309765a3108ab27c926900"; + sha256 = "97bc401f7c3c48b62fb66b3b5ea759345641874a46eb001ec1570ce53b610764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9cba9b423bfda5788a76692e78310d961db70cc870e0797bcfc4020dc63e2019"; + sha256 = "5b5dbd25fc83048de4fdeaef13126701b01e070740345838c29b8aeba65934e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/son/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4423551873bfee1d1d4c7acdeaed8a133df3d467e711d4b2ffdcfe4dcecf434f"; + sha256 = "99a2c222c6e14f511dda1f5cbbef2effd2aec7d169893024e25f2dc8f4900e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sq/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "739918066fae4e5b20093540a2ea6e527878991ffab59ecbbd264aba5a13eabf"; + sha256 = "7ff0ec6837ed3536f73aacc8295b5439aa0e18cdd80f2882bf2b644f5e7a1637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5fe944b1fcb260fdbd747b9009ce05708d6ac82ae9f501d6a7efefc87d95fbfe"; + sha256 = "274b86c7dbdffcd11453e8103feeaf6e98931c7224ca2336d231cf885c809f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sv-SE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f0ba11adce493f8ab6a771a362ada50abe442f60a2d910a36339ee19889b152"; + sha256 = "0fc7edddf1a3aa812664e08e94cf5967c69a5f4821616400a8144c3bdda9860b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ta/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7fdcfb26091269bbda4f81991d3dff20fcbfba534be9e9ae315459306aef0d17"; + sha256 = "20121341b05c91142bd8fb4a0a2195693e78a89691b02651f6d6c3ac9f848a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/te/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "54fbdcd804f4d2dec3096a041927e65ed999126f21a748a7f0b36091c4c4c7b3"; + sha256 = "bc306272b6bd53e312dfab3f404f1f92199945be9f74e1d87d19b58e7ae2ee95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/th/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ebccb1cfdc0394889e7c67a5ef9be54dd87818c8f326e89ac6a97fcd9865c721"; + sha256 = "52c8825f27f78624a81271a01c3b522cf6617030046a38734611ee741215658d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7585a169f7975bbaa752caacf1863a2bd3ac9eeb17a031492a7cea5dd1b24efe"; + sha256 = "c87f99419608a06d79bec67f54bafec6650dbcbed7fb52bda058bfe68d0ea102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a475825fb5f0125f16edc895921d3839393fa806a12b3bf2f296321853cb66ff"; + sha256 = "a030a15ce1424717b8fd0787f1a0d13ad8e050f0f5b4cd679d6c2686fe81e0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/trs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4dedb4d60db089358b9371a828165f6fa7e329af5deb1177d090730c22323b9e"; + sha256 = "762f7e33307811f6ec18c198b4f524526a085828af2621885b276ecd8bac6dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5a2a6f9234db28e79c8472206d40f1d403af05de2f9f4e1b6253bf3e912386e6"; + sha256 = "a698aa0d0599b97c7e9791547573d0afdc5e1bf0e5e644069752686d50644564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ur/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "30f3516680ef54d1e3636e858b8000aac4ac462e3fe6e20db16fbb0d037c2394"; + sha256 = "7d1759bd2f0b746be76471ebc3c0da2fa224f4550a787e72ebe52b6356fb9370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uz/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "84a6ed8eed48ebf993ebf779c623472ea3d2bee84457fdc4e1968c013c8b8383"; + sha256 = "51c21a2cf377633a46c35b2bf9096b97f5acab1bf7f8014122c96668d14c6d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/vi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "eb58bad9266d0e46b55d4815212083609197acc4c8a7cd3a1ee9901adca7dae2"; + sha256 = "e1f3cc7866b19e60b8c368b0633bb0603d7176a87ebc910fe4c4a7575a98be7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/xh/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d478b199b9096b264f92f793f713b3e1cb42fb7c5f017ac0f1b82eea33434cbf"; + sha256 = "cce6577abd88d3b34ad3e83577bbb82b6df8754679fc4cdd8a34c9ec9d59acae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-CN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b91d7637a20ebd8dc3200d222f98ac2d065a3633988ef0d17591cc8e72efac03"; + sha256 = "e042d66ae743d1889d6d8ce13ef3510644098efa0943d332656b7e361b976da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-TW/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "42bbf8d38c417fbf0d6de21e4fb4f3090096e0bcc2820504b8ea69f057d50a91"; + sha256 = "07c6ac6268b54caefc44654bbc68d19dbe8e6e15fb768c921a8030e179ec8ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ach/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1d39224b647c9a18c6a5021366775c05bf704bf316d6329f170cc4eb59c05a10"; + sha256 = "bdd0995ca7d73be587ef1a9bd0395b869ec4f7f90a93ec854a5bbd1c18060ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/af/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a4b998c95454270fa98c59cb94dcad6e5db2da8a92f9cd75e8d0e30041eccc5b"; + sha256 = "f662391298377d8d7f38f90c31b90bf705e61b1c3df5e1a7ed7e6c705ac700e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/an/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ff786a29ef12215fdc8bc057f596ef9ab1ef207fbe84910504a314e27fa54c79"; + sha256 = "46ca1495a74861429af6cf33eb791738abcfb5fa29c23060c7b9d307fc6a1b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ar/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "498ecc3042b4ccfbb155e632531df9ab75f7e3225820f0fe6929f80a91a91660"; + sha256 = "1b781b56560f0bad0d67f155d68da1b5b759051434c76095c8ff884837595866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ast/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1174347fac624e8c4573bf80ce0867ec8e94694bb0cd623de86949fab0780044"; + sha256 = "eae1a5378babbeb88c6b000dc6500bfccbbe8337eeb32d7bfdc9bab67448d8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/az/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ddd0856d036f9f3eb87874440bcd6e85106f7391f03e76cd1f1d5428a69b8374"; + sha256 = "4ba58be6ffb171c843ac5d267e97bf8ad219b4d1058a96b18f08ac4dd83c6b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/be/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "23a8c4cb1c4d9e0e0b5a5924119670a4224ded0595d8326ae500a7bbafdd49a8"; + sha256 = "b7cbd330b3b261e8b57134c27a291348219105cbd8cc685917ccf8e03099f2e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bg/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a0fdc2f520e251f624ae19a169ee7f1349017a8af87b9c149ea731e32054ef4e"; + sha256 = "e6354feae56c656365fc4604bf394c4038399ea3a7ee503fd38610e1525d6539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "553e9a0704e4984e091716d41fb040f3b93bb192fa292cd7453ede137b170b74"; + sha256 = "280d01e9dbfb09a08264e36c01b5fecef97831fc2c9d99e2f5e0ed498bbf427a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/br/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "dd82f29c768befcbcc691a1665a5fe2e519f94558c331ed29c368c005e764d25"; + sha256 = "a223fec4d16418befd75ce455f470cdc831afcecb6fb4c36139fd2f7c2588337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "59fca5c16258a5f5e3f8725ae1da886381fc78963fc6174762c9b74e6a83b01f"; + sha256 = "ed7910663750af303d197ab3919f54d2a108ed691e016696e4c9a6254fe74003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca-valencia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d75878b8d573a96a65fe320cd00208733f46984b88f44a3ab571bbbec17f2fb2"; + sha256 = "19d4244b6711d3378835fd00715d7db17052de0345dd9b33b013169920f388c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f89d8655184f74f3218510d8e44b8bf4fe9840fc3555d4a4ca59dab8b77f8a46"; + sha256 = "bcfa0b1785d3aeec8e5ea25b472da288c3ebced8661a70c21db08741e9ed5c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cak/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31008fdaf9a7ff5a3051b936dbd4253da76770da2e59fd97707378b4c9cae4c2"; + sha256 = "cbf0745604bd3f757851cb4772eaac212d16288c7279634d470610ea280b7884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7e8ed50ec696cf3fa98aa2ec0d2755e0064dd285c43f17fc4f58adfb427cbb3b"; + sha256 = "1e91a12e484a2a41d87de5e60c0b3f455f81669025ceaec0c7adbb447446c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cy/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "64b5cda8d4a0febaa96c778a3b45c380903835b7eb27ff375cb24c7ab3c56813"; + sha256 = "c48491eadec23c78f071f4bedd23ac02235ef090375dd0bcb190e0b1d94fe94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/da/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b7ba473e03fb0bd3efc7f00882270e65e2f74d12e4a150221519e9fefed6f470"; + sha256 = "81a1fc46b7f92b2375edb20d3464c4d7facb493a07aa4471947f8b8b84cc3054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/de/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4ff6aa86a82b4466c5809fb192021fcacefe3309f73cbcbb8d4f952c066e4307"; + sha256 = "719db056506ca0b908d121cd3e7785b1d8739610c7728723e650ca35b99ce26f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/dsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8ff130011dd318c45d7c85f26137a73f2abdd90eeb21ff4e29f45eb786e24541"; + sha256 = "1ef45291cecb8727951808d20df4469c1f0d731b0d3442283fa1f45f39c0e3c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/el/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c2c7f0d40a3c32896678cffce276a8d71613b09eda6fa715d10f156c13a1f6e6"; + sha256 = "b0cbd8c13a40116779b1dca51191fcc0a8b203327b568f8467f6864e4f5db9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-CA/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b06db042a7429c1743f4b0488e403a5051acfa1be556e07769880345b72f5cf1"; + sha256 = "4e4e204fb9ed3ed167fb9e3a9af2727384d09e37f1d5262bba05e296a8cb4a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-GB/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "435e24ff0665065a2eef6efbd8ea86e5c7e2752f44c420e94a7b0fdd503ea5b8"; + sha256 = "7533f99bc58783e5779b4fbbfc77b96a6c04958c0e752d71b1f57387824faa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-US/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fc1d7b798644f41a0da9e2dccc1e8fda86cd12e2f2dd3808ccbc247084221648"; + sha256 = "68bebc780f225d5694506c4cdc6a7c31c779d2f1feffa792e599f99d0b2e58cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eo/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e5504a7bf75e2eba860f61fc3fdd979b2a766a4299b3652bf62d5a46526e50eb"; + sha256 = "ab08e50d0a5e5d6d02a8daf1c6a428ce9ae19b3a343bf0838739adc9a4170bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-AR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b53c9605b8798c6ecea9f1f47b0a1590a788c12f2fa9c09293a05ffbf4b22d53"; + sha256 = "837f5cff13186af4f38c0c21410f20c57f28a3b5293ec986a449fdcb3358ddc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-CL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a2fd6bfce565cebfae759dcbb7b3cc3f504f0bee5324849a63a39fc65c36724c"; + sha256 = "1f73cb2ab7eb1b7cd8198113941fc71c17972227365edfd5cad73680d30a9c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-ES/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c15751d3f0dc389d2a2e9cd40e8da88f1710a6f64999d106bee1dcab09daed5b"; + sha256 = "1e95337b4607808c3c3b319343e253d575a07fbe48f7ae8d8346f92a3d9c70e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-MX/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "070a68c0893d63c5663252e52664cbeabbbf0d31542499575507644e003664ef"; + sha256 = "cefb685c2da73fe485ff0817901a19c609a73befbb82fec151765e889e4c2d91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/et/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2eecd4ff182a25ba4e1a1edb78a8a9b1881321cea2740207795351700af1f4a2"; + sha256 = "95dbe912beb0ee6196e3bbd169093388c22fb1ed0981a7827fee4bbdbb774316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5fa2531712b5dff1d9931a369e774dfe15d2fc74078ed65ced0196b80faf2c8e"; + sha256 = "44047e7f01fb086c099db0ddda6e1d6641e33e038a4e658b3a57ce331ce61523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fa/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c22c673516a9837fe3d454bdecf0a59efd3b18f1e7cec51a6e742a343367aaed"; + sha256 = "252f1e06b2faac3c3f94d1a1f9f52f566c84efffca8a3147c32ee6f109feaad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ff/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "64de30cf7241daa09cbf7b027017c6411fbe01aa84c8bcb62d4cfac0eb86b540"; + sha256 = "1bd050b8d4840a17d12f042a27295b71a4a62ebdac4153ffec843230b1cc0b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "549743b069385b594c78f8732f28cdae1a73324d3662f671e9721b566629ea01"; + sha256 = "6582223e393876a91ab0250c976b1aeac0559722b17e198e05925863e53d81d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "abfb9e7c89fed1a4553bdd7cdbaab84f7f5221d31df404af0143bed0e6b817c4"; + sha256 = "b96dc92220680f3c87d6c7cfe79f071382f8183856967133b6fcb6783a60ae6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fy-NL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "97accf68261aa9b04cbbcf424afeb7a3aea92853c70a4f0a52d10fc408d5e83d"; + sha256 = "4a90cf75ab890ebef3517db701bcdd065e42c2fd8055121ea9b97897be299543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ga-IE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "61f830ff111c0de73a229d12705ef6b3cc1b597abe668488c8f8ba3bf5dde217"; + sha256 = "56491146a39eae10e9f8fb4ef1fe303a6bead300b680571427e6a410766d0069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gd/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cd4904d29ba8f649f3a960953e99a5a8ea12375d2cbe651d1bf09210a08e6400"; + sha256 = "0d9f9ad6563e31fd0ead7ec35e594e033f7f1ad0b4c94f0a5cc01cf515fea5ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0589a2465fff938d88a248f4175d9c3c0ccd4602b317f403ed3b7966b1d1cdc1"; + sha256 = "8100b774f3bb3a1c3551b9f2c4751ee9e184b04c61489652dbdc81b1fc0b6bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "64f4f44b7b6b07970fe0c2f73b9e8afc5df75125a8c84f4c56b839c47899ee5f"; + sha256 = "a0002b17f1133194c9f0a0b2b3c56c6ae0d4cd981d5325193a2c96d4b5ec78b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gu-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "46ac00838fe4775ad83a4cf6a510c7a80a6106896060bc3d6c2a94ae91004202"; + sha256 = "6ef49394aec077569251eed4dc7631130be41991022672f477989f5202ac4d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/he/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "563abdb4e26b3bf628f14bd5ef0cb3fe326b3e0a0bd65aba67fece4460b434aa"; + sha256 = "07e11a9d1a4ef6e3c87e09227d070f75098697a89e057946bb71c1336429d9bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hi-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "828c6e01a4f2db95d36e1f8826fde98c8d762ea0e0aaff0abd50a9ade5638b8e"; + sha256 = "39e6c7eab9945a7b9e8d500d8e0dfd416a7a915498683a4966732d8e09183e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6cffbcc579f3c489e6d3e8da4bff44189851565cbe196b6f8f3e1a864ebf15d7"; + sha256 = "8946ba5a92d73500cee5c379a796e18cf1b50fe0df4c1867040794850ba0df04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c2a744f2115d1e67d430dbbfc7388043a740840dbbdbc40bb34b6d7c8feda525"; + sha256 = "9d87edfdb5498c16a279f0f262855c4e6f822760cf6d90281cf6c38e65c325f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "cb382f9253652ed6109f8ab1b90eddcb3f7a5bb56aa3b4d99faa755b09dd197a"; + sha256 = "9f515b6b8267b97efec1046c0c2329c5871337b95d7a3b4fdee310699c63b265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hy-AM/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f298f1a9a427ba647d99f082a40e39be2e80dfa2388b731ed7e27a6da4efbd8c"; + sha256 = "1de03462f87b629033b99bb014042d774a52404e279b625f20448809399af44d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d823238dd340f45f776d73710c0cd77edca6be241aab189618f6def9d46f60e3"; + sha256 = "fdcbf5cc522e20587cbac0b4979d77589532ba683ca811e27a7b499f37fe1841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/id/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "667ec59c3743f707d4b3084a19ba09aac625794d2c7a240a04f9d932ffba9046"; + sha256 = "e3cafaff6d65ca2da4513d27949b85b2fb8a1ab154d736e980df0ba8caf898be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/is/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "bfa3be98edd904965d65c1094a9b83807633867c802b605bb93dda031e979a22"; + sha256 = "21fba4796f2ee43a3662c3f493879d4d656ec710e46369f6da92f757e24ee706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/it/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "198aef68d51404fd37ad602e1f450afa8dd439d4ebcacffe1e920d4629593da9"; + sha256 = "c8775280055d5b8eb251253e72465149da165b7295cb4c8f400a5286a16168bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ja/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4a443e7b2d8169871b789ad90ca23ef8a01e7578fcf6b1af6ceccd4af93fdadf"; + sha256 = "8870d59360577f8247be0fa51ad33afcc7ebaa2b7d6c8cd5bc100199c5436399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ka/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8884da1d0c2cd6fa7aace95a8be04c8fd691b24428207eb62ffd3e7509494eb6"; + sha256 = "394edc1246d9cb08587a67069b27dfe3fb1a92f4ff4a58d314b55128c39d2bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kab/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "328ca68297bf281c573e6059f3cedb872396f0a7474e92caf78906d4d4089531"; + sha256 = "e30a08d4427fe896b528beb93b08b1bdc96a38a0817739faa63cd15c2f3014b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f632d1f23c5936bd498b695de562935a968e592013ffdfaf878516b94db9f149"; + sha256 = "f1b807647ea9deaf7d44e9bfb56403b9a27205c19c3b9f07ba4cfa174b6532c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/km/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8f7a5370f6108b6b7ac28c35a845378ae67929accafba911cca34c2e67dd6da8"; + sha256 = "650ad04c9b0c4d461ba28fab7e591453aaf75fe5bddce3c6b8993389814be589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "395311e396a7267baa31f74dd30cb2e2721784de4ebdaba72c44bb384e4a6aa7"; + sha256 = "459ec332671ff0e51e110ebb0e8b10e67743fb4b717e5fa165b5dae80054ffe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ko/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "40e0ca4c3380213a902ed08e0f7cb7feab7d45f9ac035467ac0a50cc99af771c"; + sha256 = "266849f41f7aa820ba459740becfbbbcb4a551140bf8e76b1eaafc63a6f9d2da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lij/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "35ed355715f7d6263ba90a563f573a3cd6ac186727b6e982692458720dfaedb2"; + sha256 = "b429ef6b085822fd3ea0fb14fd501a894b96a3f4af8fc34944fdc9ed1c82853b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lt/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0d0df39e1552a6e310d279f53384a8f8f8298df2f590fdb2683012499e599152"; + sha256 = "7b3c089719e901d12c8ad9153a582d229958db035badd4b94b5b496a2ab545d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lv/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "41905b366ba007d226c07064c90b104eba01be85397541e50ec7858e72c444df"; + sha256 = "3efd9d52bc61076208cedef303396c066ec260f7aa5fcccec5b072f2935d89de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3461c717fb3c1560ee383c044423874244c5fba95edbd2b8ab0ffd6223c03b10"; + sha256 = "f0b1dd701cd7e068d938ec4771fba8f4c3f04e906f575e64dca1dee640fdce22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3453bbf846392782d902217a331e1b74aaa93475131a866661e233ecdb4e108f"; + sha256 = "bd5adc1fa68f82a9d2fa54b74b74bdc170f4ead9bed5a79ec1ebf1bd12781a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ms/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7e3f92a4429eea8f3d79dd105164461b6e218842c3131e8a186cda71504ca3d7"; + sha256 = "dd106a1944d8ac9e49df16b3c67a86010be1ee62e3a780ad9c725f2335779131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/my/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "bb4ef9a5ea013aed6a85aad02211f744b8cbce62ae94ac815b6880b986503b9a"; + sha256 = "86e45fb6f490ad0cd66564a36e40c6d23169d69d1875022027aed09a1cad3d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nb-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e0e6524cfc56b09bb37501acf0ba2074c8fd2d1b3e9130e8c223b0156a02ee2d"; + sha256 = "ef6d5320470da9619f5668e13edae553038a53f80593b5d8392b3678dd8c1d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ne-NP/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ed13d6e6826b14efe1e7d322e7c93243c413277cc360c2f2f6389975e8a234a7"; + sha256 = "8607d4c024fb1d71068b73fb528bfbe42ee69bb12f9703343deb6a7e340c29f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "08e06314f3633a93363c79a4470fd78ae7fadb1421140da81ddf82f2cd8a1a87"; + sha256 = "a3ea133034cd0014f34c186d9c2fafc902bd51b5314429bb9b7c06e77447fd22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nn-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca2cc7cd99ae698e48bc75274811ca2e0cf92e34fead87fa4b3450d5cfeac522"; + sha256 = "09bff657619d23af40014b2e3bc845e6901abee241dfd28f4b5ef8f90c211c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/oc/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2136473ae8be4213aa16f542014a3c2671d538792ed87d06ab205be9d3ef2bf0"; + sha256 = "6eb63b7f50acf894e33fe9ea98c11b4133b7fb521e23e2fdd6bf9788570b4c78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pa-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8bcb5f76cab4a7c9635eb456ea05697c32e2eb22a4f81ff91142e0a92c9f358f"; + sha256 = "df15da9ff35e192b587ffdaea4d47d368a054148061117bb8f4222e5da6c82a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "445021b7e78eb046bafe176abd466679c296ddf2795deefb2c1e325388db0876"; + sha256 = "b12bd00b3de180f77f80e80622a8631ff37c32b45362856a64122ad54abf07d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-BR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "65212c864d33f04ad6e5250fdf674c274c696ee8d7c13a0c91f38d204b9dacda"; + sha256 = "0296501261b2c55e9acd14fff125f40f8a84fe0508004ea9fda03d2ff69f238c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-PT/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9e1664031ca29e5f0f9cab5bd0cddfe3a053a0737d5fae82ce42d8c4a89c3044"; + sha256 = "6a5a8328dcd10ad2da9bd45658bd43fca9ae58cc331546305594ce5d84f35017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/rm/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7ee02dc6ae964991e4aed47bd47fdea644cf6ab98a541f59c7f72eb175a04c57"; + sha256 = "41b5bd2e52f0d57475179c46c089ce36c3e1441b5751c670f6fbb6406853aab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ro/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "932a7723262b8c3c1ee54e9e06f4301b8996eb590c6c52030b42804d18f1cbdc"; + sha256 = "40a2e53b6b7dcdbd9380d3ede3e425178b670db2205b5a5066d0c4e93a3297c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ru/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "36727824ef047330a2448ea1c8a436dc074de60d64eec981d4cc52c3f3f6a4d9"; + sha256 = "b8f7ecf4a5d8f034e57672d19254cda671f213ce04914995260f6b5f97181edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/si/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8bbda31d0e2a7cc46740b2c0545c725c881f482c300efd9baa6fb4e2e7103d0d"; + sha256 = "19d29defd33580089317b72bc6209749727a53978d48294950feba3226839135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2ac41667c392735f11b21c149b7a1f29122c4528eed7863180c5f9a3528bc6b3"; + sha256 = "4e57b3bdba217d1550fa1ec847b825d66e2d5211d6d0f5342c50ccbab33bf464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4f60048b39306e9da94a5205a89dcaed1a30927fe1865ce6934a1ef0b0050a71"; + sha256 = "cf89ee419f552622fb9eccf8a28c15f6647afd06de27af0635ab74bfd9aa9619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/son/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3c83ccf6b9a037af11f9431423afada70c979cdd8d12117f0256576e56600b1b"; + sha256 = "64e7605b287432c38798e029ab2b02f136d7df876a9c8b3689ca603db0a736cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sq/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d87237e6ecdb3797c787f35f9ced339cc32380c23c3a0663cc3d46d3312aa8ea"; + sha256 = "9b56875e2f5505f7fef3c41d4ed7fd8801df8e981f9c8f7cf665104a40e255ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4e2a7a21e3f94b0344fa5bb471dafb11d4589ae3966799b7b4e82d8503f5e7a6"; + sha256 = "489a2d092f626f39a8e466c269486be8ae455d233e0e26d0c94953039668a57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sv-SE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4b91c958b998f7f3cd59b26a27bc848aea98d5319a169684b82dfc3750ab0fc6"; + sha256 = "9e45e9a0c79f9cb3c0c34fb2a26e608afb544716aa16843d53b3e6fd390e2685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ta/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9772ccd592e51ce71ea86b241c9bfdd78793a90b8f0156c049f1b603f1d9a8ea"; + sha256 = "2843290d4b90b057c6caa437514df0fa61a0cb901809c93690ac8247ff5b1233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/te/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b7906bbb4993e1fc231e02f390af62fcd40d7e6fb0cdc5031447d97c8e29eca9"; + sha256 = "fc9f7e9312fd1430cbbf0d92d8f001077d0af89ccef6c7edb3eff504772ddb79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/th/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dc978d91b6de96590cfd95514a9563510d4f4725a80402e2eb6b2289de1f49a9"; + sha256 = "622105aa85a0a5874c62f62afd77ffcdb1f4b2d329c255c56c7154a4bbfcb481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "98d617fb0ca75a977b127633a8050e119a047fc881161d97a852431231ecdc67"; + sha256 = "998b966b13dc0b1eaf9ffac1788cc354049c43834d3678b51e946f907e42bd9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1228b0ba249cb2b9367db532647fdd0d58057e11d1b182a0982ac12e2c8f686f"; + sha256 = "3dacf51f059f7b974e18d0cf4437bba48a0cf246014ed8ec38d06e2e09cb76f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/trs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e32783dc73b6e8d5aa2f0fc1e44fb361e07aecdacfa8a5f3dbcf0aadfa871762"; + sha256 = "e9ce3a2591c8a9b7c5cccc20c2b56ff47ff22947d2393f5e7b010f1242ba1982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "aea971a56865756e9e6cd25638051e3e8048c2110e72aad2961bad40025fec05"; + sha256 = "a8f78984d01fb54b7475e980aa5775fe7c298e1796cf603446e7cb9baa371bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ur/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "aa9ba0b3709ae1afc610b873877ec4b46a5ef3a801d04157c104ee985db4d9c7"; + sha256 = "0b56702343d7495b752246a9d03e4a5571be05394cebefd1ccd2ca822180259d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uz/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a3f0e1c314825ee0d8c6dfe6d5d5dabada792088342565d65cdc336fc74a8e98"; + sha256 = "46a98ce354b40d64690c0aaf1c553b1d1e5ce51494291ff93ae0e54a82d897d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/vi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "92f17fffcdbea8ca77dfc0da435ed936bd2011bb8b3bff7b565433ff281a9dc5"; + sha256 = "fcbaf1dbab64bbc8983d444b1601721591c164bb8ff50ae09d2b7925fa41185a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xh/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "05a56d5d5abb3d0090b2bcae93a7d1ea45050da6ecbdef013916dd3b26228c16"; + sha256 = "af8ff1f66472bbe39724ca714993246f02b0e9025b537ac7e52e65be29db4534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-CN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "39231fb7720d7e35f81eb4aaf188eeda2414cc700d8e9658c776ff3bb535e418"; + sha256 = "147a51431333da2333e4ecb0b307d4c74b3d66a626340b6bc25ded8c22c1acf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-TW/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "09d04e81464057e0ecb222b28009a255a51023ff70aab58ba4411c8457d331fc"; + sha256 = "e8d577aca0ac90285e9db278c2fc9eec1318407b830e4c231082b139320a4216"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5ca52a3953f1..f76a108c7ff1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -138,6 +138,8 @@ stdenv.mkDerivation ({ "-I${nss.dev}/include/nss" ]; + MACH_USE_SYSTEM_PYTHON = "1"; + postPatch = '' rm -rf obj-x86_64-pc-linux-gnu diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a024fc359d88..daed3c150b61 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "80.0.1"; + ffversion = "81.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "081sf41r7ickjij3kfrdq29a0d6wz7qv8950kx116kakh8qxgjy8ahk2mfwlcp6digrl4mimi8rl7ns1wjngsmrjh4lvqzh1xglx9cp"; + sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19"; }; patches = [ @@ -36,10 +36,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.2.0esr"; + ffversion = "78.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q"; + sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ab528a2c1cb8..d8a2e0429938 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.4"; + version = "10.0"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04="; + sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ="; + sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 16de2a6d14cd..fbf49b9f41bf 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.3.2022.39-1"; + version = "3.3.2022.47-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1d49556l067zilndm1381n1y22076qgww4n6nkscwchik2mj79sy"; + sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 6dc996c79754..f004a807aa79 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ab1s1r6zrqxcfjnij5ar352kzyrl1m92c04nqk6hahpzzma2p3r"; + sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 867a49e47b31..4341daba9a2d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.13"; + stableVersion = "2.2.14"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66"; - serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz"; + guiSrcHash = "0y0dkyky2vw8ixm8nx4qhsj5b6hk0lv2cayrj4879icmp8zc4dy3"; + serverSrcHash = "1vpsvvisw0sivlbjwawskkyiavl092qxaqxi13khkimz5fk0d3rc"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 076024684275..d176b66f7e5f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.2.458699.0906"; + version = "5.3.465578.0920"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0cwai5v2m99cvw1dnysl88fi97dwm6rq7xv3y0ydgg3499n8cjpf"; + sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp"; }; }; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index dbc6dc97ef20..01e808a9e725 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,20 @@ buildGoModule rec { pname = "ipfs"; - version = "0.6.0"; + version = "0.7.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80"; + sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3"; }; # tarball contains multiple files/directories postUnpack = '' mkdir ipfs-src - mv * ipfs-src || true + shopt -s extglob + mv !(ipfs-src) ipfs-src || true cd ipfs-src ''; @@ -27,9 +28,9 @@ buildGoModule rec { vendorSha256 = null; postInstall = '' - install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service - install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket - install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket + install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket + install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket substituteInPlace $out/etc/systemd/system/ipfs.service \ --replace /usr/bin/ipfs $out/bin/ipfs ''; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 93ccf254a3a4..61d149ba5b8e 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -10,11 +10,11 @@ assert !withPython; stdenv.mkDerivation rec { pname = "kismet"; - version = "2020-04-R2"; + version = "2020-09-R2"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm"; + sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 9bd25cfff1df..9fccd574eb14 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "gtg"; - version = "unstable-2020-08-02"; + version = "unstable-2020-09-16"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; - rev = "6623731f301c1b9c7b727e009f4a6462ad381c68"; - sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1"; + rev = "1be991c6d7f7b2e4b8ac16f82e8a07f9dce4272f"; + sha256 = "1f5acpjwnp08c78dds7xm22qjzcfnx2qs121yvm3rswkh27s4n23"; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1f60d7df9277..dcda1c41e3c6 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.2"; + name = "homebank-5.4.3"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6"; + sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index e478c104edef..7212b42198c4 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + # it's unclear which headers are intended to be part of the public interface + # so we may find ourselves having to add more here over time installPhase = '' - install -vD bwa $out/bin/bwa + install -vD -t $out/bin bwa + install -vD -t $out/lib libbwa.a + install -vD -t $out/include bntseq.h + install -vD -t $out/include bwa.h + install -vD -t $out/include bwamem.h + install -vD -t $out/include bwt.h ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix new file mode 100644 index 000000000000..076e459c8f0b --- /dev/null +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python3Packages, cmake, python3 }: + +let + pythonPackages = python3Packages; +in + +pythonPackages.buildPythonApplication rec { + pname = "obitools3"; + version = "3.0.0-beta14"; + + src = fetchurl { + url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz"; + sha256 = "17krklxfvxl6baf2m394gm1a88y0lg0bwqx20cf5q39zyw04z442"; + }; + + preBuild = '' + substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages"; + export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE" + ''; + + disabled = !pythonPackages.isPy3k; + + nativeBuildInputs = [ pythonPackages.cython cmake ]; + + dontConfigure = true; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib ; { + description = "Management of analyses and data in DNA metabarcoding"; + homepage = "https://git.metabarcoding.org/obitools/obitools3"; + license = licenses.cecill20; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 9d81e08d7293..7dee07275a0f 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octopus"; - version = "0.6.3-beta"; + version = "0.7.0"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n"; + sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 84cc9909a48d..fffeca2c740c 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "1.3.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v"; + sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; }; propagatedBuildInputs = with python3Packages; [ @@ -21,15 +21,16 @@ python3Packages.buildPythonApplication rec { pysam pyfaidx intervaltree + pytabix + acebinf + bwapy + joblib + pandas ]; - prePatch = '' - substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' '"progressbar2",' \ - --replace '"pysam==0.15.2",' '"pysam",' \ - --replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \ - --replace '"intervaltree==3.0.2",' '"intervaltree",' - ''; + # no tests + doCheck = false; + pythonImportsCheck = [ "truvari" ]; meta = with lib; { description = "Structural variant comparison tool for VCFs"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 99101a5fd1ca..6545472a5295 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.2"; + version = "14.31.3"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0p2cbzxhw1s4l76kbriag3r4dkpsfvrnydryyikgkbdwnq479hm2"; + sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy"; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch deleted file mode 100644 index a53142faba66..000000000000 --- a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt -index 5913076..b0453b5 100644 ---- a/avy/CMakeLists.txt -+++ b/avy/CMakeLists.txt -@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT) - set (Boost_NO_SYSTEM_PATHS "ON") - endif() - --set (Boost_USE_STATIC_LIBS ON) - find_package (Boost 1.46.1 REQUIRED program_options) - IF (Boost_FOUND) - include_directories (${Boost_INCLUDE_DIRS}) diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 78ed641a809a..6b48c1e34488 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, cmake, zlib, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avy"; - version = "2017.10.16"; + version = "2019.05.01"; # date of cav19 tag src = fetchgit { url = "https://bitbucket.org/arieg/extavy"; - rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; - sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; + rev = "cav19"; + sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy"; fetchSubmodules = true; }; @@ -31,10 +31,6 @@ stdenv.mkDerivation { patch -p1 -d glucose -i ${./glucose-fenv.patch} ''; - patches = - [ ./0001-no-static-boost-libs.patch - ]; - installPhase = '' mkdir -p $out/bin cp avy/src/{avy,avybmc} $out/bin/ diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index ff481fd7ab46..be80565115fe 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -13,16 +13,21 @@ stdenv.mkDerivation rec { patches = [ ./cvc3-2.4.1-gccv6-fix.patch ]; - preConfigure = '' + postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' + + # bison 3.7 workaround + for f in parsePL parseLisp parsesmtlib parsesmtlib2 ; do + ln -s ../parser/''${f}_defs.h src/include/''${f}.hpp + done ''; meta = with stdenv.lib; { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index b9bd2172bb1c..eacff32bdf62 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz"; - sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv"; + url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz"; + sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index b0e14859eedd..cb41ae670573 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,23 +1,73 @@ -{ callPackage, stdenv, fetchFromGitHub, ...}: +{ callPackage, stdenv, fetchFromGitHub, git, zsh, ...}: stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1kspz2fhryyjhn6gqf029rv0386a1ga08sf6g0l6smivw628k71l"; + sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh + sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install ''; installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.zsh $out + install -Dm555 install $out + install -Dm444 build.info $out + ''; + # Don't install the "install" and "build.info" files, which the end user + # should not need to worry about. + pathsToLink = [ + "/bin/gitstatusd" + "/gitstatus.plugin.zsh" + ]; + + # The install check sets up an empty Git repository and a minimal zshrc that + # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies + # that the script was sourced successfully and that the "gitstatus_query" + # command ran successfully. This tests the binary itself and the zsh + # integration. + installCheckInputs = [ git zsh ]; + doInstallCheck = true; + installCheckPhase = '' + TEMP=$(mktemp -d) + cd "$TEMP" + + git init + + echo ' + GITSTATUS_LOG_LEVEL=DEBUG + . $out/gitstatus.plugin.zsh || exit 1 + + gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST + gitstatus_query NIX_TEST + if [[ $? -ne 0 ]]; then + print -- "Something went wrong with gitstatus" + exit 1 + elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then + print -- "Not in a Git repo" + exit 1 + else + print -- "OK" + exit 0 + fi + ' > .zshrc + + # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job + # control will be disabled in the shell and the gitstatus plugin script + # will fail when it tries to set the MONITOR option. As a workaround, we + # run zsh as a full-fledged independent process and then wait for it to + # exit. (The "exit" statements in the zshrc ensure that zsh will exit + # almost immediately after starting.) + ZDOTDIR=. zsh -i & + wait $! ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 97eae68b6e72..eb8e41868822 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-v4l2sink"; - version = "0.1.0"; + version = "0.1.0-12-g1ec3c8a"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; rev = version; - sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; + sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix new file mode 100644 index 000000000000..0cbdeaaf6ff8 --- /dev/null +++ b/pkgs/applications/video/vcs/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux +, dejavu_fonts +}: +with stdenv.lib; +let + version = "1.13.4"; + runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ]; +in +stdenv.mkDerivation { + pname = "vcs"; + inherit version; + src = fetchurl { + url = "http://p.outlyer.net/files/vcs/vcs-${version}.bash"; + sha256 = "0nhwcpffp3skz24kdfg4445i6j37ks6a0qsbpfd3dbi4vnpa60a0"; + }; + + unpackCmd = "mkdir src; cp $curSrc src/vcs"; + patches = [ ./fonts.patch ]; + nativeBuildInputs = [ makeWrapper ]; + doBuild = false; + + inherit dejavu_fonts; + installPhase = '' + mkdir -p $out/bin + mv vcs $out/bin/vcs + substituteAllInPlace $out/bin/vcs + chmod +x $out/bin/vcs + wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "Generates contact sheets from video files"; + homepage = "http://p.outlyer.net/vcs"; + license = licenses.cc-by-nc-sa-30; + maintainers = with maintainers; [ elitak ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/video/vcs/fonts.patch b/pkgs/applications/video/vcs/fonts.patch new file mode 100644 index 000000000000..3df0359f8b26 --- /dev/null +++ b/pkgs/applications/video/vcs/fonts.patch @@ -0,0 +1,23 @@ +--- a/vcs 2020-04-04 14:37:53.531095977 -0700 ++++ b/vcs 2020-04-04 14:40:46.459407878 -0700 +@@ -3669,18 +3669,8 @@ + [[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return +- # Try to locate DejaVu Sans +- local dvs='' +- if [[ -d /usr/local/share/fonts ]]; then +- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then +- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ -z $dvs ]]; then +- warn "Unable to locate DejaVu Sans font. Falling back to helvetica." +- dvs=helvetica +- fi ++ # Use DejaVu Sans, by default ++ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf' + [[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs" + [[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs" + [[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs" diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5f002f5ddc83..e52401ba35fc 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -25,6 +25,7 @@ let "test_pid.py" "test_pid_file.py" "test_preserve_fds.py" + "test_resources" "test_start.py" "test_uid_gid.py" "test_update.py" @@ -34,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.14.1"; + version = "0.15"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0r77ksdrpxskf79m898a7ai8wxw9fmmsf2lg8fw3ychnk74l8jvh"; + sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc"; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 871592c88c2f..e1e7d2c277dd 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4"; + sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr"; }; vendorSha256 = null; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 23fb56539e45..0103e064828b 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -29,7 +29,7 @@ , target ? null , cargoVendorDir ? null , checkType ? buildType - +, depsExtraArgs ? {} # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -43,11 +43,11 @@ assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null - then fetchCargoTarball { + then fetchCargoTarball ({ inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; patches = cargoPatches; sha256 = cargoSha256; - } + } // depsExtraArgs) else null; # If we have a cargoSha256 fixed-output derivation, validate it at build time @@ -83,7 +83,7 @@ let in -stdenv.mkDerivation (args // { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 709d93dc2c9f..d50e89743425 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,32 +1,44 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip }: -let - version = "2.3"; -in fetchzip rec { - name = "comic-neue-${version}"; +stdenv.mkDerivation rec { + pname = "comic-neue"; + version = "2.5"; - url = "http://comicneue.com/${name}.zip"; + src = fetchzip { + url = "http://comicneue.com/${pname}-${version}.zip"; + sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q"; + stripRoot = false; # because it comes with a __MACOSX directory + }; - postFetch = '' - mkdir -vp $out/share/{doc,fonts} - unzip -j $downloadedFile OTF/\*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile Web/\*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile Web/\*.eot -d $out/share/fonts/EOT - unzip -j $downloadedFile Web/\*.woff -d $out/share/fonts/WOFF - unzip -j $downloadedFile Web/\*.woff2 -d $out/share/fonts/WOFF2 - unzip -j $downloadedFile \*.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt -d $out/share/doc/${name} + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}} + cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2 + + # Quick fix for conflicting names in upstream + for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do + cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'` + done ''; - sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779"; - - meta = with lib; { + meta = with stdenv.lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' - It is inspired by Comic Sans but more regular. The font was - designed by Craig Rozynski. It is available in two variants: - Comic Neue and Comic Neue Angular. The former having round and - the latter angular terminals. Both variants come in Light, + ComicNeue is inspired by Comic Sans but more regular. It was + designed by Craig Rozynski. It is available in two variants: + Comic Neue and Comic Neue Angular. The former having round and + the latter angular terminals. Both variants come in Light, Regular, and Bold weights with Oblique variants. ''; license = licenses.ofl; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 3942195aaa7f..63d6ef2c676f 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index cda24f0959aa..19fe43da49eb 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi chez-mit ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site:${chez-mit}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 2d2e0df1ec9b..864ccc5a7439 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { rm -rf $out/lib/csv${version}/examples ''; + setupHook = ./setup-hook.sh; + meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/development/compilers/chez/setup-hook.sh new file mode 100644 index 000000000000..1d81489bd4e4 --- /dev/null +++ b/pkgs/development/compilers/chez/setup-hook.sh @@ -0,0 +1,5 @@ +addChezLibraryPath() { + addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" +} + +addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index e04f7a03f942..7acbff95357d 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -12,32 +12,32 @@ in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; - # v2.1.15 (LTS) + # v2.1.22 (LTS) aspnetcore_2_1 = buildAspNetCore { - version = "2.1.16"; + version = "2.1.22"; sha512 = { - x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + x86_64-linux = "27v3a69dgnnb4lz5p2dn2qwadb8vpnqwdy6mnnqfp1dl4kgg3izvriz2268if272sy6flcz5lckjlmn0i0i1jci5zypc7x9kykj991l"; aarch64-linux = null; # no aarch64 version of this package is available - x86_64-darwin = "1psqqpin4hipr2hzfp79712d6cag892jx4fx5001nlsynwrdq3vi4liakz4yz41rvk0jyd7f07z90wj97xlxyrqiqcc1fdbgn2q0px9"; + x86_64-darwin = "0xh06jmzx2cfq51hv9l4h72hbfyh3r0wlla217821gi0hlw6xcc0gb3b4xmqcs240fllqnwrnrwz0axi3xi21wacgn3xbcmzpbi6jml"; }; }; netcore_2_1 = buildNetCore { - version = "2.1.16"; + version = "2.1.22"; sha512 = { - x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; - aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; - x86_64-darwin = "2pxqpcw3djr18m0y124fbd6pz4lb5brlgvpvd9pdirkpsar8dmipsrhxcsk0d902zyxzgj1ac1ygzxsz49xvrkmh6s1m3w5fk8fws2f"; + x86_64-linux = "0c2b31l59izcxbhz5wzjpjkdl550s5p3aid4vyghq468vyf67pm0npjny50c172b63vw0ikfbps2b2hj16hpifp116gj4b5llmqjhyc"; + aarch64-linux = "3llai3d2xpgbr7a4ndg9wqfpnb5zb8k07dicc57a6cmniiqyqigyxinhpx2k0l45mbnihjsr5k1rih3r6bwlj241v67iwd2i0dpqd8a"; + x86_64-darwin = "106mx6a4rwcvq41v54c1yx89156s43n889im9g0q2pvm7054q8b6xm6qrnymzmj5i2i6awyk0z02j5pfiyh35sw9afxb3695ymsb3v8"; }; }; sdk_2_1 = buildNetCoreSdk { - version = "2.1.804"; + version = "2.1.810"; sha512 = { - x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; - aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; - x86_64-darwin = "0fjn18vizgfdbziklhgppnvka5iw2hb4pfi6047i46il8ydb6z1m40cflq436sdf07sivi0mnldg9247qvqrl6f078w3fwnh3bwlac8"; + x86_64-linux = "388nrba5f7z9syq23xh3k45rzy3iys58s32ya7a0q9mwdf1y3haw7yvbq79cn08741hhqdi73mip8jf50f4s64mbr62ay1p76zsrkj5"; + aarch64-linux = "2vs8bhk63cjrqkm5n164ahc6bdz58aq9vmhaiyy27krp7wlkz4gpiva9153h7mywhk709l1qc7cddj99qsh2ygv6axjfigbhgrzslqi"; + x86_64-darwin = "3qxlgbd0np0w8wmp98mhp4cqgva4zglqf7k9kzqbwxfwr5s795kap7rs5w0cy7h0bsvj0ygx3d5nzyn9hp3fsswx4jl4mkvillnvjzy"; }; }; @@ -77,29 +77,29 @@ rec { # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.5"; + version = "3.1.8"; sha512 = { - x86_64-linux = "3ziyvm6llvhnjg8ayr4cfcabwkc46fqscgj12faavib34r5zx4mnv3qccqm3gg2r8jps60h42lvrwj3fliqmr0qqnhsw04819kqwai6"; - aarch64-linux = "2nbhvh8dpg7dghcs6ysdg7mcc60hbk5d3zab0nnbqkib93fdhbzhzcra9qhh80h8x03zw0jsn3gzqx0d1z2vz5z3lsa14vmb86pzj4a"; - x86_64-darwin = "1sfnp849vmsv8775fjsf9nzx28cmkvfgk8fa81h2l849z31ssaw9fn89kk0n83l0wrhr24ivmprfr11sp42gnjbncqfsnz4883lfchw"; + x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw"; + aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40"; + x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b"; }; }; netcore_3_1 = buildNetCore { - version = "3.1.5"; + version = "3.1.8"; sha512 = { - x86_64-linux = "03g6aghbpsxj9csaq9lkc8cad1nk8kvlivkarq6bfqvx992fxw6zryp7kcm5h6a5gkgpimb1nr17vndj1r629hdhpincqj8yw6i33mq"; - aarch64-linux = "25gwicmpzhzs96w3azypbl32bx967f14xkfdgvl7knw234rcmfv7zr0a7lb3vci68dbx4xywpnwlrvgi54mimzp8nagrgwva8zrrxzb"; - x86_64-darwin = "2g28jmv1n7pgxfq4wk9x58y5dp835c7rckz6c88ylk7g9w6z75l94pblfl1rc7mr6g3wddiy5cl87a607j9g283hv28a4vcpvll8s7g"; + x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc"; + aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf"; + x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c"; }; }; sdk_3_1 = buildNetCoreSdk { - version = "3.1.102"; + version = "3.1.402"; sha512 = { - x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; - aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; - x86_64-darwin = "00xs87zj94v6yr6xs294bficp6lxpghyfswhnwqfkx62jy80qr5fa2y7s10ich3cbm2daa8dby56iizdvi7rnlvp23gfkq12gq4w1g8"; + x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2"; + aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p"; + x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8"; }; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 53ccb57abe6b..369ea8626204 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -30,18 +30,6 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { - # GHC 8.8.3 support - # https://github.com/avh4/elm-format/pull/640 - patches = [( - fetchpatch { - url = "https://github.com/turboMaCk/elm-format/commit/4f4abdc7117ed6ce3335f6cf39b6495b48067b7c.patch"; - sha256 = "1zqk6q6w0ph12mnwffgwzf4h1hcgqg0v09ws9q2g5bg2riq4rvd9"; - } - )]; - # Tests are failing after upgrade to ghc881. - # Cause is probably just a minor change in stdout output - # see https://github.com/avh4/elm-format/pull/640 - doCheck = false; jailbreak = true; })); diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index e498b4b1494f..ff944cc4b647 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary , bytestring, cmark, containers, directory, filepath, free, HUnit , indents, json, mtl, optparse-applicative, parsec, process , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.8.3"; + version = "0.8.4"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8"; - rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b"; + sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; + rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; }; postPatch = '' mkdir -p ./generated @@ -18,15 +18,15 @@ mkDerivation { module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.3" + gitDescribe = "0.8.4" EOHS ''; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base binary bytestring containers - directory filepath free indents json mtl optparse-applicative - parsec process split text + ansi-terminal ansi-wl-pprint array base binary bytestring + containers directory filepath free indents json mtl + optparse-applicative parsec process split text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index d29a2bda3302..3e2c3cec0c1f 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "02p0s041wwsi4q0dhs1sj5l6059y02s31az505h0f22agz3jnpfn"; + sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix new file mode 100644 index 000000000000..f8d31f12cd45 --- /dev/null +++ b/pkgs/development/compilers/lobster/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, fetchFromGitHub +, cmake +, callPackage + +# Linux deps +, libGL +, xorg + +# Darwin deps +, cf-private +, Cocoa +, AudioToolbox +, OpenGL +, Foundation +, ForceFeedback +}: + +stdenv.mkDerivation rec { + pname = "lobster"; + version = "unstable-2020-07-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = pname; + rev = "9d68171494a79c83931426b624a0249a9c51882c"; + sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = if stdenv.isDarwin + then [ + cf-private + Cocoa + AudioToolbox + OpenGL + Foundation + ForceFeedback + ] + else [ + libGL + xorg.libX11 + xorg.libXext + ]; + + preConfigure = "cd dev"; + enableParallelBuilding = true; + + passthru.tests = { + can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + }; + + meta = with stdenv.lib; { + homepage = "http://strlen.com/lobster"; + description = "The Lobster programming language"; + longDescription = '' + Lobster is a programming language that tries to combine the advantages of + very static typing and memory management with a very lightweight, + friendly and terse syntax, by doing most of the heavy lifting for you. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/compilers/lobster/test-can-run-hello-world.nix b/pkgs/development/compilers/lobster/test-can-run-hello-world.nix new file mode 100644 index 000000000000..ceb0536b582c --- /dev/null +++ b/pkgs/development/compilers/lobster/test-can-run-hello-world.nix @@ -0,0 +1,13 @@ +{ stdenv, lobster }: + +stdenv.mkDerivation { + name = "lobster-test-can-run-hello-world"; + meta.timeout = 10; + buildCommand = '' + ${lobster}/bin/lobster \ + ${lobster}/share/Lobster/samples/rosettacode/hello_world_test.lobster \ + | grep 'Goodbye, World!' + touch $out + ''; +} + diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index a0268a543a5a..862184c1460c 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,46 +1,23 @@ -{ stdenv, fetchgit, coq, haskellPackages, which, ott -}: +{ stdenv, fetchFromGitHub, coq }: stdenv.mkDerivation rec { - name = "metalib-${coq.coq-version}-${version}"; - version = "20170713"; + name = "coq${coq.coq-version}-metalib-${version}"; + version = "20200527"; - src = fetchgit { - url = "https://github.com/plclub/metalib.git"; - rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52"; - sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9"; + src = fetchFromGitHub { + owner = "plclub"; + repo = "metalib"; + rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; + sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; }; - # The 'lngen' command-line utility is built from Haskell sources - lngen = with haskellPackages; mkDerivation { - pname = "lngen"; - version = "0.0.1"; - src = fetchgit { - url = "https://github.com/plclub/lngen"; - rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c"; - sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers mtl parsec syb ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/plclub/lngen"; - description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; - license = stdenv.lib.licenses.mit; - }; + sourceRoot = "source/Metalib"; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq ]; enableParallelBuilding = true; - buildPhase = '' - (cd Metalib; make) - ''; - - installPhase = '' - (cd Metalib; make -f CoqSrc.mk DSTROOT=/ COQLIB=$out/lib/coq/${coq.coq-version}/ install) - ''; + installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; meta = with stdenv.lib; { homepage = "https://github.com/plclub/metalib"; @@ -50,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index c47e29b6420e..6a494e7e5214 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -52,12 +52,6 @@ in [ sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj"; - }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.0.3"; @@ -66,14 +60,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { @@ -100,12 +88,6 @@ in [ sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.0.2"; - sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.0.3"; @@ -114,8 +96,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.1.3"; - sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw"; + version = "3.1.8"; + sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs"; }) (fetchNuGet { @@ -130,12 +112,6 @@ in [ sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; version = "3.0.3"; @@ -144,14 +120,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 7fad936260c3..991c385cedca 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -73,7 +73,7 @@ let # Miniperl needs -lm. perl needs -lrt. configureFlags = (if crossCompiling - then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ] else [ "-de" "-Dcc=cc" ]) ++ [ "-Uinstallusrbinperl" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e4230093e9c3..94422518b255 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs }: with pkgs; diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix new file mode 100644 index 000000000000..a311c5f5479f --- /dev/null +++ b/pkgs/development/libraries/audiality2/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +# The two audio backends: +, SDL2 +, jack2 +}: + +stdenv.mkDerivation rec { + pname = "audiality2"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "olofson"; + repo = "audiality2"; + rev = "v${version}"; + sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + jack2 + ]; + + meta = with stdenv.lib; { + description = "A realtime scripted modular audio engine for video games and musical applications"; + homepage = "http://audiality.org"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 312f927767dd..1963534ae51e 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3"; + sha256 = "sha256-7v8651yDkxTdRMoGhEl4d/k7mxYwfIwW/rkuyjqVGwY="; }; installPhase = '' diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 1da2f210c5cf..b9c12b1889c2 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, gflags }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags +, staticOnly ? false }: + stdenv.mkDerivation rec { pname = "crc32c"; version = "1.1.0"; @@ -14,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; meta = with stdenv.lib; { homepage = "https://github.com/google/crc32c"; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 4055cb8eb71e..2f7fe184845d 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "0.14.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq"; + sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr"; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix new file mode 100644 index 000000000000..0032941f870e --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -0,0 +1,23 @@ +{ stdenv, callPackage, fetchFromGitHub, enableStatic ? false, enableShared ? true }: +let + yesno = b: if b then "yes" else "no"; +in stdenv.mkDerivation rec { + pname = "libbacktrace"; + version = "2020-05-13"; + src = fetchFromGitHub { + owner = "ianlancetaylor"; + repo = pname; + rev = "9b7f216e867916594d81e8b6118f092ac3fcf704"; + sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh"; + }; + configureFlags = [ + "--enable-static=${yesno enableStatic}" + "--enable-shared=${yesno enableShared}" + ]; + meta = with stdenv.lib; { + description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; + homepage = https://github.com/ianlancetaylor/libbacktrace; + maintainers = with maintainers; [ twey ]; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 2c4357e1e936..2eba3ca8bc14 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,15 +4,20 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs"; + sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8"; }; + postPatch = '' + substituteInPlace meson.build --replace \ + "version: '0.2.0'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4e0836946c16..2034b658dc7f 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "0sx4irbmjgs5bm8dc8jc9fl1jmfdnrp3ar14hdhrsmbani7gqah3"; + sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf"; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 22fbc0e998a6..916af5434996 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "1r7arfdqfh6pfvjza6x2dzd5gjmkndngrp688d3n2ab92n5ijiqf"; + sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1"; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index c1878700aaac..bf302ff227c5 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "1sg7wzj2mi5vhba53cp52gnya7c799f0p325ig262vi70r7mr7n2"; + sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 90bc206a7bcf..6504ae100434 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "15rz11a8qwvxmd0kkaikj04q1glfg9sgqqblcqp3iahr3by8z0wd"; + sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm"; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 6f573adabe13..57635a3470cb 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index c43f9b04b934..ba780ae4bd6b 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "05963lxip3175g4b7k45r94yayp9gcwl3fpma9g5mdkbrlbvwlvz"; + sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k"; }; preConfigure = '' diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index b54e537fb823..ae22f0be1797 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 11a1c922b9ba..e1b4d375282e 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gfortran blas lapack - ] + ] # KLU support is based on Suitesparse. # It is tested upstream according to the section 1.1.4 of # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e650a28c61e5..8b5aa7428638 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' + substituteInPlace loader/vulkan.pc.in \ + --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \ + --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' ''; cmakeFlags = [ diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 0deec273881a..afb13a03cbbf 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "157lqfgz4lqa782iij7lkajgjbxv3vqf6y5hpdz36i6dg06paqqa"; + sha256 = "1mpns443ifbkbaxsw6yy8z01l7815259pxzd7s006npr0dxnc8ng"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 512748907003..610de2cb8ada 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "csexp"; - version = "1.3.1"; - - useDune2 = true; + version = "1.3.2"; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; - sha256 = "0maihbqbqq9bwr0r1cv51r3m4hrkx9cf5wnxcz7rjgn13lcc9s49"; + sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj"; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/pkgs/development/ocaml-modules/irmin/1.4.nix deleted file mode 100644 index c1d170f78eeb..000000000000 --- a/pkgs/development/ocaml-modules/irmin/1.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, astring, cstruct, fmt, hex, jsonm, logs, ocaml_lwt, ocamlgraph, uri -}: - -buildDunePackage rec { - pname = "irmin"; - version = "1.4.0"; - - minimumOCamlVersion = "4.03"; - - src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "019di4cz0z65knl232rnwj26npnc1mqh8j71xbf0mav6x350g1w5"; - }; - - propagatedBuildInputs = [ astring cstruct fmt hex jsonm logs ocaml_lwt ocamlgraph uri ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/mirage/irmin"; - description = "Irmin, a distributed database that follows the same design principles as Git"; - license = licenses.isc; - maintainers = [ maintainers.alexfmpe ]; - }; -} diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 51a8e08983c7..3bbb542bcba5 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, qcheck }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -then throw "qtest is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "qtest"; + version = "2.11"; -let version = "2.7"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-qtest-${version}"; - src = fetchzip { - url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2"; + src = fetchFromGitHub { + owner = "vincent-hugot"; + repo = pname; + rev = "v${version}"; + sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ qcheck ounit ]; - - installFlags = [ "BIN=$(out)/bin" ]; - preInstall = "mkdir -p $out/bin"; + propagatedBuildInputs = [ qcheck ]; meta = { - description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; - homepage = "https://github.com/vincent-hugot/iTeML"; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + description = "Inline (Unit) Tests for OCaml"; + inherit (src.meta) homepage; + maintainers = with lib.maintainers; [ vbgl ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 66054b334076..847951783ee0 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -3,8 +3,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "2.0.3"; - sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"; + version = "3.1.0"; + sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; buildInputs = [ dune ]; propagatedBuildInputs = [ charInfo_width ]; extra = { diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix new file mode 100644 index 000000000000..78810de1740d --- /dev/null +++ b/pkgs/development/python-modules/acebinf/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyvcf +}: + +buildPythonPackage rec { + pname = "ACEBinf"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1168pny671l6zfm2vv1pwspnflmzi7f4v8yldjl7zlz0b9cm5zlz"; + }; + + buildInputs = [ pyvcf ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "acebinf" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Collection of simple utilities used when building bioinformatics tools"; + license = licenses.unlicense; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix new file mode 100644 index 000000000000..31884074defd --- /dev/null +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, bwa +, cffi +, zlib +}: + +buildPythonPackage rec { + pname = "bwapy"; + version = "0.1.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "090qwx3vl729zn3a7sksbviyg04kc71gpbm3nd8dalqp673x1npw"; + }; + postPatch = '' + # replace bundled bwa + rm -r bwa/* + cp ${bwa}/lib/*.a ${bwa}/include/*.h bwa/ + + substituteInPlace setup.py \ + --replace 'setuptools>=49.2.0' 'setuptools' + ''; + + buildInputs = [ zlib bwa ]; + + propagatedBuildInputs = [ cffi ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "bwapy" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Python bindings to bwa mem aligner"; + license = licenses.mpl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix new file mode 100644 index 000000000000..69813e6a2eb7 --- /dev/null +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, colorlog +, csvw +, dateutil +, tabulate +, mock +, postgresql +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "clldutils"; + version = "3.5.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "clld"; + repo = pname; + rev = "v${version}"; + sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + dateutil + tabulate + colorlog + attrs + csvw + ]; + + checkInputs = [ + mock + postgresql + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index c55c85c3dfd7..39f2d1227e7c 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -4,6 +4,7 @@ buildPythonPackage { pname = "cozy"; version = "2.0a1"; + disabled = !isPy3k; propagatedBuildInputs = [ z3 ply python-igraph oset ordered-set dictionaries @@ -18,18 +19,18 @@ buildPythonPackage { # Yoink the Z3 dependency name, because our Z3 package doesn't provide it. postPatch = '' - sed -i -e '/z3-solver/d' requirements.txt + sed -i -e '/z3-solver/d' -e 's/^dictionaries.*$/dictionaries/' requirements.txt ''; # Tests are not correctly set up in the source tree. doCheck = false; + pythonImportsCheck = [ "cozy" ]; # There is some first-time-run codegen that we will force to happen. postInstall = '' $out/bin/cozy --help ''; - disabled = !isPy3k; meta = { description = "The collection synthesizer"; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix new file mode 100644 index 000000000000..76f7cb73b4c4 --- /dev/null +++ b/pkgs/development/python-modules/csvw/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, isodate +, dateutil +, rfc3986 +, uritemplate +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "csvw"; + version = "1.8.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = "csvw"; + rev = "v${version}"; + sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + attrs + isodate + dateutil + rfc3986 + uritemplate + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index fe4213d13f09..91f6f06f6d94 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -23,6 +23,7 @@ , singledispatch , mpi4py , bokeh +, pythonOlder }: buildPythonPackage rec { @@ -35,11 +36,13 @@ buildPythonPackage rec { sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c"; }; + disabled = pythonOlder "3.6"; + checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh - ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; + ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 14a9c7841a80..4b02cfdfa37f 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98"; + sha256 = "54a7d330833a2e7b0587446d7e4ae6d0244925a9a8e1dfe878f3f7e06cdedb62"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix new file mode 100644 index 000000000000..fbed406cebce --- /dev/null +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: + +buildPythonPackage rec { + pname = "google-crc32c"; + version = "1.0.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-crc32c"; + rev = "v${version}"; + sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + }; + + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; + + LDFLAGS = "-L${crc32c}/lib"; + CFLAGS = "-I${crc32c}/include"; + + checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; + + meta = with lib; { + homepage = "https://github.com/googleapis/python-crc32c"; + description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index ac8a111b3e76..5bd95004f93b 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -1,30 +1,35 @@ -{ stdenv +{ lib , buildPythonPackage +, isPy3k , fetchPypi , six , requests , setuptools , pytest , mock +, crcmod +, google-crc32c }: buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.7.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "57841f5e65fb285c01071f439724745b2549a72eb75e5fd979198eb518608ed0"; + sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI="; }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ]; + propagatedBuildInputs = [ requests setuptools six ] + ++ lib.optional isPy3k google-crc32c + ++ lib.optional (!isPy3k) crcmod; checkPhase = '' py.test tests/unit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 622360edd24e..9013c7d978fd 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,14 +1,13 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , six -, enum34 , decorator , nose , krb5Full , darwin -, isPy27 , parameterized , shouldbe , cython @@ -18,13 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.2"; + version = "1.6.9"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l"; + sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag"; }; # It's used to locate headers @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator six - ] ++ lib.optional isPy27 enum34; + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.GSS @@ -55,12 +55,21 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # many failures on darwin + doCheck = pythonOlder "3.8" # `shouldbe` not available + && !stdenv.isDarwin; # many failures on darwin + # skip tests which fail possibly due to be an upstream issue (see + # https://github.com/pythongssapi/python-gssapi/issues/220) checkPhase = '' + # some tests don't respond to being disabled through nosetests -x + echo $'\ndel CredsTestCase.test_add_with_impersonate' >> gssapi/tests/test_high_level.py + echo $'\ndel TestBaseUtilities.test_acquire_creds_impersonate_name' >> gssapi/tests/test_raw.py + echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests + ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' ''; + pythonImportsCheck = [ "gssapi" ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/gssapi"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7ac4bc5fdbef..04fe19377f8e 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.1.3"; + version = "6.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9990d51b9931a31e681635899aeb198b4c4b41586a9e87fbfaaed1a71d0a05b6"; + sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8"; }; LC_ALL = "en_US.utf8"; @@ -67,6 +67,9 @@ buildPythonPackage rec { "TestInstallServerExtension" "launch_socket" "sock_server" + ] ++ lib.optional stdenv.isDarwin [ + "test_delete" + "test_checkpoints_follow_file" ]; # Some of the tests use localhost networking. diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 8353e8d7895f..09cda2797300 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "2.3.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4"; + sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index ca723a0e5739..db6895edfbf8 100644 --- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,119 +1,100 @@ -diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py ---- PySDL2-0.9.6-old/sdl2/dll.py 2018-03-08 10:18:37.583471745 +0100 -+++ PySDL2-0.9.6/sdl2/dll.py 2018-03-08 10:20:06.705517520 +0100 -@@ -45,29 +45,31 @@ +diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py +--- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200 +@@ -94,15 +94,16 @@ """Function wrapper around the different DLL functions. Do not use or instantiate this one directly from your user code. """ - def __init__(self, libinfo, libnames, path=None): -- self._dll = None ++ def __init__(self, libinfo, libfile): + self._dll = None + self._libname = libinfo + self._version = None - foundlibs = _findlib(libnames, path) - dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") - if len(foundlibs) == 0: - raise RuntimeError("could not find any library for %s (%s)" % - (libinfo, dllmsg)) -- for libfile in foundlibs: -- try: -- self._dll = CDLL(libfile) -- self._libfile = libfile -- break -- except Exception as exc: -- # Could not load the DLL, move to the next, but inform the user -- # about something weird going on - this may become noisy, but -- # is better than confusing the users with the RuntimeError below -- warnings.warn(repr(exc), DLLWarning) -- if self._dll is None: -- raise RuntimeError("found %s, but it's not usable for the library %s" % -- (foundlibs, libinfo)) ++ #foundlibs = _findlib(libnames, path) ++ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ #if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ foundlibs = [ libfile ] + for libfile in foundlibs: + try: + self._dll = CDLL(libfile) +@@ -117,9 +118,9 @@ + if self._dll is None: + raise RuntimeError("found %s, but it's not usable for the library %s" % + (foundlibs, libinfo)) - if path is not None and sys.platform in ("win32",) and \ - path in self._libfile: - os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ def __init__(self, libfile): -+ self._dll = CDLL(libfile) -+ self._libfile = libfile -+ # self._dll = None -+ # foundlibs = _findlib(libnames, path) -+ # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ # if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) -+ # for libfile in foundlibs: -+ # try: -+ # self._dll = CDLL(libfile) -+ # self._libfile = libfile -+ # break -+ # except Exception as exc: -+ # # Could not load the DLL, move to the next, but inform the user -+ # # about something weird going on - this may become noisy, but -+ # # is better than confusing the users with the RuntimeError below -+ # warnings.warn(repr(exc), DLLWarning) -+ # if self._dll is None: -+ # raise RuntimeError("found %s, but it's not usable for the library %s" % -+ # (foundlibs, libinfo)) -+ # if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ #if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) - def bind_function(self, funcname, args=None, returns=None, optfunc=None): + def bind_function(self, funcname, args=None, returns=None, added=None): """Binds the passed argument and return value types to the specified -@@ -110,7 +112,7 @@ +@@ -220,7 +221,7 @@ return try: - dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2") ++ dll = DLL("SDL2", "@sdl2@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py ---- PySDL2-0.9.6-old/sdl2/sdlgfx.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlgfx.py 2018-03-08 10:20:06.705517520 +0100 -@@ -34,8 +34,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py +--- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_gfx") ++ dll = DLL("SDL2_gfx", "@sdl2_gfx@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py ---- PySDL2-0.9.6-old/sdl2/sdlimage.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlimage.py 2018-03-08 10:20:06.705517520 +0100 -@@ -26,8 +26,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py +--- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200 +@@ -27,8 +27,7 @@ ] try: - dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_image") ++ dll = DLL("SDL2_image", "@sdl2_image@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py ---- PySDL2-0.9.6-old/sdl2/sdlmixer.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlmixer.py 2018-03-08 10:20:27.415758478 +0100 -@@ -50,8 +50,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py +--- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200 +@@ -53,8 +53,7 @@ ] try: - dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_mixer") ++ dll = DLL("SDL2_mixer", "@sdl2_mixer@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py ---- PySDL2-0.9.6-old/sdl2/sdlttf.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlttf.py 2018-03-08 10:20:06.705517520 +0100 -@@ -38,8 +38,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py +--- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_ttf") ++ dll = DLL("SDL2_ttf", "@sdl2_ttf@") except RuntimeError as exc: raise ImportError(exc) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index b22da8b83ac6..be9663245bb5 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: +{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; @@ -18,19 +18,18 @@ buildPythonPackage rec { # which library they want to include. buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ]; propagatedBuildInputs = [ SDL2 ]; - patches = [ ./PySDL2-dll.patch ]; - postPatch = '' - substituteInPlace sdl2/dll.py --replace \ - "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlttf.py --replace \ - "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlimage.py --replace \ - "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlgfx.py --replace \ - "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlmixer.py --replace \ - "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')" - ''; + patches = [ + (substituteAll ({ + src = ./PySDL2-dll.patch; + } // builtins.mapAttrs (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}") { + # substituteAll keys must start lowercase + sdl2 = SDL2; + sdl2_ttf = SDL2_ttf; + sdl2_image = SDL2_image; + sdl2_gfx = SDL2_gfx; + sdl2_mixer = SDL2_mixer; + })) + ]; meta = { description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix new file mode 100644 index 000000000000..eb21ca198180 --- /dev/null +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +, zlib +}: + +buildPythonPackage rec { + pname = "pytabix"; + version = "0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ldp5r4ggskji6qx4bp2qxy2vrvb3fam03ksn0gq2hdxgrlg2x07"; + }; + + buildInputs = [ zlib ]; + + doCheck = !isPy3k; + preCheck = '' + substituteInPlace test/test.py \ + --replace 'test_remote_file' 'dont_test_remote_file' + ''; + pythonImportsCheck = [ "tabix" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/slowkow/pytabix"; + description = "Python interface for tabix"; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 26f3ffd4fe6b..9844c8dca443 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.1"; pname = "rabbitpy"; # No tests in the pypi tarball, so we directly fetch from git @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "gmr"; repo = pname; rev = version; - sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6"; + sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; }; propagatedBuildInputs = [ pamqp ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' # See: https://github.com/gmr/rabbitpy/issues/118 substituteInPlace setup.py \ - --replace 'pamqp>=1.6.1,<2.0' 'pamqp' + --replace 'pamqp>=2,<3' 'pamqp' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 5590630e1321..d85d8e396f20 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix new file mode 100644 index 000000000000..8c2e22708aab --- /dev/null +++ b/pkgs/development/python-modules/segments/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, regex +, csvw +, clldutils +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "segments"; + version = "2.1.3"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = pname; + rev = "v${version}"; + sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + regex + csvw + clldutils + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "Unicode Standard tokenization routines and orthography profile segmentation"; + homepage = "https://github.com/cldf/segments"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 420ee7b24722..d34a826a0604 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -10,6 +10,7 @@ , toolz , tornado , zict +, pythonOlder }: buildPythonPackage rec { @@ -38,6 +39,8 @@ buildPythonPackage rec { requests ]; + disabled = pythonOlder "3.6"; + # Disable test_tcp_async because fails on sandbox build # disable kafka tests checkPhase = '' diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index aa6db6a73533..328cfb0ba8bb 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -6,6 +6,7 @@ , regex , requests , numpy +, parameterized , sacremoses , sentencepiece , timeout-decorator @@ -16,13 +17,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk"; + sha256 = "0jj94153kgdyklra30xcszxv11hwzfigzy82fgvgzvbwlxv3a1j5"; }; propagatedBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; checkInputs = [ + parameterized pytestCheckHook timeout-decorator ]; @@ -49,14 +51,17 @@ buildPythonPackage rec { preCheck = '' export HOME="$TMPDIR" - cd tests # This test requires the nlp module, which we haven't # packaged yet. However, nlp is optional for transformers # itself - rm test_trainer.py + rm tests/test_trainer.py ''; + # We have to run from the main directory for the tests. However, + # letting pytest discover tests leads to errors. + pytestFlagsArray = [ "tests" ]; + # Disable tests that require network access. disabledTests = [ "PegasusTokenizationTest" @@ -76,6 +81,7 @@ buildPythonPackage rec { "test_tokenizer_from_model_type" "test_tokenizer_from_model_type" "test_tokenizer_from_pretrained" + "test_tokenizer_from_tokenizer_class" "test_tokenizer_identifier_with_correct_config" ]; diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 0aa379322ee6..c5629a6fb73f 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, heapdict }: +, pytest, heapdict, pythonOlder }: buildPythonPackage rec { pname = "zict"; @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; }; + disabled = pythonOlder "3.6"; + buildInputs = [ pytest ]; propagatedBuildInputs = [ heapdict ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index abaff0a80679..fe7b834e8e81 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "06y4p65zzd7nmpvpnfcig58wbrav9ifbpqw1lhs2vdav17035xif"; + sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp"; }; - vendorSha256 = "0c1b06np4yhixndig11kxxvj24rk50l1sdqah8kzhi2cqjwvmpw0"; + vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l"; doCheck = false; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index f146929019f0..ae2e63e040b1 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d93ec54b3e3a..7c796b47f28a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0nndm936g0i18ly6395y5s4h1f6cfbg602cvlg7c6w007f2j15hq"; + sha256 = "0zvf060nsd8cvyclkaasqlc9bw699vh2004qrvcy8hf50b2z1bi2"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 78db979299c8..c89b7acc51d8 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.4"; + version = "6.5.5"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii"; + sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 275aa7eb304e..60b9ba3e0e45 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, optparse-applicative -, parsec, stdenv, text +{ mkDerivation, base, containers, fetchgit, hedgehog +, optparse-applicative, parsec, stdenv, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.5"; + version = "0.0.6"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "0immbx4bgfq3xmbbrpw441nx0sdpm4cp64s7qbvcbvllp4gbivpg"; - rev = "848ff9966db21c66e61a19c04ab6dfc9270eb78e"; + sha256 = "0ql3xrr05kg1xrfxq86mhzh5ky33sngx57sahzck3rb8fv2g6amv"; + rev = "cf976e033c1a89f897924baa219c3b227fe68489"; fetchSubmodules = true; }; isLibrary = true; @@ -16,6 +16,9 @@ mkDerivation { base containers optparse-applicative parsec text ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hedgehog parsec template-haskell text + ]; description = "Convert dconf files to Nix, as expected by Home Manager"; license = stdenv.lib.licenses.asl20; } diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index caee8058f0ff..55125fbeff45 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.3"; + version = "0.9.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0mr0pxicka4qd0cn002g5r80dyg59164czyb0r7012l0q1xighz2"; + outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 6f24fc7251e5..36798fe4fc1a 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "global"; - version = "6.6.4"; + version = "6.6.5"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq"; + sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix new file mode 100644 index 000000000000..f42868826d55 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sync-readme"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "phaazon"; + repo = pname; + rev = version; + sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc"; + }; + + cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; + + meta = with stdenv.lib; { + description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; + homepage = "https://github.com/phaazon/cargo-sync-readme"; + license = licenses.bsd3; + maintainers = with maintainers; [ b4dm4n ]; + }; +} diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix new file mode 100644 index 000000000000..746e9d6bbef0 --- /dev/null +++ b/pkgs/games/koboredux/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, requireFile +, cmake +, pkg-config +, SDL2 +, SDL2_image +, audiality2 +, useProprietaryAssets ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "koboredux"; + version = "0.7.5.1"; + + src = + [(fetchFromGitHub { + owner = "olofson"; + repo = "koboredux"; + rev = "v${version}"; + sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; + })] + ++ + (optional useProprietaryAssets (requireFile { + name = "koboredux-${version}-Linux.tar.bz2"; + sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; + message = '' + Please purchase the game on https://olofson.itch.io/kobo-redux + and download the Linux build. + + Once you have downloaded the file, please use the following command + and re-run the installation: + + nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 + + Alternatively, install the "koboredux-free" package, which replaces the + proprietary assets with a placeholder theme. + ''; + })); + + sourceRoot = "source"; # needed when we have the assets source + + # Fix clang build + patches = [(fetchpatch { + url = "https://github.com/olofson/koboredux/commit/cf92b8a61d002ccaa9fbcda7a96dab08a681dee4.patch"; + sha256 = "0dwhvis7ghf3mgzjd2rwn8hk3ndlgfwwcqaq581yc5rwd73v6vw4"; + })]; + + postPatch = optionalString useProprietaryAssets '' + cp -r ../koboredux-${version}-Linux/sfx/redux data/sfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux data/gfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux_fullscreen data/gfx/ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_image + audiality2 + ]; + + meta = { + description = "A frantic 80's style 2D shooter, similar to XKobo and Kobo Deluxe" + + optionalString (!useProprietaryAssets) " (built without proprietary assets)"; + longDescription = '' + Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and + feel of 90's arcade cabinets. The gameplay is fast and unforgiving, + although with less of the frustrating quirkiness of the actual games + of the 80's. A true challenge in the spirit of the arcade era! + '' + optionalString (!useProprietaryAssets) '' + + This version replaces the official proprietary assets with placeholders. + For the full experience, consider installing "koboredux" instead. + ''; + homepage = "https://olofson.itch.io/kobo-redux"; + license = with licenses; if useProprietaryAssets then unfree else gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 9d23515c0394..9bdf979d7dd4 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -59,7 +59,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gnome2.pango gtk3-x11 gtk2-x11 @@ -87,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.16102"; + version = "2.1.17627"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i"; + sha256 = "04zjjyy0psfxfibzbac9w0kkgqwfpf1qmbj5gspyvhaib7k8may0"; }; icon = fetchurl { diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 2ce6806bcb4f..fa27eab27581 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos osu.Desktop + dotnet restore --source "$PWD/nixos" osu.Desktop runHook postConfigure ''; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 5e8429f0336a..bdea1db9b3e9 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -4,20 +4,31 @@ let arch = if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "11"; + version = "12"; + + nnueFile = "nn-82215d0fd0df.nnue"; + nnue = fetchurl { + name = nnueFile; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; + }; in stdenv.mkDerivation { - pname = "stockfish"; inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0"; + sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; - postUnpack = "sourceRoot+=/src"; + postUnpack = '' + sourceRoot+=/src + echo ${nnue} + cp "${nnue}" "$sourceRoot/${nnueFile}" + ''; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; buildFlags = [ "build" ]; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index a9901fa3dccc..f83e26c28ce1 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -51,7 +51,15 @@ in mkDerivation { # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to # install directory, so we add absolute paths here - patches = [ ./emuopts.patch ]; + patches = [ + ./emuopts.patch + # Make the parallel build reliable -- see https://github.com/mamedev/mame/pull/7279 + (fetchpatch { + name = "fix-mame-parallel-build.patch"; + url = "https://github.com/mamedev/mame/commit/13a54fd4e8b8b1a4aad77671562b2d9ef3d82e1f.patch"; + sha256 = "1p4bszir9hcdjx6am58p48zh17rhjzlhx2baiacas7fnig61i02n"; + }) + ]; postPatch = '' substituteInPlace src/emu/emuopts.cpp \ diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 568af317d255..d1fa03898231 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -13,13 +13,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5160"; + version = "1.0.5346"; src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "58f65b6523fb25d989b011c51f963520c811f9f0"; - sha256 = "19fizqmcr8i3axi3j5hg8p6dxr1pxnl5l58z4pws6nj1xbq8z5mi"; + rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c"; + sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm"; }; nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos Ryujinx.sln + dotnet restore --source "$PWD/nixos" Ryujinx.sln runHook postConfigure ''; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index cb25865f2198..94093e1e29c6 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -56,33 +56,28 @@ }) (fetchNuGet { name = "LibHac"; - version = "0.11.3"; - sha256 = "0xj2ip3bjy29xwy4fn5fncjadwbbg59sa3580cmkj47aab9cddyn"; + version = "0.12.0"; + sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1v7i4f1k3j8xavbfwb7qr5f680gg5nblrmx5zcsj7l07q4wbnmwl"; + version = "3.1.8"; + sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "1gciv56vzfpl86lb9gzvyfj8w2qd7jhdrbxph6l1aykwzqbxf7bd"; + version = "3.1.8"; + sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.2.0"; - sha256 = "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki"; - }) - (fetchNuGet { - name = "Microsoft.CodeCoverage"; - version = "16.5.0"; - sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + version = "16.7.0"; + sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -96,28 +91,28 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "3.1.2"; - sha256 = "0sy1h7ffq8s3bkvf1carf4rn9qf7hn0yv6dcjklgh3g9jhlsq34f"; + version = "3.1.8"; + sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "3.1.2"; - sha256 = "1yqsnl4my2q1ps666162kn0h34wyfajiwqs6snhrww195b59msdv"; + version = "3.1.8"; + sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1wb8h30di1mix8liz937snl1w8hbblixrpiazjskxclp3i7m1rg3"; + version = "3.1.8"; + sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "0aj005mh57ynscf87cpfshc3ff22l4svf6lqz0hpqsi0hlidqwqx"; + version = "3.1.8"; + sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -151,33 +146,18 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.2.0"; - sha256 = "1nr5jxchdy3p7jm4fm73d5yivghjisdsyafma8fs5d1v49bhgckq"; - }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + version = "16.7.0"; + sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.2.0"; - sha256 = "1ywzyx75d61wm75l7wglxzglg5k9nq66wd56m52hmmg8mf253z57"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.5.0"; - sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + version = "16.7.0"; + sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.2.0"; - sha256 = "05dx9nv1skc5ji79ji5vz6c93b09w9xh70iyy6j5ca978ga92i6g"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; - version = "16.5.0"; - sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + version = "16.7.0"; + sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -189,11 +169,6 @@ version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.0.0"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; - }) (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.3.0"; @@ -256,13 +231,8 @@ }) (fetchNuGet { name = "NUnit3TestAdapter"; - version = "3.15.1"; - sha256 = "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y"; - }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.16.1"; - sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; + version = "3.17.0"; + sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { name = "OpenTK.NetStandard"; @@ -274,21 +244,11 @@ version = "3.22.25.56"; sha256 = "12b0761nfsci4rvzcba4hrh5rcn6q24qaxwwz66myb82c999qj8w"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; - }) (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7"; - }) (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; @@ -299,11 +259,6 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; - }) (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; @@ -314,111 +269,56 @@ version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; - }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; - }) (fetchNuGet { name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; - }) (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; - }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; - }) (fetchNuGet { name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; - }) (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; - }) (fetchNuGet { name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877"; - }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; - }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -519,21 +419,11 @@ version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; - }) (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha"; - }) (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; @@ -549,21 +439,11 @@ version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; - }) (fetchNuGet { name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; - }) (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; @@ -579,21 +459,11 @@ version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { - name = "runtime.win.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; - }) (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { - name = "runtime.win.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "1dn9k6x8h27b6vbqh72hsfxax4fwf30jj8lc5328rg52lw29cyn1"; - }) (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; @@ -609,11 +479,6 @@ version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { - name = "runtime.win.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; - }) (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; @@ -624,26 +489,6 @@ version = "4.3.0"; sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) - (fetchNuGet { - name = "SkiaSharp"; - version = "1.68.1.1"; - sha256 = "013yzsk798dwxdf2y5yx675x96nagfapkri5k3pgsjnmyfp1lvzk"; - }) - (fetchNuGet { - name = "SkiaSharp.NativeAssets.Linux"; - version = "1.68.1.1"; - sha256 = "07448kn9x56pxlnkxp2dpr5jmwj62k48y5m4608mwci32vs675hn"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Desktop.Common"; - version = "1.68.1.1"; - sha256 = "0wkj952iha7w2i8mvl0mksz2wqkx7vi7xylh10xgddld8kkm03r7"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Gtk3"; - version = "1.68.1.1"; - sha256 = "19fgshim2i60p55j4jcr0biq6k2xwal5dsmbgvyrrajnssaj3r95"; - }) (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; @@ -684,66 +529,31 @@ version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.0.1"; - sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; - }) (fetchNuGet { name = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.0.1"; - sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; - }) (fetchNuGet { name = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; - version = "4.0.11"; - sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; - }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.1.0"; - sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; - }) (fetchNuGet { name = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.1.0"; - sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; - }) (fetchNuGet { name = "System.ComponentModel.TypeConverter"; version = "4.3.0"; @@ -769,31 +579,16 @@ version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { - name = "System.Diagnostics.Process"; - version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }) (fetchNuGet { name = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; - version = "4.0.0"; - sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; - }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }) (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; @@ -929,16 +724,6 @@ version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }) - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; - }) (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; @@ -994,11 +779,6 @@ version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; - }) (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; @@ -1039,6 +819,16 @@ version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0-preview.7.20364.11"; + sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; + }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; @@ -1079,21 +869,11 @@ version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; - version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; - }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Json"; - version = "4.0.2"; - sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; - }) (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; @@ -1209,11 +989,6 @@ version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { - name = "System.Threading.Overlapped"; - version = "4.0.1"; - sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; - }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; @@ -1239,21 +1014,11 @@ version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }) (fetchNuGet { name = "System.Threading.ThreadPool"; version = "4.3.0"; @@ -1279,36 +1044,16 @@ version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.0.1"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; - }) (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 93fd20190e8f..f1b2b6d63865 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -341,12 +341,12 @@ let clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2020-09-02"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "e0f5c246883fb06b6331ff5bec8ef1c3c71af3d4"; - sha256 = "0kincdj1l3d552pjnrdjcl72fpln6klc85b01m1sn2b2dlin3xhz"; + rev = "293a1062274a06be61797612034bd8d87851406e"; + sha256 = "1whipcrr4pcg1bkivq3l753v3f3glbhkdd6wp6f9czspr7hx2h2d"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-17"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "fd1fbf5eaba58ff25cae154bc98b3ceaa6467d8b"; - sha256 = "0h9ff2n7mw00vn0yw5jkfa8p8ii9gj25lnir7812b182480my1mg"; + rev = "810fa85761f44519116d4c8020f163e4ec76ad01"; + sha256 = "04gnz214gkb3hsxb2xwisbmmjf6njka6yvaf8xcwzplzxxnl2zxg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-09-13"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "825f7f5b89fb1708f18711798ef7a2ba6aa1bde5"; - sha256 = "19lp2znwjc6p9wmqbp92qjvy1hvddh89hfcy739haf53pbnscds4"; + rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847"; + sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,12 +522,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "f6f63add3a6004183ae6f2fff12b5b9f5067f493"; - sha256 = "059msciykax5gcf71i80zxn0qm9hpf7g7k5cn8h2xqxil13jxrin"; + rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3"; + sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -558,12 +558,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-09-08"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "566915cc545edd68bab2ad76eb59dfa43648a8b3"; - sha256 = "0qcg51wmkz6bfz8pz4ryl78ifl7pf8lsjszp2kh0sbq7raz1kpkn"; + rev = "a9431410d74f2281ae626727342a5d23d4a12552"; + sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -678,12 +678,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-05-26"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d93d97813dc839ef0782302a0debd7c4877f09f3"; - sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k"; + rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740"; + sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -726,12 +726,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "ac40f5170ba097efec0f9055c92fe95e20ee2a7e"; - sha256 = "031bgs5ypw20ffml7x2nbrfzpi4zqb64d1n9j3blyy4yyaa60089"; + rev = "a84cb7f88afc904123858b226240c3339b7ca814"; + sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -774,12 +774,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7d54f44e1035aea4cba99bdb34f0565b55008706"; - sha256 = "1bjslhsw3xm4pvzks7b1v7il8ap2mr7n64sv2sgx56c5fl410pkl"; + rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406"; + sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -908,24 +908,24 @@ let deoplete-khard = buildVimPluginFrom2Nix { pname = "deoplete-khard"; - version = "2020-04-30"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "nicoe"; repo = "deoplete-khard"; - rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7"; - sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066"; + rev = "dc2b519e8da0df10c3954946285caf484d376497"; + sha256 = "126mhnn4dqwm3aw6v4c3s3fnz40lki4cbb8xfrmxfbnbnjw1yx4x"; }; meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-08-25"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "4fd2507dd295d9c114febabb0c9cf31da87df008"; - sha256 = "1alwf8gjvgj5q3sbrqxrm0f2nbf6drk6dxqipk9pmvbj50iadyf1"; + rev = "17cd3fae3044eb8148bc22167257d4ae13165eb1"; + sha256 = "1xag51j71ifjn64xyaz7whml796pdl8vsw0ad22wndwzb95kyxdm"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1125,12 +1125,12 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2019-04-05"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; - sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; + rev = "4b71facd77297cb33bbb3b14894676cff0a9bd1d"; + sha256 = "1kxkjm6fzmircg5gh7w2bmvjgk8ly5vvq9l31m4p6ql48azg2ilc"; }; meta.homepage = "https://github.com/elmcast/elm-vim/"; }; @@ -1535,7 +1535,7 @@ let hoon-vim = buildVimPluginFrom2Nix { pname = "hoon-vim"; - version = "2019-02-19"; + version = "2020-02-19"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; @@ -1942,6 +1942,18 @@ let meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { + pname = "lsp_extensions-nvim"; + version = "2020-09-06"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "lsp_extensions.nvim"; + rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2"; + sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz"; + }; + meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/"; + }; + lushtags = buildVimPluginFrom2Nix { pname = "lushtags"; version = "2017-04-19"; @@ -2268,12 +2280,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-16"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "edb1751fbe5330f32ded49d736b8c403ae071fba"; - sha256 = "19m0yyasjnm5863yw9qlkbschj6f901p6qn89brf2ml7app9vmb4"; + rev = "4f259033bfbc1465c3a8348fcf632260d96a3e6f"; + sha256 = "09grfx66m5wasqy8blhqhfcqnsh3b4gfyyi09l1zda1vr2hhvz15"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2316,12 +2328,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-08-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "b7ba77a4eb39a95ffbb6b3ff0c3c43746441b2aa"; - sha256 = "0yf55pi6d35brdva4n0x7yygjnymwbgwn1fx83nbzxhixmgbk45b"; + rev = "886a414e339fe40a47f30da8aa6012a6e0906018"; + sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2352,12 +2364,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-08-06"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "48bc5d0bddd3debb9bdf73ee1d1153d7cafa693e"; - sha256 = "0495n0l9isi7pgfgc2axkk0v4g7r4dpbzxg5dl4hg7qkw6la7l5k"; + rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8"; + sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2424,12 +2436,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-09-11"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "a8c031f11dd312f53357729ca47ad493e798aa86"; - sha256 = "1d64cmywhj43q9fkrh0kcfsxa7ijxcb1fbz38pxaacg082y6l0jy"; + rev = "97eeaee46308a39cadfd2273280fcc4906988dd0"; + sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -2556,12 +2568,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-17"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b2e1ea1edf2cb42d20a941595cd0b4fcb871a0b5"; - sha256 = "1lg7mmp87r35h9rsf8pkngnxkgrjwg43a3aig6zmg37v58kgwv1j"; + rev = "98c12ec23a6df2f2f505304b61c4b2eefc0a568f"; + sha256 = "138rsbk2kx929cih6r3rqmgrygamnc1l9kh62pqsrphi28jh5178"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2964,12 +2976,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-09-10"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "2a6736852cbe64e2883adc70a427cb47cb3305bc"; - sha256 = "1zykkq674rg7b6bh57bpfrw5fwhk4fij7mqgdcxi5sk6blcld5j0"; + rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; + sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3060,12 +3072,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-09-13"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "ea78de9eda97728d3489c29eb3e9c8a9b2fdd868"; - sha256 = "0kn1qpkwsv7m58gr3jydynnm12gqns503dhnfqcw7yshbq5sr9rr"; + rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; + sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3144,12 +3156,12 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2019-02-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "ajh17"; repo = "Spacegray.vim"; - rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; - sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; + rev = "338b319da09b5e62744a54c79148262ba0f24bf3"; + sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb"; }; meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; @@ -3204,12 +3216,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-07-21"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "46efa9796716fe645d43f6018de3e06296978c7b"; - sha256 = "126a9v4j217g1kflfabqx0bz02k0xkwqfagzhk51n7drh2r2m7k6"; + rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20"; + sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3265,12 +3277,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-09-09"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "3e31762a26f7c29c0f6344c4215ca9074f4ead8d"; - sha256 = "11wbxnvqgkgmcb3yl5zsn4v6va17p20nnrqxrqbr6y8ia39n7wa0"; + rev = "20fb41cb3ee7efd041866fad7384668d131a0029"; + sha256 = "1gmk9hlyz8k5880gzs0pqbpmscjzfj3cwfdkg950w5ky2lm0i7n2"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3313,12 +3325,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-09-13"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "30fb229937d640889448de9c4f8b71b19946c67b"; - sha256 = "01vl3id1fmkd8p9hb2x2mb5iyyfad5a84ibfl6fkr7sm59jfgc2j"; + rev = "6099093050d84094001f2f226ddc09d7c2edcdd6"; + sha256 = "1gvyq1gra9k3fjjzr4lh9kwf0h2a5di242kxlwyj78p9606cdf9g"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4058,12 +4070,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-17"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "415fd21e109ca05e22a38613f93baf1f96ede08c"; - sha256 = "066k0mdcxqv2hl9jdy93i6v5mi8mhr3q8zr1cd5xrxsxzgv9r476"; + rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf"; + sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4562,12 +4574,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-09-14"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "72f4b6d4ec8aac44ea6f5ee6e3693b7388cd3449"; - sha256 = "07wcpc7kr113m574zfxjlh65pyhfm24a2f7lyadmhr1sah05iv6s"; + rev = "f936a7671888638dec54b86f2e49001a0e5e6005"; + sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4670,12 +4682,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-08-26"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f"; - sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23"; + rev = "49315d0c74acb983f2902260ebc9d86f85758ea4"; + sha256 = "0i2lhfw542c7xm7d10b0q5isw3398ycyn06mnp429nwb7fldv1ww"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4706,12 +4718,12 @@ let vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2020-01-04"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; - sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; + rev = "c046de1b9d4cf97ff6f80cf3bdbb75b1094f2aaf"; + sha256 = "0q08hs4y9d4c4zdd0lh4k054133y0455fkn47gi7h16m01g92imc"; }; meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; @@ -4766,12 +4778,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-15"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b919c60a6d1ca70a93d56fa4ee13dbcf412a8554"; - sha256 = "0sz08nbmk8pqlc4b1vypwv6xbhg7nrns6g1abp7xkzwn07lnrqb2"; + rev = "0a9792612fb87c5581906a9cc410b472c25a0d78"; + sha256 = "1gwswqmxd29hpj8rvf2v866877xc4fz3jhymkf0whhw62ya5gr9v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5355,36 +5367,36 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-08-29"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630"; - sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc"; + rev = "8262f528ca50832826efd0605ddc17a3830b53d1"; + sha256 = "0s1ayrprv59dki7xhzzlzxdfrkm3i70p8wh8sf48higvcrsjjylv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "46330cd0cbab3780b59a53c16fde6273bb217071"; - sha256 = "121pr3s13bcy1hqc4bcx0x7isg0x5izbrsvir33d39q2x0wj44my"; + rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800"; + sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-08-06"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f60443777137a0f91e489b1757c6602c63fb3731"; - sha256 = "1r6raxhwg78azcqv7brvas3w4xr7aja1gmcapm7j6mv69izf1fzw"; + rev = "cdf8247c0abd251475be26a044b2e95698df6c09"; + sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5727,12 +5739,12 @@ let vim-osc52 = buildVimPluginFrom2Nix { pname = "vim-osc52"; - version = "2017-06-23"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "fcpg"; repo = "vim-osc52"; - rev = "01a311169b2678d853c87b371201205daf8fdf1a"; - sha256 = "1nxla8r4036shbmyx6wpxy9ncy1s2c5ghi5n5ip22b01lcv6lnv5"; + rev = "551f20e62e68684a5b745ae08b0c4236d86e4c2b"; + sha256 = "0yxjs32ab27l3kmh5lpinj15m11winqsnmykjq7lizs15v7gd2s9"; }; meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; @@ -5919,12 +5931,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "06548fe61765d8a68a289741ce8d30f04a037e60"; - sha256 = "18yiqj62vpkvnxgcy1hqbdy846g4c3i807d3bbiz1kgwf9jh50ik"; + rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709"; + sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6123,12 +6135,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-09-08"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "98595736d4d91552647ea0130e704cd1a3d5d1d1"; - sha256 = "1b6224f4q4lpd3sdn3ka8gdcnyi82ii8bh4baxf8mp9c0r6qwcns"; + rev = "45ea40da3f223fff83fce0a643875e560ed20aae"; + sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -6159,12 +6171,12 @@ let vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2019-11-13"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; - sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; + rev = "5958a99c4ac783cec668380917ac1f62b27466fe"; + sha256 = "1vs2rfhcxm9v4ndnsx85b1i29h67qv748k3nvdxc145v1hjcnapm"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -6387,12 +6399,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-09-05"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "791c72d53399c7db9ec5a19922efee15d8f5a94b"; - sha256 = "0ap477g8265w7rprk4z402m3xxpci35xq602z1g7x86488afgsrw"; + rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7"; + sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6579,12 +6591,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-09-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "4c0ae1aa9324dc37e0d8bb672ecdcb313f97f75c"; - sha256 = "1rg9r0zpxwbzj710rm3jh9bvgdngmn8c4ikcv0rjk7d7wy2pclkn"; + rev = "f77a07617a649684148de97e5a9115e659166f6a"; + sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6736,12 +6748,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-04-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; - sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; + rev = "2fd76aa930e34838335c1aa125b88e7ea671e6c0"; + sha256 = "1xy0vp9sgqjm6qpfic2bbla4mxihw7j41gvi8cn0wsira6qcwda0"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6868,12 +6880,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-15"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d74c0b97ab0514ac924daa6dde87bee005d3469a"; - sha256 = "0jg2prsdfhs0vq43flsm8clhbamnddpafn2ajwjcxgyjb6dn6ndj"; + rev = "68c9570285f067020f0358623cafe63dbc2bd63f"; + sha256 = "1dpv6v449bcn6n72jjgvlnc9mnq3cpfy9b8m6mmjgvzgzkc1wj10"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6892,12 +6904,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-17"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "3d2d4b8e6cb219d615d54e3fa31288ff85879711"; - sha256 = "1iadzwzf0v64a89zavw9dh1n6cp7388npm7zihcfdflhisrbrk22"; + rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f"; + sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -6952,12 +6964,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-09-14"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "2109edb1706b26dab64a1851bd934571d5b48dc1"; - sha256 = "12zmhv49wx1h1zd28l9591iglipx2avmfwg7qk918sgx96bym1sf"; + rev = "89644adb8cc75ea96b4ab8e8218f22f1cc0deb23"; + sha256 = "1cyzfj86qizqnqi3ypf0cx4pvl9bsas77pxd1jpb5f3lslh2xhh8"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7144,12 +7156,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-11"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "173f2d6f375bc58bffc6b871c5786ba183af09ee"; - sha256 = "0gyqp71c21yd134065c6brf3avlwy4s9zzf471gal7y41kap5ya4"; + rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c"; + sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7157,12 +7169,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9b53bb31a04e4ad4aaad43f3b5200f2494c256ae"; - sha256 = "180w0ajhjvwscl1f0w15yrb1lhvxm878izici1wj0sn06gkb51cp"; + rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde"; + sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7205,12 +7217,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-09-17"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "7972a7c6ebb3d5a1ab505605477b0fb79b5a7700"; - sha256 = "0qh8kwvl5dbc3k3pqfpc7liqvisjh08v7w9igrh719v0zdhdlyhv"; + rev = "9c9adf16db3445005181751f0d3db143d58fe24d"; + sha256 = "0d1c2p63kkvhgwcrj97qc4yahnx7z9q14qwadbj924w8qlvylmff"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7338,12 +7350,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-16"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "d98f896ada495c3687007313374b2f945a2f2fb4"; - sha256 = "1p6x5qd6zvzg3ypllsgl7n9vk18g67dqyqg4zg9j07c9fsqs6383"; + rev = "4891999f055167cf845671c231d7740c104074bd"; + sha256 = "0cgbrgw1ppk7a8vwg0j2zf123clczkf9qv6gaaqmm8kz9j2n4pkb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7387,12 +7399,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-09-14"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "9e26b43ada8959f533604be3622fa56bf1d54752"; - sha256 = "1hlqnq83fl0jma0w7pra1iwq174gc2v32sfcjg39yd3hv9dmkl4v"; + rev = "9979e503e675b432c55a83891238c631f7f16a01"; + sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c5e53ba3f737..f328d0505fa1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -492,6 +492,7 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +tjdevries/lsp_extensions.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index a0229f595d4e..a914d70f173e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -60,6 +60,18 @@ in }; }; + haskell.haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "haskell"; + publisher = "haskell"; + version = "1.1.0"; + sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 321f00b0ef2d..79132852d239 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, kernel ? false }: +{ fetchFromGitHub, stdenv, kernel ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.9"; + pname = "cryptodev-linux-1.11"; name = "${pname}-${kernel.version}"; - src = fetchurl { - urls = [ - "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" - ]; - sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; + src = fetchFromGitHub { + owner = "cryptodev-linux"; + repo = "cryptodev-linux"; + rev = pname; + sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9"; }; hardeningDisable = [ "pic" ]; @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = "http://cryptodev-linux.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix new file mode 100644 index 000000000000..e98de6bbe9e8 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -0,0 +1,38 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +rustPlatform.buildRustPackage rec { + pname = "firmware-manager"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; + + depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + + postPatch = '' + sed -i 's|etc|$(prefix)/etc|' Makefile + ''; + + buildPhase = "make prefix='$(out)'"; + + installPhase = "make prefix='$(out)' install"; + + cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + + doCheck = false; + + meta = { + description = "Graphical frontend for firmware management"; + homepage = "https://github.com/pop-os/firmware-manager"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix new file mode 100644 index 000000000000..40598abac921 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -0,0 +1,39 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +rustPlatform.buildRustPackage rec { + pname = "system76-firmware"; + # Check Makefile when updating, make sure postInstall matches make install + version = "1.0.17"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ lzma openssl dbus ]; + + cargoBuildFlags = [ "--workspace" ]; + + cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s"; + + # Purposefully don't install systemd unit file, that's for NixOS + postInstall = '' + install -D -m -0644 data/system76-firmware-daemon.conf $out/etc/dbus-1/system.d/system76-firmware-daemon.conf + + for bin in $out/bin/system76-firmware-* + do + wrapProgram $bin --prefix PATH : "${efibootmgr}/bin" + done + ''; + + meta = { + description = "Tools for managing firmware updates for system76 devices."; + homepage = "https://github.com/pop-os/system76-firmware"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index fd62f07cd9c5..5de0eea0beac 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.07.00"; + version = "20.08.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0azhcnlfziwn8wvw3fly2jfjyg53m8zba3jlcxgzrasgb0kvzb1c"; + sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 585bbfd165e2..cbd19b7da8b4 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.4"; + version = "5.8"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0prrgb11pjrr6dw71v7nx2bic127qzrjifvz183v3mw8f1kryim2"; + sha256 = "1d1dfynrzh52zdia1l23ajv4q5wixgffnc1gkz05qrxnn2n4p75m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c903b88e3506..ca353ae9227d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.65.a.patch", - "sha256": "028nxwjy2sp5bvi9m76nl9x1gyrk4752p376bwvz1h47ljw2hwni", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.65.a/linux-hardened-5.4.65.a.patch" + "name": "linux-hardened-5.4.67.a.patch", + "sha256": "0jpjc1magvlhfwrx43n68xcxxk1g5w2g0rvp92n7yli0db97k1bm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.67.a/linux-hardened-5.4.67.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.10.a.patch", - "sha256": "0myfn5iz7gljj977fwsi3vzvm3n66yihrj2w207m3sr9mw9hp6d9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.10.a/linux-hardened-5.8.10.a.patch" + "name": "linux-hardened-5.8.11.a.patch", + "sha256": "0cbmlwfzh9ppcvih437sp832rkhr7dfhx97drnkz4gysfyiyh07l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.11.a/linux-hardened-5.8.11.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 58721a2a6427..e0c370c59466 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.198"; + version = "4.14.199"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00xmij2l4qmx1s07hplxkn9ddlwiyalh2l5fqdk6d8v031cbmyhy"; + sha256 = "1yflafb0n783igghk6d392pk6lbk3p2w7y01ams08f1b4qm47wq2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d50535e5d328..aebded8cb739 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.146"; + version = "4.19.147"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim"; + sha256 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 937149c571c7..c6f9b6ddb47c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.236"; + version = "4.4.237"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1v1mx16x1crnxf4pix0bhw40lq89n7wpd66gjc2mhxi75h6x6i80"; + sha256 = "1q6hwjwvlsikgr8b04l7v2jia2wyqxgbli6i7y20aq49h13ap2qk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 116e40fed782..c6d29d2d8a52 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.236"; + version = "4.9.237"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ma2z0nvby4qyxzi3vxa28f0wvlnl74njk6cryjrqaksq6161qp7"; + sha256 = "07w6mwgh7i3bvg1w3w5i9kgxjmvqr7cv7nzrmx7j9p6cq295gv41"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 90f191c3681b..046007c58e64 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.66"; + version = "5.4.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; + sha256 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 14abb483eee7..d9567b20e03e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.10"; + version = "5.8.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx"; + sha256 = "0jy0yrrixzql9dlk9305w98pja2pm6ijrdbai326595pnk740n9y"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index b59a367c4ad3..f58f08ca913d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.61-rt37"; # updated by ./update-rt.sh + version = "5.4.66-rt38"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj"; + sha256 = "1w0v5wl5fhxl5axd4701dljxhv9rywpgiix3yv7l6i3c5b8iw1zi"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 74abd12868d5..2e9003c3f926 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,16 +1,47 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bash, flex, bison, valgrind }: stdenv.mkDerivation rec { pname = "lockdep"; - version = "4.1.2"; - fullver = "4.1.2"; + # it would be nice to be able to pick a kernel version in sync with something + # else we already ship, but it seems userspace lockdep isn't very well maintained + # and appears broken in many kernel releases + version = "5.0.21"; + fullver = "5.0.21"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; - preConfigure = "cd tools/lib/lockdep"; + # ensure *this* kernel's userspace-headers are picked up before we + # fall back to those in glibc, as they will be from a mismatched + # kernel version + postPatch = '' + substituteInPlace tools/lib/lockdep/Makefile \ + --replace 'CONFIG_INCLUDES =' $'CONFIG_INCLUDES = -I../../../usr/include\n#' + ''; + + nativeBuildInputs = [ flex bison ]; + + buildPhase = '' + make defconfig + make headers_install + cd tools/lib/lockdep + make + ''; + + doCheck = true; + checkInputs = [ valgrind ]; + checkPhase = '' + # there are more /bin/bash references than just shebangs + for f in lockdep run_tests.sh tests/*.sh; do + substituteInPlace $f \ + --replace '/bin/bash' '${bash}/bin/bash' + done + + ./run_tests.sh + ''; + installPhase = '' mkdir -p $out/bin $out/lib $out/include diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index df71a953fee5..7c37fcf231fc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -32,6 +32,17 @@ rec { # No active beta right now beta = stable; + # Vulkan developer beta driver + vulkan_beta = generic { + version = "450.56.11"; + persistencedVersion = "450.57"; + settingsVersion = "450.57"; + sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010"; + settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; + persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; + url = "https://developer.nvidia.com/vulkan-beta-4505611-linux"; + }; + # Last one supporting x86 legacy_390 = generic { version = "390.138"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 63091e9875f9..8a9e340a20a2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -1,8 +1,11 @@ { version +, url ? null , sha256_32bit ? null , sha256_64bit , settingsSha256 +, settingsVersion ? version , persistencedSha256 +, persistencedVersion ? version , useGLVND ? true , useProfiles ? true , preferGtk2 ? false @@ -11,7 +14,7 @@ , prePatch ? "" , patches ? [] , broken ? false -}: +}@args: { stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, perl, nukeReferences @@ -46,12 +49,12 @@ let src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; sha256 = sha256_32bit; } else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; @@ -89,6 +92,7 @@ let withGtk3 = !preferGtk2; }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + inherit persistencedVersion settingsVersion; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index de36ad06c60c..ff2792ac315d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,14 +2,14 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nvidia-persistenced"; - inherit (nvidia_x11) version; + version = nvidia_x11.persistencedVersion; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-persistenced"; - rev = nvidia_x11.version; + rev = nvidia_x11.persistencedVersion; inherit sha256; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index b1250e56ee06..fbddd7b7fa21 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -9,13 +9,13 @@ let src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-settings"; - rev = nvidia_x11.version; + rev = nvidia_x11.settingsVersion; inherit sha256; }; libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; buildInputs = [ libXrandr libXext ]; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { pname = "nvidia-settings"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; nativeBuildInputs = [ pkgconfig m4 ]; diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index e97e17784cbf..b7c0e27669da 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { installPhase = '' install -D system76_acpi.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76_acpi.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index be6c1f6c3ad6..02eca1d5bbd5 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { installPhase = '' install -D system76.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index c4b3070e9f2f..2d0d4abd9141 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.5"; + version = "3.8.8"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; + sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7"; }; buildInputs = @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; - license = stdenv.lib.licenses.mpl11; + license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2aae5634cc5e..2afc5da51f57 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,8 +1,8 @@ { config, stdenv, lib, fetchurl, fetchpatch -, perl -, libcap, libtool, libxml2, openssl +, perl, pkg-config +, libcap, libtool, libxml2, openssl, libuv , enablePython ? config.bind.enablePython or false, python3 ? null -, enableSeccomp ? false, libseccomp ? null, buildPackages +, enableSeccomp ? false, libseccomp ? null, buildPackages, nixosTests }: assert enableSeccomp -> libseccomp != null; @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.12"; + version = "9.16.7"; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; + url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; + sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ./remove-mkdir-var.patch ]; - nativeBuildInputs = [ perl ]; - buildInputs = [ libtool libxml2 openssl ] + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libtool libxml2 openssl libuv ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-libtool" - "--with-libxml2=${libxml2.dev}" - "--with-openssl=${openssl.dev}" (if enablePython then "--with-python" else "--without-python") "--without-atf" "--without-dlopen" @@ -59,7 +57,6 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/bind9-config $dev - moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host @@ -68,13 +65,15 @@ stdenv.mkDerivation rec { moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils - for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do + for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; doCheck = false; # requires root and the net + passthru.tests = { inherit (nixosTests) bind; }; + meta = with stdenv.lib; { homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 17fdb15ad460..ceb887e678eb 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,37 @@ -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index b8e356b..cbe6c94 100644 ---- a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION); - EXTERN const char * named_g_product INIT(PRODUCT); - EXTERN const char * named_g_description INIT(DESCRIPTION); - EXTERN const char * named_g_srcid INIT(SRCID); +diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +--- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 ++++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 +@@ -69,7 +69,9 @@ + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff --git a/bin/named/main.c b/bin/named/main.c -index 62d9ce3..342abdc 100644 ---- a/bin/named/main.c -+++ b/bin/named/main.c -@@ -459,8 +459,10 @@ printversion(bool verbose) { + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +diff -ru a/bin/named/main.c b/bin/named/main.c +--- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 ++++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 +@@ -506,7 +506,9 @@ } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", - named_g_builder, named_g_configargs); + printf("built by %s with %s\n", named_g_builder, named_g_configargs); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); - #else -@@ -1001,9 +1003,11 @@ setup(void) { - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "running on %s", named_os_uname()); + #else /* ifdef __clang__ */ +@@ -1102,9 +1104,11 @@ + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", + named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "built with %s", named_g_configargs); + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", + named_g_configargs); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 9d1a56877d76..5197b1d3dffe 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "048bfkazjijf7p0wb5y09qhl7pgg297xxshgmkfyr025d7d50lf4"; + sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w"; rev = "v${version}"; }; - vendorSha256 = "1pvyr3lazza89njdl6q3h2nd0mkvjvbryyrfqv11kd3s52055ckz"; + vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp"; doCheck = false; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index a12c86cd3f0f..1a11e065d938 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ]; + maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index aca694f53d65..5c01453cb277 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index c489f2b14f73..a59e18837d7d 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index ac5b9475028e..e449f4ae954e 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 0bcad77c4155..975c09225101 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.1.5"; + version = "7.2.0"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "089z2x6jhiv5cx70vm7f1pyj5avappnaxrwah8jbnlkaz2kisp79"; + sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0l1lw3y5w4s6qfkmclzc6h6hqwxqmxlppnwsq1zpm2hmrndy440j"; + sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz"; }; - vendorSha256 = "0i0qdfh6cjdjg2mrrabm42427aaxs6a90ydb554ds14k6r4jdf8b"; + vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index fa3c9e4dd4ec..a1fd39152075 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "04rjqmlhv55jmdc159q5ckrakq5iwp18wi72lzl6zy21yk5hxmp0"; + sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 168cee9711bc..9625c240c5d9 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; + sha256 = "1q5gy1jaklk885xjda9dhf6jd5q3sc7jd8p1zdlwv4srxf6sgf10"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3f344f673f16..030e5695b225 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11.1"; + name = "dash-0.5.11.2"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k"; + sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 889598b07989..47a6c457e5ce 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1mq3vx8vrvvh3jrdqhrkbnnfkjsjw5ipw15d0602i1x05fxah4v4"; + sha256 = "0k0d9fb9f7zfyh7lifaviz8xnx1ansnh1f4q0rhc547m1y4kdw46"; }; - vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; + vendorSha256 = "0br641lh2bqz18p5riv6dh01kr11vbbnrn4i5r80b0lgjy1774sl"; doCheck = false; diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 37f4026799b6..8c1378d97bc4 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "orangefs"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "http://download.orangefs.org/current/source/orangefs-${version}.tar.gz"; - sha256 = "15669f5rcvn44wkas0mld0qmyclrmhbrw4bbbp66sw3a12vgn4sm"; + sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq"; }; nativeBuildInputs = [ bison flex perl autoreconfHook ]; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix new file mode 100644 index 000000000000..4feca6a040b4 --- /dev/null +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3, makeWrapper }: + +python3.pkgs.buildPythonApplication rec { + + pname = "ubidump"; + version = "unstable-2019-09-11"; + + src = fetchFromGitHub { + owner = "nlitsme"; + repo = pname; + rev = "0691f1a9a38604c2baf8c9af6b826eb2632af74a"; + sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; + }; + + propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + + patchPhase = '' + sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py + patchShebangs ubidump.py + ''; + + installPhase = '' + install -D -m755 ubidump.py $out/bin/ubidump + wrapProgram $out/bin/ubidump --set PYTHONPATH $PYTHONPATH + ''; + + installCheckPhase = '' + $out/bin/ubidump -h > /dev/null + ''; + + meta = with stdenv.lib; { + description = "View or extract the contents of UBIFS images"; + homepage = "https://github.com/nlitsme/ubidump"; + license = licenses.mit; + maintainers = with maintainers; [ sgo ]; + }; +} + diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index b167a73466de..ccc4a23cb558 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.1"; + version = "2.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah"; + sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index 3419a8d2850b..4041a9abdbad 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35"; + sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn"; }; dontBuild = true; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 5da2a366cf88..8e2503d06d42 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -3,27 +3,26 @@ , fetchFromGitHub , pkg-config , zlib -, openssl , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "1h4872jb0xz8yzs02q8wfvqrp20y7kdva5ka6bh6nq4jrnnky8zb"; + sha256 = "1abmg2zk1qipqdl1yfj8ibm1w8n7fazxqccsg1gq4xzlhhfp3m2l"; }; - cargoSha256 = "1vq1rrav9r9z4y0v7hpn0fcq64slq4zrm2pybmnmb7h9nfxxyr6k"; + cargoSha256 = "0l750067x8k92ngg32bb8mnbq09aj65sdnpzdhij9n1mh90rkck9"; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; @@ -31,5 +30,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus zowoq ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/98181 }; } diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index c07de47e477f..91203e5f7be5 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -9,14 +9,14 @@ }: let pname = "wootility"; - version = "3.5.10"; + version = "3.5.12"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y"; + sha256 = "13bhckk25fzq9r9cdsg3yqjd4kn47asqdx8kw0in8iky4ri41vnc"; }; profile = '' diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 4740b3ac55f5..a6b0a93324f1 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.0"; + version = "3.1.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1"; + sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; }; propagatedBuildInputs = diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index d3aa432a45e1..61746ebfcc5f 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,24 +5,22 @@ buildGoModule rec { pname = "amass"; - version = "3.10.1"; + version = "3.10.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y"; + sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; }; vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; - doCheck = false; - outputs = [ "out" "wordlists" ]; postInstall = '' mkdir -p $wordlists - cp -R $src/examples/wordlists/*.txt $wordlists + cp -R examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 63e19e924fca..a3d819e8dcfe 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.3.1"; + version = "2.3.4"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; + sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 07c7dda64468..2caf18d9a4b0 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0v6m0c329wmba2fihnqvrmfnrb5b1l4nm6xr0dsjiwsjpclrmy86"; + sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; }; - cargoSha256 = "130kjjig5jsv3kdywj6ag2s55d5hwsslpcnaanrqyl70a6pvgpb2"; + cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 5dd5f3c153fd..f0d2cd9a0df6 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8"; + sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 17064cf913e8..ad3bb6eeb1b0 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.6-2"; + version = "0.8.7"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1m7sql2y2kj94gr607n48m0h4b3rijyzvxrssyizv75spmxr4d5r"; + sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index a8ca38e1f1dc..17cb0308a168 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildGoModule , fetchFromGitHub , pkg-config @@ -24,9 +24,10 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; + buildInputs = [ libpcap libusb1 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A man in the middle tool"; longDescription = '' 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. diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 5d12a0008158..13146c3373e7 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -11,8 +11,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "11yaz8ap9swx95j3wpqh0b6jhw6spqgfnsyn1liw9zqi4jwgiax7"; }; + postPatch = '' + substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython' + ''; + propagatedBuildInputs = [ python3.pkgs.dns ]; + # tests require network access + doCheck = false; + pythonImportsCheck = [ "fierce" ]; + meta = with stdenv.lib; { homepage = "https://github.com/mschwager/fierce"; description = "DNS reconnaissance tool for locating non-contiguous IP space"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 01fd10d6777d..170f3109a0a6 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { - sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc"; + sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 35fb630d2380..76654d145399 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.6.6"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1"; + sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 8cbc56e04689..69f523773107 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 5a4dfd5de854..a2c6ec8a9e08 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.6"; + version = "2.2.7"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = pname; rev = "v${version}"; - sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w"; + sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7"; }; patches = ./fix-configure-path.patch; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 9c0526c3e63e..9921862b798e 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g"; + sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c111685ca01b..434ce8371f7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4605,9 +4605,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - buildGoModule = buildGo114Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo114Module; @@ -7597,6 +7595,8 @@ in ua = callPackage ../tools/networking/ua { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -9376,6 +9376,12 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; + lobster = callPackage ../development/compilers/lobster { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) + Cocoa AudioToolbox OpenGL Foundation ForceFeedback; + }; + lld = llvmPackages.lld; lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; @@ -9726,6 +9732,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -10217,10 +10224,10 @@ in pythonInterpreters = callPackage ./../development/interpreters/python { # Overrides that apply to all Python interpreters - pkgs = pkgs // { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }; + pkgs = pkgs.extend (final: _: { + qt5 = final.qt514; + libsForQt5 = final.libsForQt514; + }); }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; @@ -11916,6 +11923,8 @@ in aubio = callPackage ../development/libraries/aubio { }; + audiality2 = callPackage ../development/libraries/audiality2 { }; + audiofile = callPackage ../development/libraries/audiofile { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; @@ -13280,6 +13289,8 @@ in libb2 = callPackage ../development/libraries/libb2 { }; + libbacktrace = callPackage ../development/libraries/libbacktrace { }; + libbap = callPackage ../development/libraries/libbap { inherit (ocaml-ng.ocamlPackages_4_06) bap ocaml findlib ctypes; }; @@ -17466,6 +17477,8 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -17904,11 +17917,12 @@ in nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - nvidia_x11_legacy304 = nvidiaPackages.legacy_304; - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11 = nvidiaPackages.stable; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_x11 = nvidiaPackages.stable; openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; @@ -18274,6 +18288,8 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; @@ -21755,6 +21771,10 @@ in linuxband = callPackage ../applications/audio/linuxband { }; + littlegptracker = callPackage ../applications/audio/littlegptracker { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; @@ -22956,19 +22976,14 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; qutebrowser = let - libsForQt5 = libsForQt515; - qt5 = qt515; - python = python3.override { - packageOverrides = self: super: { - pkgs = pkgs // { - inherit libsForQt5 qt5; - }; - }; - self = python3; - }; - in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - python3 = python; - }; + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + inherit (pkgs) qt5 libsForQt5; + }); + }); + }); + in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -23759,6 +23774,8 @@ in vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcs = callPackage ../applications/video/vcs { }; + vcv-rack = callPackage ../applications/audio/vcv-rack { }; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; @@ -25067,6 +25084,12 @@ in kobodeluxe = callPackage ../games/kobodeluxe { }; + koboredux = callPackage ../games/koboredux { }; + + koboredux-free = callPackage ../games/koboredux { + useProprietaryAssets = false; + }; + leela-zero = libsForQt5.callPackage ../games/leela-zero { }; legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; @@ -25960,6 +25983,8 @@ in manta = callPackage ../applications/science/biology/manta { }; + obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; paml = callPackage ../applications/science/biology/paml { }; @@ -26277,6 +26302,7 @@ in cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); + stdenv = gccStdenv; }; cvc4 = callPackage ../applications/science/logic/cvc4 { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9ea32ed8e9e2..ae1fe050b8ef 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -352,8 +352,6 @@ let ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; - irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; - iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; iter = callPackage ../development/ocaml-modules/iter { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d52b0f6bb8b6..af2ec27f733b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in { accupy = callPackage ../development/python-modules/accupy { }; + acebinf = callPackage ../development/python-modules/acebinf { }; + acme = callPackage ../development/python-modules/acme { }; acme-tiny = callPackage ../development/python-modules/acme-tiny { }; @@ -981,6 +983,8 @@ in { bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + bwapy = callPackage ../development/python-modules/bwapy { }; + bytecode = callPackage ../development/python-modules/bytecode { }; bz2file = callPackage ../development/python-modules/bz2file { }; @@ -1188,6 +1192,8 @@ in { clize = callPackage ../development/python-modules/clize { }; + clldutils = callPackage ../development/python-modules/clldutils { }; + closure-linter = callPackage ../development/python-modules/closure-linter { }; cloudflare = callPackage ../development/python-modules/cloudflare { }; @@ -1355,6 +1361,8 @@ in { csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + csvw = callPackage ../development/python-modules/csvw { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; @@ -2463,6 +2471,10 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-crc32c = callPackage ../development/python-modules/google-crc32c { + inherit (pkgs) crc32c; + }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; google-music = callPackage ../development/python-modules/google-music { }; @@ -5427,6 +5439,8 @@ in { pysvn = callPackage ../development/python-modules/pysvn { }; + pytabix = callPackage ../development/python-modules/pytabix { }; + pytado = callPackage ../development/python-modules/pytado { }; pytaglib = callPackage ../development/python-modules/pytaglib { }; @@ -6357,6 +6371,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + segments = callPackage ../development/python-modules/segments { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; selectors34 = callPackage ../development/python-modules/selectors34 { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index ca64c4d975cb..4fa5b92e951d 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -191,6 +191,9 @@ in { gsm = super.gsm.override { staticSupport = true; }; + crc32c = super.crc32c.override { + staticOnly = true; + }; parted = super.parted.override { enableStatic = true; };