From 09ecf8ccdacf79bc1552a98c6fbc912faad9d8f2 Mon Sep 17 00:00:00 2001 From: Felix Scheinost Date: Wed, 26 Aug 2020 10:35:02 +0200 Subject: [PATCH 01/38] xlsxgrep: init at 0.0.23 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/search/xlsxgrep/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/applications/search/xlsxgrep/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5586a330131..5cf56176461 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10614,4 +10614,10 @@ github = "zupo"; githubId = 311580; }; + felixscheinost = { + name = "Felix Scheinost"; + email = "felix.scheinost@posteo.de"; + github = "felixscheinost"; + githubId = 31761492; + }; } diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix new file mode 100644 index 00000000000..8c62ae5736d --- /dev/null +++ b/pkgs/applications/search/xlsxgrep/default.nix @@ -0,0 +1,20 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "xlsxgrep"; + version = "0.0.23"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + }; + + pythonPath = with python3Packages; [ xlrd ]; + + meta = with lib; { + maintainers = with maintainers; [ felixscheinost ]; + description = "CLI tool to search text in XLSX and XLS files. It works similarly to Unix/GNU Linux grep"; + homepage = "https://github.com/zazuum/xlsxgrep"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbbefbd8a71..c9ae6f62860 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25950,6 +25950,8 @@ in xineUI = callPackage ../applications/video/xine-ui { }; + xlsxgrep = callPackage ../applications/search/xlsxgrep { }; + xmind = callPackage ../applications/misc/xmind { }; xneur = callPackage ../applications/misc/xneur { From c7cb9abfa4655dadf1fb4c866eff86129abf9fc5 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 6 Feb 2021 16:51:21 +0100 Subject: [PATCH 02/38] elmPackages: updates --- pkgs/development/compilers/elm/default.nix | 9 +- .../elm/packages/generate-node-packages.sh | 4 +- .../elm/packages/node-composition.nix | 10 +- .../compilers/elm/packages/node-env.nix | 542 ---- .../compilers/elm/packages/node-packages.nix | 2445 ++++++++--------- 5 files changed, 1099 insertions(+), 1911 deletions(-) delete mode 100644 pkgs/development/compilers/elm/packages/node-env.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7ee9e6e5d61..5f7ca336ac9 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -104,7 +104,6 @@ let homepage = "https://github.com/zwilias/elm-json"; license = licenses.mit; maintainers = [ maintainers.turbomack ]; - platforms = platforms.linux; }; }; }; @@ -117,7 +116,7 @@ let }; in with hsPkgs.elmPkgs; { - elm-test = patchBinwrap [elmi-to-json] + elm-test = nodePkgs.elm-test // { meta = with lib; { description = "Runs elm-test suites from Node.js"; @@ -162,8 +161,8 @@ let }; }); - create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] - nodePkgs.create-elm-app) // { + create-elm-app = patchNpmElm + nodePkgs.create-elm-app // { meta = with lib; { description = "Create Elm apps with no build configuration"; homepage = "https://github.com/halfzebra/create-elm-app"; @@ -172,7 +171,7 @@ let }; }; - elm-review = patchBinwrap [elmRustPackages.elm-json] + elm-review = nodePkgs.elm-review // { meta = with lib; { description = "Analyzes Elm projects, to help find mistakes before your users find them"; diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index d805fe3827d..0ffa56eae90 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -10,6 +10,4 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ - # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix - -e node-env.nix - # --no-copy-node-env -e ../../../node-packages/node-env.nix + --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index f6cfb2cd2e4..4b662bd072b 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -1,17 +1,17 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! +# This file has been generated by node2nix 1.9.0. Do not edit! {pkgs ? import { inherit system; }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let - nodeEnv = import ./node-env.nix { - inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; + nodeEnv = import ../../../node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; inherit nodeEnv; } diff --git a/pkgs/development/compilers/elm/packages/node-env.nix b/pkgs/development/compilers/elm/packages/node-env.nix deleted file mode 100644 index 759fa71c5aa..00000000000 --- a/pkgs/development/compilers/elm/packages/node-env.nix +++ /dev/null @@ -1,542 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: - -let - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(packageLock.lockfileVersion !== 1) { - process.stderr.write("Sorry, I only understand lock file version 1!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node_${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Tue, 9 Feb 2021 09:12:39 +0900 Subject: [PATCH 03/38] firefox-bin: 85.0.1 -> 85.0.2 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 7529c9b8c8b..4d72f210619 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 = "85.0.1"; + version = "85.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ach/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "31196e3a9dca5c8b0d1e44455020fe40500e2e5e2b2e01b8ea6d29705967ea11"; + sha256 = "24a938fb96347b938db028452e5a1b9f6c63c43f1e9b7ff0bf2a43f92d1df45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/af/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "24505d0911f8ec1408508f719cdf9a3d11918dff04aa93c1e2ea41668e68724c"; + sha256 = "5799e2c1c5408da29f9922cd1a694a0ef7d4250b504dd827d5cdeeb41bc7de6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/an/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8cb20d99a9ca151d53a3815b20d1f5f5f398e6d9d82e6b8d01390cbd6e261e46"; + sha256 = "04ee06350b7cc1f1ab808e8cff3d02060effbb9fa656c2f687b7cbe9d18b9c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ar/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8eec93e95d5b9aa7df47f3b91eff25b1f8e12213828adfcd98b6409c87b1780b"; + sha256 = "a92dbd6c4253a8ded0cf4681a6c165e6809e495d1aba84d2158b80d571c1c660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ast/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b565b06e2219b1e5d7fc85cd2208424392ca80ccc4c36049603bbfbdc9d0cfcc"; + sha256 = "eeee2c9a00ab94630f331d7f1e781ba5085415d816d403e14f356717cf5fa967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/az/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d6e26dae51ec386a49c0ac21b7cc5213101396f0630abaa167d886b23d4825a8"; + sha256 = "107fab10c5ac5947676509fce31dec23e70b4cc2f1467e914157fab0555dbada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/be/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1fc9fd0348b818f710a8a7672d274ecd88f95d2ab3be549f3c283658d7757464"; + sha256 = "a04273533574232e0b2c370e2d48ab2206b53b45743543fe0efeea8bd51988cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bg/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ab0d3ff8b8bdcfb9dd740b97c9c6bd29f3499a0da94081d41c84d759db7f677e"; + sha256 = "0b18c8862ce9c26cb63919c3bd3aa911b6179eebcbc9a38001953b49dd09ad36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "2e6158c2fbf754a79f509e7880a6b19217f1d65599d46283f556cd8ae953982d"; + sha256 = "8aa13bccd6fcd9f9c91a18dae807394dc46ea32103608c829d4dd073861b95f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/br/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "534ef1278b858255f50bace759562174ee6c3ab7fb6cb063a6f5ff86f50cb59b"; + sha256 = "121f9474e56deb5f2a606aa153c8f3c6b857f0966c9843257d22a8be01b609a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "dc3a0a7499e7e400445d21050ec5633bce346448711887be546f5dd42de6431e"; + sha256 = "c4781d938cd86988edc31674a46acb0120209b101d9b563c20ec6a213d161a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ca-valencia/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "cf821b74bdba2b3e3d488e1918b1078893766e753d004ece5e48690736d43fc3"; + sha256 = "f0b0e35ae0ba98d0585c45a660c85345b71f834e61875f923713f0c05a78509d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ca/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "465d0b094d3a12147bb18d9f052b64c2d39018bb84e9a077bf66fdf17b5b1bb7"; + sha256 = "1208d84a85694ce1327c9a8ab6cdb6aeb45b990704bbb9fef9b1edd664597fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cak/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "387359eace3af8d11e2d8e7ea9f32fa8548ea5fbe7679eb5958bbb37afedd94c"; + sha256 = "ddbc3a5d3283994b7408fd8970023b71178c83db12ba8be54553395791bc9ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "967ab5becfb7d6143792a66f85375d55e740e4baa71f200534a9eaebdc96968c"; + sha256 = "c02faaf56a820c45bb38119c03becc53cd2ae25e93bed3ad93cc88f091b00a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cy/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5f5306af912633302a35827694c2454794316322731577bbb1b43cec8c641f0a"; + sha256 = "1d206ea516202af87511d13cbd8482b9dcbeca2447ac8b684937668afac68439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/da/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8674921da901e31308205cd5d4489b9ba121af811e000f323fef3265ee57801d"; + sha256 = "68976d8cd0ce910c6b8155a68a955f4dfd182fe7625ea3386f083fff27f216a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/de/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7efc9b0125a58dfad1fc372ea0e52c8bca4942909001d3b0e15d984f730d4477"; + sha256 = "6510c8105420027f1632da15060d332f9ec93353c03111a592477bf45dae5925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/dsb/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b67b965fb98b327a80e57e7782843345023a27087c107b4a087ac6f32bc9e242"; + sha256 = "736a478e15f11126ad5dbdca66cd8938d72602041ff0c1f5f78101d4f62b1aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/el/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6f3d23f1ccb0fa9c803c9146c79e71674e8ea4af98aff4f6fae4b17a96783e72"; + sha256 = "d0c2f1c156d239c2c410d15216a8d331cde8cdb7d54bdf40aa6519f582b93bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-CA/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "52a9d4e9d16afb7b8db26a0ccc1794cfb39bcbc311f673ea2cbbaff73dcc0ed9"; + sha256 = "0b68ac180a828a94743349cb53f64224d0013de610a5c9cffed9a9242caadab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-GB/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6fb66a9c6becb8e84b3910a390e99edd68a25510c7a156e6d369bd5512614c11"; + sha256 = "978397ce347115b87ac24c174ac4363bd345ef8471d25bfc4a639722ed7098e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-US/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b8e7263fe020374f116d71020162f1011b9f759cc3673c22c9f60fdf277f1595"; + sha256 = "98763f4b1526811967d71e1bbb9552a9a3fd877321ecb497083b9e313b528c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/eo/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "413b0c757f906e8000bba8814abecb0702c1939b31f7d2d934d0726959b59696"; + sha256 = "a44c9b60e0e8342dcff31ab0bc2776680b9a94bea51ef237fc4b1f013fea6ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-AR/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "53185d003a12a68005aa2a1e5b9c8d9fcd84e32a2d27b1a87fab8569b7d5d09c"; + sha256 = "3229e32a2db2f5a7638a734c538fbaf1b83f9dd203bb67008460783239da04c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-CL/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "0d42da5338a904e80e60c42535d3ff644eeb0166b7d4a2317ee5cf532736db45"; + sha256 = "574c90358de584b2bf4ec874a8f5a22fd777ceeca92c2894fe978a793faea7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-ES/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "23ff6c4f37541e1af443540abfd7f2588d103345b557921fc5fd5312d601c315"; + sha256 = "1e92995900cfdbb94d673d5efb02e84321dc8917edab1ce6c86b98f860f483a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-MX/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "89151879dedcf0a3d41778a0adedb6eb9a780a238a32e521feeb03d829aeb635"; + sha256 = "56de604e9b32c7552825d87c0c2802bff66d72faad5d173fc71388118a47c046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/et/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c9e215310845f9cae62be559087145762a9790854e257f5ab09af6d7b0a4cf5c"; + sha256 = "53297a8e1f8c5d3ac05d44c3aac1f886d7065cec6666548c3a571ec06702eb63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/eu/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f6942f741c03d5a1e246039bbe6d38024f3aeb15b0311318aacc17c7ec0613b5"; + sha256 = "3b392831ee487279ffbc2156421243990a2abe94cdcf233c375f7949c28571a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fa/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "815636c8539d92c74767f5c8001e7894633c67ce2eecfe32584d9d654a8e94f8"; + sha256 = "bdaf06e327bc17ff05d82e27d85d4ff747b8af58e8a0b95599d4af0068c6948c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ff/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b2638766e7d538b6b9beb782406ab3ba9aeffe42201994be21dbb9d8e7c340ef"; + sha256 = "8e029e2f755f107bbdaf4833332f94b062284529230ef148ec404d9954da5b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fi/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "92d0e973e2e618be102cb057d0de62f1399ca65f05982f8db4188484b58a0cb7"; + sha256 = "b1cf30bbd4046c3f6b200b876bfa022b34771d1aebb48a56b35817d5d0f46d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8ed02def2df76f31d72fa9b461efcba4d798d7a38b7ed530cefe786256188697"; + sha256 = "95f5265e9e7be13a8d50ff4e0c45f1247531fc78076081cf7045ffcf5e366846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fy-NL/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "7a6ec5ed176fe70fafc94e0f85d7deae393f5db83cc7fe7f5478057be34a2e14"; + sha256 = "f22756db0256f2d7b3ccb15c15f1006834e8a53251ba8a315f0d72365d7140e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ga-IE/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c36b5cdb6e41956cddac273ce4e997cc61f53627a94e565d99390779980d11b5"; + sha256 = "7c67dc57553eca0c59293cff6f3097e56719d3c6b67d6599ea56ef799992e566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gd/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "59835de77fbb13e425edb6d7bfdc6fa90b51f98f2977c3e6a91d424632046185"; + sha256 = "a1a4ceefc1f83454280e70316fcc9d0c2bb635a77596bafeed2f06d3cb133340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8060e3ace951502b498a900c8904e32b643e682fcc7db3d960be5d3ef8efcab4"; + sha256 = "02afd3809826d41a75f6554cc7f49eb65725df2721f16484907eb0ad3cb172c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5f9493a44aa5b6c39496bcb9c2f52f9312eb94667e64913610333b8ecfb9e2bb"; + sha256 = "dc4de709435a0015d3c4fcb615cf8ed96814b2f6038c37ee5045e632891f8719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gu-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "751e2cf9d6f050cba1f671052340de36ce255485fd3ccd528ba254e2f9acb678"; + sha256 = "f9a66be242916abf1576397204c8fd0c88574fcc68fb06480d82a6d7008f1f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/he/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "0a28f7d1925d471fd712ead92a3abc1a988215715e9663fafecfb0efddebbe7e"; + sha256 = "8739ec72ada89c64be8ebf692734a80f7a825c7201b4f7d43c3b0b8e18f8edba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hi-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "95ab7ac27f5a70d083514909c5233cc5b9619bb1ee2e75159ee6707a33033a05"; + sha256 = "db9f6f97951291d86f8406d919377ef1121195665734edcb4ae731ebb15efa12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ebaa6abc6d3ffcd1ec3e65682cee08f3a4a2f451cd27a07ff49e510ebf139cb1"; + sha256 = "b8fe4cf3e7c9d30c377504d58ae11c612cf74f0a02c3b25d4efe3ed6ee7365f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hsb/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e6313e9ca2f5fc39ebd8e237096f4bfbef6d1a00277024b406bb123420790d5a"; + sha256 = "73207d15a6146e4bfe5b2324421993382a41f8648c0fe5e4f2ef72ed5182fc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hu/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7c261fcd5c2b3fbbb1a08d3d64e774c869f91cc5dc57c69c8182ea7d1e0a1f8a"; + sha256 = "d57ac494fa650d1f0d46f9109952c1493ed476dcf26fbe843c3e9c5a722eac3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hy-AM/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d19a967744f9867b07a86187d103ff245abe12cdda6ba3ffc6767b0d1535f4ec"; + sha256 = "58ea459134ccddc63156161300f075cb747125a16aeeb8f616662783b2a8be73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ia/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b044bf688fcf53565943d6da05dd76261dd42d61e0aee8d524f167d937d10a86"; + sha256 = "d0e4ab532d39eb094de62ae41fb40055e8dc20f2b69856f0ff28633f3c2a5139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/id/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "aa84b7f4bf71246ae678ac01695b5b90ff7e3cf1f59efa5261a59fddef8cf5a8"; + sha256 = "f60c707585e197263fd64a85a120cd4c52da17194d54a2fc538bdface62b1c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/is/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "de6ab2d654feb56956f0b0a31382957cf10b14bf35e3e9f22858f00728082992"; + sha256 = "f0d2a9052ebefee0f7774e47fe13de41ba8c2b7cba5ca784d6d218fbb2549a75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/it/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1bffd4e8b86a96edf4a6b1b0bb5b3a22358d18e3d5c66cdf54ae5755cc8add4a"; + sha256 = "4946d59a1b5fe36ddeacb371efe2072f66623d82eb4f26cf0fe6b96e8dd54203"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ja/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e1d78e731415a15cedd07231c3ef75fc881b71bf2e5c8aee59dfebca1e940963"; + sha256 = "2a9f7705b5ef1258f925a6e48ccd99243003cb429bef9bba4ad56dfbd294ce11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ka/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "75426f16874db9daa7221ec860ae7e6a8549d8f2e3d41f063a575f29b93711c4"; + sha256 = "443b974d1631602734402a2a6dedaec8a7cc017e1abbb768ceb5e767978c36af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kab/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4c4fca660e8ef2d8755ac30f5c835d82d24c2e9f9a8774f0114137456a5356f1"; + sha256 = "8f8283696206450cf21a4c88384ca915030a1dd7df9e93911b620dc9375e5db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c88f251fe8cc7ea5a52fd33b7f6eaac7d0e64ead921df96ee6528bd039ac52c7"; + sha256 = "c9d78fdd7ac9d79dbb713a7130baceb4f19aca6bf8e7218950190ff95d921b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/km/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "37535cc8a315d107af45cb678c386e73fcb3a13e33bbd55db5b98bb09a9b6eb4"; + sha256 = "1fb2612268f53fe300955daadae60be238070dae35555707027a8a62ce4ec3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "dcdeb544cb9d9d29677f6b272ab33b7592005f7609d499bdd97b997bbbe7a2f5"; + sha256 = "86208426d917883c2eb6ea9248feead33d4115093bddf5f1c690ed176adb9c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ko/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ba0677d2bc8a66cbe0f3c7bcf256da8248cce604ca43c9db543c02d5a638599b"; + sha256 = "b8057874e199124ebf283ab67e184dd2fed016b1bcb31a2f220e2e5d38d4f438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lij/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "f79c200904a60d9156a25ca9c968edff7df81a7faa01dae0436da22d941f87e2"; + sha256 = "2e5bdea7a0f68efb0e6bdbe64a1df287644e14ce5fbb896040f3315c6412fc43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lt/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "866e8a42dd1a8fb6e43aa4c156da70c7ea01e57f98deb9733f2b91bc0b26c05a"; + sha256 = "e1f79eba23036cdee87b9a5a2f48284bc006a191644d26e50a7ec61cb26d26c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lv/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e4c8675ff35bfae63fe38cea86283574fd51522c41e756c49f9437da4b0524c1"; + sha256 = "4d8f26a3b6211799a87dbbab6692f4a00c81b1d70c6af990a684b1b65c255482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/mk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cbba302366387806d3ae185b93e45df4a5e5c36b469233ffda3f9ef45c41c799"; + sha256 = "3e5741eee9b27aa91827ef19e9b2b0200719120d07dccd37f5752ba1b746e29b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/mr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a26de1118be542a851e1033285e8517ea3eb3a1e2caf1f20018d98294df980c1"; + sha256 = "247a11da64a28084d68d450cfa92ba66868891796d60a09ff9bf28d2af347a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ms/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9637de49c5b17d9d4809c614ab0d1988a0ea1d86b5ea02482eaf70e415ca190f"; + sha256 = "79e1823ce9d454d70660464776f1d492f67c3489f7e9ed20fef5a7331def0cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/my/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c6f87c7e25c324d4fa767b16b7b91af4efca5dadb5fe684eeaca4742abe5387a"; + sha256 = "ebe50de263127be29aecc611c2e4b5c60068245fe64ee0a72beb2680253f85dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nb-NO/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f1d6d30ecc0b53f971a74dee11364f6fbcb6efdbb1951260b341bdb6c98a5ae2"; + sha256 = "7e5f1266acf220fa8db165c3cc3ed2bf287ca809e3dce9b74e6284a8a3bd9e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ne-NP/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "8d6d976c897c9f9a3d520af1124ffc953eb9a3a7f35aabb94002c94841486805"; + sha256 = "0b7fecf7497937709d83e002951ec4425b080fe4a6f6cc967a3eab65db93a212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6c5c15c780af0de9be4b70e3547d994b6d50d375067cc7e08377babb4335a52d"; + sha256 = "7125adcabd21b4edb2828b295713b3a35cd174abea748d5d4f8456c3e18e5707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nn-NO/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "488141d1dc9a9e5431baec0a89485061edadaf7a5762d284e3986206ca5b70ee"; + sha256 = "560d195e6b472228403b2fd5651c7a61e84491e788faafb77af511e3c74e7fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/oc/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "bf332a5fae4298330e042c92d806cba19f12f8ca1f501f8e36b1b267f2486aed"; + sha256 = "ae15b401c284e5e68819e68b0e9e76ca909ff167f2d15b3d77b546708a7e7369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pa-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7108d6fa99eb2ab077edcdf1539a8437e664e528b73b6ae2cce3af6ab07a41ac"; + sha256 = "32d9ef570e718ef79b004fcbb9a7e212d06e8171c0056f90709423495c3c7bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "40b7830f0dfc684b277c22aa6d558154aa4c37a2bdbf5d47add74ac406b6bfbe"; + sha256 = "2201fb7b8edb8ce2b3446a4accf3f0ace2b1a18a7690a20b6e64ecb5ee1a61e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pt-BR/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1ba338037c07c2c77b3fe8767c8dbf240bd99ed9ffd33cf0cec1dd38adb7f196"; + sha256 = "f80d4d45078bb3884d8302913ac738f33cd984709e95e279d341284b9c29749c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pt-PT/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6cff3b3f11364a7bd59f125854dff1c2d638287ee95f0a7bc6bdb075a0624f01"; + sha256 = "aba0a4166f0b815e1bc96c4faca818e82adc4b4d1bb8d26cd1f086de681eb56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/rm/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7c626161a43e052978ecb6673cf3a6a5e57bdeaed52113da3ae52bc0db653f9b"; + sha256 = "450640a39b0773a255c97d884d51f7dd0de04da523e28dcfb9680e750b68e965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ro/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "308ec282ca3850056370205fff303b75967051fd54058d1365949f1975793791"; + sha256 = "eb20d1a28f510ca98baf24c10feb186d21900690d9f0c8be5c180b72c9d3408d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ru/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "48c445c3f25a9ef50fe81a59c8c70c9decab031c8d889da088616aab1e4d8b83"; + sha256 = "7b0c8c5b5cdbb66b36366289f7b65263abb19c174ac89cbb2970a5742eec2d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/si/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "5170634c140ea5734f8141e11b9e67f2257d2b80a0b41efeb6223dda69a9f364"; + sha256 = "1f2e5c35d9766cb46c9c5ce5ff0f6c95ca12d0c14d12cc29d098562b8f35e9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0d8dd2d3c0269080cf77727950733f077d7db753ecdf910992292dfbcfcb79b6"; + sha256 = "528d3270d9bd722545fb57ab09059e0f43c0f605e479c0869cbe0757d1f38d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "35177a269a4b4064bbb60f4d7d4fc0b9fe9e9227616a69efc0d9a3c4cc5c6417"; + sha256 = "d4948a03a97424c7b499e339a509b2ebba9b716c84e4713b140576bd787178ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/son/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d594aec6adc95057c8ec786e07f72b8b63b3fd1f60bd056171ad1c1d08ea220f"; + sha256 = "34a841faec9720c9ec32d6e00ca775d266f47ca3b660876cbd4a1d7c9d7b87af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sq/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "77b925e4ab229b7b5347de2cb5ee8bf774d94b4db831e87c2b5f10c926dc9efc"; + sha256 = "aa5688e676bbb8ae87f089d78d4d6cb2a9c3393bf252a7c277ab6a8c97a80951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e967cde12e9e916b5cadec9bb545291fac31fc287333d62d6d9e82fc69a0f028"; + sha256 = "882263a340ef6b11b35e91262620218078c87b193f3d0ca8eb3a9365dfb98d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sv-SE/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6d7bd35d5275fd73dedfef52a09d278efa74d3605000451553fa53c69e5d5cb0"; + sha256 = "5b8baf5ee22e5da51040afb4cbdb4a6f165aecb117d181561c97903a0e63b74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ta/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7784e71986bfc5c0b471394ba3495a1d221fd7a863304f6db78791fef5a70838"; + sha256 = "14a00497f7a4f27680e95126b4584a13d3376b8d4f39fe0a0de9a7356bd8dca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/te/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "4d582c28386c13657b9983b8d6de9fabb021f5dc3c120162f370eec5fa7d0a7e"; + sha256 = "0de38fdd91056121d68734c76b799534921e8adf37566465a72b4fce9d5af693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/th/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e265ee575e71cb940ad679dc6ea8a37a075882fb2ff5023f68d63eb86a642cd7"; + sha256 = "80aff43b79ab4343d6b9bb2a5eebada3ef376313fe47cb2d1d7ad51f2f2a57ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/tl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7bbfbd0538048692b0ee755df1c9ac004bc408bf814c95835f7e1ed3f05bf1da"; + sha256 = "acdcbb66a68421030634bf1ea1c265ff38e84dbe010aa41058da64ce966d1e57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/tr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b81c231bc5039a1b91438ce6447f93b86ad1c8d248b67dc565d7da870ea61ff3"; + sha256 = "a3365e32fb78743ae45f89ae1740a7c51cd11e927454cc836bac4e9f62cd9abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/trs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "bc72b31236b7422fd29f900f2dc8d8e19ec3ecef7d365e31d492e1aa3bea0368"; + sha256 = "a9da73cdade15ce508678c8347c6bf03c2d93578cfd095e0c586682efba7f2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/uk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c79263d7040815726dd42fa2d20f624b10a0827c6ad48d09d394c614bed4bc64"; + sha256 = "05ebea023813ea0755e105f6f1451ee0d85bba5e52660230f25487bb9d997bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ur/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "eb89fc6f432125287059fc4d9a02e7a1609f8eb49ac3ac5504a9b278b4a97845"; + sha256 = "ee4cda80858fc6ab33996a546be8de565a5d4d969ce26d0d1aa70ba7a923e496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/uz/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "cac15fcb96b8f0e79746e563ef786162f86c977251b8f3983ebfa5d163f9ab38"; + sha256 = "7be525a02c9bbd4beee8678eb8488f50337aaf16883ebd41f5b2f67586b4e57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/vi/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "37a966d4c4d3c58544596ab08a6e4b14d01cc40f36ace0039f2017df495795bb"; + sha256 = "cc6a9d73810294f3261aaf26d4678c4a49b88375f48321384443f027a5a0b5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/xh/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "17c22a1737f48b4cba5da7ddaa00776da1bd3ae032b70b9faf35e719f42f865e"; + sha256 = "5eee0a8b232448992ab37546d698d4f212df53c562f29261023e64cf5762138c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/zh-CN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "93b176d2814e9c6a24a95f6211e4b5b7eca28895ea100ffdbb46d8482b149e29"; + sha256 = "94ac5a87b53fc8aa6769a4f6faf56d0089965514d8e811ca94ce2cd996e536e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/zh-TW/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-x86_64/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "bb33dc41bd7daddc954694fa72259c440d07ba84465b8b2fbe83f635b7400b22"; + sha256 = "025c04100a427e231db031aa43694a51191ded2c31f22913bcd694c734bd516d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ach/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ach/firefox-85.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ba34cc7c3ee0e0ac6ea0106874dc1860c08049700c4e9ba130d8417508edae6c"; + sha256 = "9f770cc6655b31ee907f949e0ba2f197d0d6fb3ae33ec1fcab311ffb7b109fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/af/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/af/firefox-85.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "da95c9f5226d6a3ebe356c18249b026c535f803628f9697e19fb961a44aee70e"; + sha256 = "7ecd58201a5f3eb6fce474bdcbb0f672c8f492f30de3ec4f8f3cc48c2c967313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/an/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/an/firefox-85.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5b151a370954bf27def1577e42101b484335aec48f840e907a8f945065a33268"; + sha256 = "362d8bf290f67ea40c93fa058813c073a51911940b916595c0a8f1599ef46713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ar/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ar/firefox-85.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c549b72bb31f1311c01b82a07271eb53964be982e889d04dbf63cd5d39d744d0"; + sha256 = "6b66c3f25eeea055e42a74ce6c327f09e8fe4f18acb1f947deee351d2cdda1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ast/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ast/firefox-85.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c48cafd7ea778faebc31efd61bb090e9e55124f2a64f2b407a7aa7e19bd6e30b"; + sha256 = "0efef2406fe4d8093a1ce6bb56d1a54eaef5bb429b6fa560fff7373a7435cb3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/az/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/az/firefox-85.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "fab896b2ebff58d16baac7f00998e85978b1e41ad0b9b5a219b65bcc854ea192"; + sha256 = "bb0dc33a53a2f871b9743f17a36f50fabed87c137521404675e69df69f121350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/be/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/be/firefox-85.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d0dfc35174e9c02999e45ad25bea24332e71e860668211fd489c6e46f184b890"; + sha256 = "7459818c037c45ff2969998b8d3f481eb8384802e5444e2f3c58340f316aec14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bg/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bg/firefox-85.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "da6ab40fdffeaf8e1df8f379c3cf07f97da10590732d385a1bacacd3e5dd84fb"; + sha256 = "55f10b4a5cc1d06dcb81aca68c59a0aa64d7934e01c3f5f3dbcc27dd7497e3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bn/firefox-85.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c69fb64b3b47091ddefb4325d49aeb6e5b5a67bcaeea4240a0640fc38b821875"; + sha256 = "6491efbf19bdf11b877d04dc22707864c07e9b52452408cf386bcb7bda3cf840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/br/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/br/firefox-85.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8a3ec06d6eba37877d9201651f912e686bf99babb384e379feefafc9533c5e74"; + sha256 = "4ae74e5843edbb01d35b7564b1e998f58fc1c50d849fca9a9e97e540abe6f140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/bs/firefox-85.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d771063134a01e5f7a07e403ac5c2d23f8c7792f298bef7862396094c99c7a52"; + sha256 = "c796121189e7bcf5ec5a90218db35fb34393d4e70ab7100567b3f7aa43daaea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ca-valencia/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca-valencia/firefox-85.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a1ca0f3a80fb6d3f98b1d1e74d6b8e5f3e7a6a91ca81cc29aeeb1947e7562c33"; + sha256 = "a2097281cb1d5191992399686c26754a57d0a3bf241961374e335c225c4f7324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ca/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ca/firefox-85.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "baa21f32930fdc55862fe1fa3bf07ea3c3a790233f8472cecf621dfef9fbe639"; + sha256 = "4135f8421b6594a468dad1057d2684cc8c5e3fee1b095653d42c86c6b4b62ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cak/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cak/firefox-85.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b73a1347be66802aa55c5e2a068ab0556f1659e6e85289181c9d436698357ea0"; + sha256 = "93799eaee71f6e1914c9161d075163bbc7c42d85b196301eb6891bb7c3debba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cs/firefox-85.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8731d781753c8a6652df2cf9120cda12e88e42f721c99b8867df971ac33ab6b1"; + sha256 = "25678ecf83437174adca71c682ff36145b0f68e45cdaec515fda671907c21133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cy/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/cy/firefox-85.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "da6da7f9e69a8a36a4a0f1a388b5560dca4b1cb64154a9d77cc2bf398a41a5cf"; + sha256 = "85b571e0fe4f0bdedb8b433f8363a7649a1c5fdfeba40b35f069ef1518a28600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/da/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/da/firefox-85.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "42b9b30111d186fcd5422731236050157a4f7c7fdf928d4879fa90c4f37b9da2"; + sha256 = "d998daa0d89d7d4a632c576f9d81d5fe7af3c0e54332968d593d88e5f81fa246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/de/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/de/firefox-85.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e78fa2bd1b856d060a2093caf6dd79ff0d150e815a79b8831096df3315067c5a"; + sha256 = "a84adef78975397d45941ced4b17abfacc2a26a0b758336c99eb174b33f51c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/dsb/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/dsb/firefox-85.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "459e99e7636f1f09b5ae8a78b0be6dd69c3f1a53ccb7c1daeae1d8d146e61afd"; + sha256 = "6647771748299fe56d9f023e612de6c3dfcd1b711cdcde74ea39bafb957deb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/el/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/el/firefox-85.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6a2aaf9ab9782919e1bbe0d010a2526bc0d63f8c6c8483281bc9a206a611b2b3"; + sha256 = "73a7a168b65362901a4b198200e2a5167244e886131203543bcf83f2998261cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-CA/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-CA/firefox-85.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3fd67f804366b7454b2988730181d09cdf536c8c1f4db1f7d68aa1baa9392fd2"; + sha256 = "d47e5707ab2ea2e369adffaaa49c52f461d3c01b6b28b31b0876bc5284d2de66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-GB/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-GB/firefox-85.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e661161aa18f629ce4d5b06e543f2fb513e82d5656a756352f3ee94b59b9287a"; + sha256 = "6a50517b8ecd2fdbb897dca8de5a948214180fcb25ba3654faee7bb563d049d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-US/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/en-US/firefox-85.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e3a749f507b8bb5b380b4bedeee9dc360b8db4c1f61e6a54ad55d438907682d2"; + sha256 = "83ace0384a14e383e65716ef9305d72e39832b855ebecf2035e6267b4c9a97a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/eo/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eo/firefox-85.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "b3d1b34a1dd3cd15735599a74650bae46ec359a70df09a0f5e26fdfc6df408ed"; + sha256 = "2e8b25943115edae1dda4265aa3fd1edd8683318e47aa3b11f9e2f3d6f89a372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-AR/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-AR/firefox-85.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "dbcc491813d8ac79faf53c3ca22a10c6239a761e115e209164cb034a4e7b4e64"; + sha256 = "559b0de8d0d846f58e15675e31e0db57ba00ad2b98d3a042c1d6d25a9727e1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-CL/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-CL/firefox-85.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8cc7b31c01141caba6d5fc6267ad19b7b78ad10f15d6311961cc2ecbf033a636"; + sha256 = "3297f38424fc6cdf2ddefa72732f977cb1ba1b309dbd3d845b63a038d748359c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-ES/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-ES/firefox-85.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ba7a70cd25045dc63d0da66336e171d548a35af029867ee8735ca04707ff560d"; + sha256 = "614e69e978f0e814b54150a013872081d6365d9e5bb03ee1147c5310d6315dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-MX/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/es-MX/firefox-85.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "442428e833626e05e6f35bbface199a1384fedcbc835fb9bf67831e331e9ff5d"; + sha256 = "765d1ca2685a462f173d7ba1863a2263008cba71738548dcdab83f6c010b7dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/et/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/et/firefox-85.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c0f9b7eb84f4d92ca2b47ebe82f25a5bb19cb2080a6a2cef1bc039ef9382db0a"; + sha256 = "1465b6447bd476f98060321562ec0ab47b117f1271dc97f9924da573c77b5a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/eu/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/eu/firefox-85.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "359918d8dcad304b5b2ee93b241d4d2ff1dfd59f5cdded964013ebacec5e3b60"; + sha256 = "4f25ccef829ad465d62676aec9c6daff9e5910cdb5447c0d9b5befee89b7e4f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fa/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fa/firefox-85.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "36ba466eb9f086052515b88d784374fafc5c807a89e4159049be64d8126c6e9c"; + sha256 = "c2bed62b36d648133edd1541799b231dbfb1c0c5fb6213ac28c3abc0a38ee66d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ff/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ff/firefox-85.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4de5b8e9150eea72652b4f92ff342b341e9c3ca4415036c8137da4dded04c484"; + sha256 = "527591e25cd83c6ba7fe443dd40ad6963dd1b7f69a693e76cd1e18a2bf74c082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fi/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fi/firefox-85.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "18cc61057ddb8f7e5001aa293b3cd71bec67af4859d6ca30e4ac2dc195553787"; + sha256 = "3c89fb2c42b854fa800c47e5c91d19defe56be5f6474c500bab309eb84df0a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fr/firefox-85.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6314372c93709f3ed262171e94e94927997ed478167542d9840a4acb77b34ff5"; + sha256 = "a7b033c9df0e11abb6dae08f62dbfb34f740fb9d849e0bd8a027ecf0461ff5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fy-NL/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/fy-NL/firefox-85.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "38b62d1de5b452f79be50875bd97317951d9359d76727fad9972a9aa00a1f4eb"; + sha256 = "d162a3c113182178a7de0c5f3dab907badf9625ab50e8a922ceb4c34c4616c31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ga-IE/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ga-IE/firefox-85.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b77b30753800e5c95f8336d1b2a7cc39e011b38001d0f7b1f3755d69cf71e4cc"; + sha256 = "637d65856d46474d51cff1da13b9b1e74984cb646cc5a6a643fcbc7fc1ec37fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gd/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gd/firefox-85.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5dcf35c3415eb2e296c3433ca2a7038ce8d9fb7793ae920401f43796ac22b077"; + sha256 = "aab2f06d6ed6108fe48350ce0275d3d244f175e6c2427f54b403d6bd6ddc18cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gl/firefox-85.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cd0f2128636ace6fd258f241ef5be40a05815ed3db18c2acb9200bcd5202b464"; + sha256 = "a5945bf732fc6e3edddb0e7bb9067c591f4fc347f56a35c8622311706d8c135b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gn/firefox-85.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "9d99e57af9c9cdc32e8c0b7198ee3d4f0ef11f7a1e653a4f6f9608ae2e6c8dda"; + sha256 = "6036a369187f5e30322d140e1add09cc0a51e5d092693a5acb65176c872bf53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gu-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/gu-IN/firefox-85.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9bcfaad7478e6c4a3c01258c826254779410e95ed5c57bc0e272713446b07e36"; + sha256 = "2b6d3c13a44b1234f591536c8f7f3cf5d1b56af53f366150e0565a36d4fa678e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/he/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/he/firefox-85.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0b62ba8fb9edc4fe6cad699fe1897910bd4043e17c9e699260504ed8a18fc824"; + sha256 = "c3d01e14f24de5635a9c0d3c7625fcb9b84129ce9505d2601390f2d40fff5a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hi-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hi-IN/firefox-85.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "038569c047693b15c932b88c0db716ea4067c7f3989ee8e53af3b9a0f306a2ba"; + sha256 = "23f1dd3a9603d797abf6a1411c7b6e44d4fb2dc7b26294670ce4c63cb859e42f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hr/firefox-85.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "08c738bd05d8997a156d87ea21c3ab979d7045d4bd0f7cef95bd10c68c7a55c2"; + sha256 = "e30d8a599b28b05a3f83692dbadeb9185829b1a87c84ab5449f142ad1a7a8a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hsb/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hsb/firefox-85.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "199f9ee619eae1fbbbf2d2b39fd0a4cf142ca57894d12007c32d15a90bf2b030"; + sha256 = "1a6cb70573e9e0356e18a18d1a0a4d2f7188549c19cbed7e28d3b801915c22ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hu/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hu/firefox-85.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e13ab60488ba0ea2dbb5de33a09b2e5d6892216eb16bf629fbe4e271e29f04f4"; + sha256 = "c2cc048b05e197e028606535fdeb62a205c037eb5823560f187ec4152be41d97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hy-AM/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/hy-AM/firefox-85.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1d5646a2419e197a3726a9869ff443f5d2b73d855816b9c0f0f043bce5a8d098"; + sha256 = "a4b6b0d0f05ce86d13dbf08448724106278891cb79387e29f9ba3874c1aa6ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ia/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ia/firefox-85.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "2703c8337a5a41b5d48bab5d1dbe9d9a191f78b3a50942f454508239494b16b9"; + sha256 = "f7d761ea9ee5d6037886a9aa8eb93747ae9f943957a296cdcca0dbbb0e7a2b38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/id/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/id/firefox-85.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b4f31fde1297d8c111e94eef2d8d14ac41e41d788ee0dcb91ef0c3d93a9d2b22"; + sha256 = "1599cd0ea460ee1280753bea5d5c84419506f72f8d87818114665ced3237407f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/is/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/is/firefox-85.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "092218c6719ea8455de72927dcb6bf905e1452d8f725ae9471613cffa58b767a"; + sha256 = "ec9b790cc55ed72fcd79afb6502db207906f89aff4053d62efa12a37bbe85b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/it/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/it/firefox-85.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "99b7d253f83d9f861eeee85d898370b5c96d1bc06fe2633ebd5f8dc9420916a1"; + sha256 = "97c625e01e9a565ef10079ae980cd2ee45761f428594158f6c05fb4a3f1142c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ja/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ja/firefox-85.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4df203562e717e738f00af034213e6e30f2969a63fa81c072c9997fd765b95dc"; + sha256 = "625dc84ed56bb46032eae0087ae96d17127594efd99e4aeea410d4c8bef93819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ka/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ka/firefox-85.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f312d8e17f8ca7ef1641acb8be356f1dc7705373f93f58c7bf12f89864184b57"; + sha256 = "45a00fe06fc302d59744b8c9dfc9d7a4e27ed4ac3727848f52597208020ce16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kab/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kab/firefox-85.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9256a1473243411b86bbc2c0c241e0ab8755602a251dfb73243a6d26bf33d214"; + sha256 = "32b8ce9f195ecc610e3327402953609eb8621cbe116e22bba76131c9dd1b9738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kk/firefox-85.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6a2cbf1777f61add117921e4c95e3300abdee1b2ff85d12912e858796ee8a468"; + sha256 = "651f3c7314b919af1348771ef7c5ea986fe3d9d7e42e056172fa55d675e17e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/km/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/km/firefox-85.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3c6c9d7d635ba38c8fb31e760b1b0a2d41028be6462e9a0a6ef5648e237e8728"; + sha256 = "1a62be10235639a7c2256521838fee8637ebd575cee39c5744a65ef057afe1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kn/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/kn/firefox-85.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "dfc497b7c576734d0e5eef4ba71d2b83b10dabacb7b00d3ee379a0f362daeab1"; + sha256 = "1cdb648165896ccda8da7ef6862605723089cbd8e3c9e6b8692ffeb2d28f9593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ko/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ko/firefox-85.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5f1bf45b3eaa39d01a96835d48eec83b41e64ea0a8a667e7b4446b02c1ec11d2"; + sha256 = "70781041791a7c64e518de27955cf2b57ce3d3ee7afad36737f62783b5255d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lij/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lij/firefox-85.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "156d0d166dcaf8e711abe2bc6706a210e40ca52f84dbe309192f884bed4f57e6"; + sha256 = "ea44fdf528da53d7f2ba9d447c70079873f802647ee708f6580447af6adc1834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lt/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lt/firefox-85.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be07851e9501167e23170fdef7317239cf2b20e650fbd266cbf46d2758c7a108"; + sha256 = "ffca3845c97f4d87e0d601c483e2bde8fa8f7f59b44ee85259fc70b1dcfb727f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lv/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/lv/firefox-85.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "107c4285a3972d7d6b52cec8e560ea43f2d383a5f072f5d6d7f4fcccde47771d"; + sha256 = "b513e100141d1df78de9f05dac72da91c6cf65a8fcc22b9091ec00e6c6ee21ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/mk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mk/firefox-85.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3b8f230ca42054fa478de727be855980d30fb7676a1d646a0e5768fa17c7b3f0"; + sha256 = "c65febe8a9f9b59ecdc61880a5c1a5b2b29fc53ffbc8d968f1773fe60adb082e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/mr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/mr/firefox-85.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ff0fa9e3aba32036ac14a4b0ff286d4c56743b2053c38cfea1701dc33b038df6"; + sha256 = "b4d3b6758c67f72e8f8c9dbb0e32fcd7b527b701e41d3d492e3e7ba7817cc544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ms/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ms/firefox-85.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e87b449c93b85e02e2caedada6efcf15a424cc45addcb66cf6386c60f4a4ef17"; + sha256 = "2fe81086a7a15bb29b909987063c058c1826bee6c0c645cae1e7a0907207d1ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/my/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/my/firefox-85.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "52a3bf3baefaf1849fed451ee33e48af54e2f35d8a5269880fff37dfcef738fe"; + sha256 = "40661cc4fa51c2782bd0da0d6f460c3a5fbfaab72e91b15c77f9b7b537484ab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nb-NO/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nb-NO/firefox-85.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "595a6bd542be8d2af1bec356cee0de1fefaa8f5190ff3d026de3afea97efb70c"; + sha256 = "9ce253d8bc316fb976c4f64135f7767060aed90111b54dac687011a772e650ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ne-NP/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ne-NP/firefox-85.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "517d36aece9e022c1c41cc528dcf0dac76c5be613d558f27de6aefe5d891b18f"; + sha256 = "7fb96857d5da6726e68038a9659ac7c18b8e746d0dd5e4823655c8fd093238a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nl/firefox-85.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e355786c54fa0614580a45b027a2d23e34b91c08365c471d58aecfc87477ddf6"; + sha256 = "1d03b2eb31dca3cfbfb38af4e59d3eb84845b8fdaf488b76949a98f744253935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nn-NO/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/nn-NO/firefox-85.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ff4ec96c42a4d4446755defe19da5f9f39ed052323adc6b576b101b10fd4388a"; + sha256 = "64fdf6e8e8086c04c53c84f792382c32579b43548f9410dc074b2aff95165d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/oc/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/oc/firefox-85.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "54ca433f89e1815c1e5cc50c9e4a7f3c4b3c095e8408261f9eaf4e3c0c348aec"; + sha256 = "6db5c30ca7d449534289f5b84e328484edd5d04512cde11f097f28f5ffb986bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pa-IN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pa-IN/firefox-85.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ff0486665cf7645a36930e56f52dcb38457b361da7427572c57bc1a048e091f0"; + sha256 = "102ac2026af2d21f27502f190dfeb0f39b148ce39324e480f653f6868df770d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pl/firefox-85.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3749820c56b131a923a5384afd81ac8ce342667a5db1d956b312db6fc03a0786"; + sha256 = "f0a03e6a95a67af8e6949f5b6ad32179f7bf4978f050ca3c453287bdfaca6252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pt-BR/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-BR/firefox-85.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a95d7f4bda46d13d8f5d5907c53d29c8cbccb239ebbc9fac4309e4c981d4203f"; + sha256 = "7177392c8f0c049ad685676aa6aab258274b7d5871c06467f7e87292779b7575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pt-PT/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/pt-PT/firefox-85.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b15eadb24566535692f9b46f6e9c757f0efd6caab3ac67ae45ed8784600bcc72"; + sha256 = "1fcae4be8cb31d30b1187b7d94fde71c41eb95c858467136af32fd7ad1117147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/rm/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/rm/firefox-85.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f3054641f0168651132e5fc0c4c65b6d5d3fb6c3550ccb2842629c1fe7f7876d"; + sha256 = "86f801260baccff9e8d9036dae46b0796edc8d90c9a2238da1e1547ac2684da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ro/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ro/firefox-85.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "46d4d15780be478f1bee7d621728643507e96fe8a78ac839d12a9dd146ea02b9"; + sha256 = "c1b02e43cc649acef6cdc9498814a4582b46b42de96dc48fcbac4d83b44ba35b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ru/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ru/firefox-85.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fdc5baff45f39bd3322e849ec2d1124d3e1ea8a3b88717c3dad69983f0053337"; + sha256 = "c067538578c2891f062716f56f3ae057ef8db2814a03ec7f1eb8855b95f9ace0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/si/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/si/firefox-85.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "2bd63e7dcfb62649bb083a6ebecb36cdad8bea8a11b6c6bc49eb41b3dd8aa1ee"; + sha256 = "8131b12c390e31c06752115abf62426565433261e73ffa37a8389b102ccd06bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sk/firefox-85.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d6e575e676b776fd7c60f9a0025318c6d41e7e525d064da04d25da565c680f36"; + sha256 = "f45f32063d34930b7e0ba4c087e97a78af642a59270c62fbea86b0bd87e06171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sl/firefox-85.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "db6d41f37fd8d1452f2a810cdab92a4abf276bb2b852ab016dc8a9cf9a42e134"; + sha256 = "df8602e60a895887170ff2d18aae487730ef8e0bcfe08010fbe0da30f05af91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/son/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/son/firefox-85.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "dbe54692404e9aa2478f4d89288a5e4aabe03289531f0c70e752dbe28f128ad0"; + sha256 = "3dd3bb220c4cfeee6ecd79977e1a619470a2504a4597f314286497164984cd9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sq/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sq/firefox-85.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "13770eaa25dc493b7f9ccd52d05682eb7fedaf6eb71511375bf38c7147d7238f"; + sha256 = "cc04ff65bb4fbc714e21a416af26256d4b203f327e5678c71378fa507242ec6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sr/firefox-85.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "3b72e4c6464c3ad2b3e314c46220f86348f583b4c382ebb07772bad79e67619d"; + sha256 = "abb30a4c0eb7ea9910b21c0f10cace395f9d413ce39051494c97ddd1e18e2c10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sv-SE/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/sv-SE/firefox-85.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "849c3c8628741e1f96408828996aa463b7b8cdc0f7e60eee712404db0dc98037"; + sha256 = "76ae51342d5b8a93ae5f3927a69b9b1a6cd4877b98a7a103f8250bbe105ecf6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ta/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ta/firefox-85.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "705bc6133fc936ed0057d61283783f7bcd1d4d08e8dabf2e25d3ec772d138fa3"; + sha256 = "1e9866ac793705555c15ae4d0e16753e90e8deae19e6694ce9f85e8dfa6ee476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/te/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/te/firefox-85.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7bedf0917824342facd96e426db6dd387ce4b425ca7a5e9803c03c869082c648"; + sha256 = "66dcd400f89054f194f1a794c8731c7344b04f97209023559bfcd0f008e005c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/th/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/th/firefox-85.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0767b03ead7c33c316923ab6a0978a7b970cfcd3afe8c46b6bb343d1df09cdc0"; + sha256 = "adef4cf7769510a8b47628eff5ee0f3b00c23862634fd8f6975daf599cf7b056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/tl/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tl/firefox-85.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "fd6f6432fb60ae420f29c7790d9e33782df353a353cdc8596492369156fa69ea"; + sha256 = "465d089eb0c68d8279e3cc7f8ceb5c08527fc48b0292cc8ce523879c4643fbb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/tr/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/tr/firefox-85.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "69c56cab60cc5f309957eeb55fefea654dd67edebefa4aacf9742820e42e7ab0"; + sha256 = "00d75ff3605672f6704fb600208872e536f76907ed25a4f90325cabc1924f991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/trs/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/trs/firefox-85.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "945106e6e39f0b28f891606d9e991ad612f2712d2be04f1cb2aeee4739890289"; + sha256 = "299be659a464911dd27d92c36f567f675a26aa6d92af63deb002e172ba6b40e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/uk/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uk/firefox-85.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "757ce998065bfcacc90f7a7e24b4b558def38673c03e01607913d40bb773ea33"; + sha256 = "49c2084ec32c03fd2821c8f1220bbbf954b98705e44a6a7fa65ec6f1abb12c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ur/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/ur/firefox-85.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "08c455a739c558b390001dfc955d7ace4ca0df484ed772816417393f9b01e296"; + sha256 = "d703344d8f03186b0fb246108892432f137cc033ae66bef395e7216cfa7bbdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/uz/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/uz/firefox-85.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ecf118f83fe6139e547757da784f438a990118351bdbb3417488eaa848d24066"; + sha256 = "02379c1fd1766eb15d9e99f8a6f08074df943c49ecf6b50a6b29ae8e922bf347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/vi/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/vi/firefox-85.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ce5c52ff6a709ffa32a262ed2ba22d7120c153ec7d1d237ea4885b3c215be21a"; + sha256 = "0577b4c2891ba646a67a93b4d6373095b98466e32b95993abc79e7bfd240f7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/xh/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/xh/firefox-85.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "abef46a099e046e675c79b8e131897fca57c083626cda2bc67aa242a1e8ecbba"; + sha256 = "83e40e1b33b2782d5dc68d32286da290188e8b5c3d689e5352d53411f95bed4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/zh-CN/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-CN/firefox-85.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "81b604aa7d452f7b07a719bfbfc1a583df2f9121cb9215b6f5671555d080def4"; + sha256 = "695e647135b911a5e60374595197cd096b7bc180e63ee3069e4550a612354369"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/zh-TW/firefox-85.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.2/linux-i686/zh-TW/firefox-85.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2097306adf4e26a8ab039184b301a997d8ac1f19a494e2a9b9df5e1ec270fc14"; + sha256 = "5dcc5aa463f3c2325dcc7f4f768580dca6adf66e052470ec932bfabe9b3f8f29"; } ]; } From 4fe4118598b82eed28a53de3ed82edae9920fda5 Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Mon, 8 Feb 2021 19:48:09 -0800 Subject: [PATCH 04/38] elm-format: 0.8.4 -> 0.8.5 --- pkgs/development/compilers/elm/default.nix | 7 ++- .../compilers/elm/packages/avh4-lib.nix | 29 +++++++++++ .../compilers/elm/packages/bimap.nix | 15 ++++++ .../compilers/elm/packages/elm-format-lib.nix | 33 ++++++++++++ .../elm/packages/elm-format-markdown.nix | 16 ++++++ .../elm/packages/elm-format-test-lib.nix | 27 ++++++++++ .../compilers/elm/packages/elm-format.nix | 50 +++++++++---------- .../compilers/elm/packages/indents.nix | 2 +- 8 files changed, 152 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/compilers/elm/packages/avh4-lib.nix create mode 100644 pkgs/development/compilers/elm/packages/bimap.nix create mode 100644 pkgs/development/compilers/elm/packages/elm-format-lib.nix create mode 100644 pkgs/development/compilers/elm/packages/elm-format-markdown.nix create mode 100644 pkgs/development/compilers/elm/packages/elm-format-test-lib.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7ee9e6e5d61..2522bb76cd3 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc883.override { + hsPkgs = haskell.packages.ghc8103.override { overrides = self: super: with haskell.lib; with lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -79,6 +79,11 @@ let # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; + bimap = self.callPackage ./packages/bimap.nix {}; + avh4-lib = self.callPackage ./packages/avh4-lib.nix {}; + elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {}; + elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; + elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; }; }; diff --git a/pkgs/development/compilers/elm/packages/avh4-lib.nix b/pkgs/development/compilers/elm/packages/avh4-lib.nix new file mode 100644 index 00000000000..cd3df7d67a9 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/avh4-lib.nix @@ -0,0 +1,29 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base, bimap +, binary, bytestring, containers, directory, fetchgit, filepath +, lib, mtl, process, relude, tasty, tasty-discover, tasty-hspec +, tasty-hunit, text +}: +mkDerivation { + pname = "avh4-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base bimap binary bytestring + containers directory filepath mtl process relude tasty tasty-hspec + tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code for haskell projects"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/bimap.nix b/pkgs/development/compilers/elm/packages/bimap.nix new file mode 100644 index 00000000000..41412d1639c --- /dev/null +++ b/pkgs/development/compilers/elm/packages/bimap.nix @@ -0,0 +1,15 @@ +{ mkDerivation, base, containers, exceptions, lib, QuickCheck +, template-haskell +}: +mkDerivation { + pname = "bimap"; + version = "0.3.3"; + sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1"; + libraryHaskellDepends = [ base containers exceptions ]; + testHaskellDepends = [ + base containers exceptions QuickCheck template-haskell + ]; + homepage = "https://github.com/joelwilliamson/bimap"; + description = "Bidirectional mapping between two key types"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-lib.nix new file mode 100644 index 00000000000..7beb52e8006 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-format-lib.nix @@ -0,0 +1,33 @@ +{ mkDerivation, ansi-terminal, ansi-wl-pprint, array, avh4-lib +, base, bimap, binary, bytestring, containers, directory +, elm-format-markdown, elm-format-test-lib, fetchgit, filepath +, indents, json, lib, mtl, optparse-applicative, parsec, process +, relude, split, tasty, tasty-discover, tasty-hspec, tasty-hunit +, text +}: +mkDerivation { + pname = "elm-format-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown filepath + indents json mtl optparse-applicative parsec process relude text + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint array avh4-lib base bimap binary + bytestring containers directory elm-format-markdown + elm-format-test-lib filepath indents json mtl optparse-applicative + parsec process relude split tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Common code used by elm-format and elm-refactor"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix new file mode 100644 index 00000000000..ae3b40347db --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-format-markdown.nix @@ -0,0 +1,16 @@ +{ mkDerivation, base, containers, fetchgit, lib, mtl, text }: +mkDerivation { + pname = "elm-format-markdown"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ base containers mtl text ]; + doHaddock = false; + description = "Markdown parsing for Elm documentation comments"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix new file mode 100644 index 00000000000..729c2d678fc --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix @@ -0,0 +1,27 @@ +{ mkDerivation, avh4-lib, base, containers, fetchgit, filepath +, hspec-core, hspec-golden, lib, mtl, split, tasty, tasty-discover +, tasty-hspec, tasty-hunit, text +}: +mkDerivation { + pname = "elm-format-test-lib"; + version = "0.0.0.1"; + src = fetchgit { + url = "https://github.com/avh4/elm-format"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/elm-format-test-lib; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testHaskellDepends = [ + avh4-lib base containers filepath hspec-core hspec-golden mtl split + tasty tasty-hspec tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Test helpers used by elm-format-tests and elm-refactor-tests"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index b2f655d4f1c..2d2cbcf3bc9 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,40 +1,40 @@ -{ 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, lib, tasty, tasty-golden -, tasty-hunit, tasty-quickcheck, text +{ mkDerivation, ansi-wl-pprint, avh4-lib, base, bimap, cmark +, containers, elm-format-lib, elm-format-test-lib, fetchgit, json +, lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io +, relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-format"; - version = "0.8.4"; + version = "0.8.5"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; - rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; + sha256 = "0bcjkcs1dy1csz0mpk7d4b5wf93fsj9p86x8fp42mb0pipdd0bh6"; + rev = "80f15d85ee71e1663c9b53903f2b5b2aa444a3be"; + fetchSubmodules = true; }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint avh4-lib base containers elm-format-lib json + optparse-applicative relude text + ]; + testHaskellDepends = [ + ansi-wl-pprint avh4-lib base bimap cmark containers elm-format-lib + elm-format-test-lib json mtl optparse-applicative parsec QuickCheck + quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck + text + ]; + doHaddock = false; + homepage = "https://elm-lang.org"; + description = "A source code formatter for Elm"; + license = lib.licenses.bsd3; postPatch = '' mkdir -p ./generated cat < ./generated/Build_elm_format.hs module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.4" + gitDescribe = "0.8.5" EOHS ''; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - 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 = [ - base cmark containers HUnit mtl parsec QuickCheck quickcheck-io - split tasty tasty-golden tasty-hunit tasty-quickcheck text - ]; - doHaddock = false; - homepage = "https://elm-lang.org"; - description = "A source code formatter for Elm"; - license = lib.licenses.bsd3; } diff --git a/pkgs/development/compilers/elm/packages/indents.nix b/pkgs/development/compilers/elm/packages/indents.nix index d196e8d0fbf..85e765db3e5 100644 --- a/pkgs/development/compilers/elm/packages/indents.nix +++ b/pkgs/development/compilers/elm/packages/indents.nix @@ -1,4 +1,4 @@ -{ mkDerivation, base, concatenative, mtl, parsec, lib }: +{ mkDerivation, base, concatenative, lib, mtl, parsec }: mkDerivation { pname = "indents"; version = "0.3.3"; From c16cecdcd65b8cfcb00af22d7103bed54343a0eb Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Tue, 9 Feb 2021 00:21:28 -0800 Subject: [PATCH 05/38] Add maintainer: avh4 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/compilers/elm/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 17ced60c684..ba59b3fc5f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -904,6 +904,12 @@ githubId = 687218; name = "averelld"; }; + avh4 = { + email = "gruen0aermel@gmail.com"; + github = "avh4"; + githubId = 1222; + name = "Aaron VonderHaar"; + }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 2522bb76cd3..557dcf96830 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -41,7 +41,7 @@ let description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; homepage = "https://github.com/avh4/elm-format"; license = licenses.bsd3; - maintainers = with maintainers; [ turbomack ]; + maintainers = with maintainers; [ avh4 turbomack ]; })); elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: { From 99ecffc333db8a59bb40fe556912d2a0cf717958 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 18:36:46 +0000 Subject: [PATCH 06/38] vultr-cli: 2.0.1 -> 2.2.0 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 505023f3fdd..22ac7a8f2c1 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "14cl0rgkk2kw0qyanlm57nbcrnsnnx02ikd6b1mrsviamb6r1lz6"; + sha256 = "sha256-zt12LUKcsu/t2wNunIQhrNOqOABjyfL0MkSEPOQswFM="; }; vendorSha256 = null; From bdf0239c3f83ee985901e930d87659731e02c8e2 Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Tue, 9 Feb 2021 11:27:30 -0800 Subject: [PATCH 07/38] elm-format: simplify the nix expression --- pkgs/development/compilers/elm/packages/elm-format.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index 2d2cbcf3bc9..6b583a6edde 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -3,7 +3,7 @@ , lib, mtl, optparse-applicative, parsec, QuickCheck, quickcheck-io , relude, tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, text }: -mkDerivation { +mkDerivation rec { pname = "elm-format"; version = "0.8.5"; src = fetchgit { @@ -34,7 +34,7 @@ mkDerivation { module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.5" + gitDescribe = "${version}" EOHS ''; } From be7906e6ee664a4862be4b5142d1fd845c5541de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 10 Feb 2021 10:04:28 +0100 Subject: [PATCH 08/38] ghdl: unstable-2021.01.14 -> 1.0.0 --- pkgs/development/compilers/ghdl/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index 6181486f50c..e7332439439 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -5,24 +5,22 @@ assert backend == "mcode" || backend == "llvm"; stdenv.mkDerivation rec { pname = "ghdl-${backend}"; - # NOTE(aseipp): move to 0.38 when it comes out, since it should support a stable - # version of the yosys plugin - version = "unstable-2021.01.14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl"; - rev = "4868294436574660552ccef50a5b0849559393de"; - sha256 = "1wqjf0qc66dam1n2mskmlvj53bcsdwwk5rq9gimq6ah1vcwi222p"; + rev = "v${version}"; + sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly"; }; LIBRARY_PATH = "${stdenv.cc.libc}/lib"; - buildInputs = [ gnat zlib ]; + buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; preConfigure = '' # If llvm 7.0 works, 7.x releases should work too. - sed -i 's/check_version 7.0/check_version 7/g' configure + sed -i 's/check_version 7.0/check_version 7/g' configure ''; configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm") From 5def007f408669789bc765718d6e13b4dfecfdd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 10 Feb 2021 10:06:10 +0100 Subject: [PATCH 09/38] ghdl-yosys: 2021.01.01 -> 2021.01.25 --- pkgs/development/compilers/yosys/plugins/ghdl.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/plugins/ghdl.nix b/pkgs/development/compilers/yosys/plugins/ghdl.nix index ccf8efc7c80..35f3ef2bcc8 100644 --- a/pkgs/development/compilers/yosys/plugins/ghdl.nix +++ b/pkgs/development/compilers/yosys/plugins/ghdl.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "yosys-ghdl"; - version = "2021.01.01"; + version = "2021.01.25"; src = fetchFromGitHub { owner = "ghdl"; repo = "ghdl-yosys-plugin"; - rev = "8b3e740fef9a653a20a838f1ade475960e1d379b"; - sha256 = "13kpcp37r11xgqd8aksddi40a5vpzqi7p8qgyjbs99lyscyli75x"; + rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd"; + sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx"; }; buildInputs = [ yosys readline zlib ghdl ]; From 5937a4aff8cd96cfceff9e98ee108595a26dc696 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 9 Feb 2021 14:38:15 +0100 Subject: [PATCH 10/38] spaceFM: Avoid segfault when running under Wayland SpaceFM is a Gtk+ application that was written with only the X11 backend in mind. By explicitly allowing only the "x11" backend, it will not try to use the wayland backend when it is run under sway, for example. Fixes #107242 --- pkgs/applications/misc/spacefm/default.nix | 8 +++++++- pkgs/applications/misc/spacefm/x11-only.patch | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/spacefm/x11-only.patch diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index e08240733d1..3d9f7204875 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -13,7 +13,13 @@ stdenv.mkDerivation rec { sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; - patches = [ ./glibc-fix.patch ]; + patches = [ + # fix compilation error due to missing include + ./glibc-fix.patch + + # restrict GDK backends to only X11 + ./x11-only.patch + ]; configureFlags = [ "--with-bash-path=${pkgs.bash}/bin/bash" diff --git a/pkgs/applications/misc/spacefm/x11-only.patch b/pkgs/applications/misc/spacefm/x11-only.patch new file mode 100644 index 00000000000..1b2f9f14582 --- /dev/null +++ b/pkgs/applications/misc/spacefm/x11-only.patch @@ -0,0 +1,10 @@ +--- a/src/main.c 2021-02-09 13:54:32.847364236 +0100 ++++ b/src/main.c 2021-02-09 10:41:51.541203271 +0100 +@@ -1350,6 +1351,7 @@ + vfs_file_monitor_clean(); + return 1; + } ++ gdk_set_allowed_backends("x11"); + gtk_init (&argc, &argv); + int ret = custom_dialog_init( argc, argv ); + if ( ret != 0 ) From 41aa703e31ebc7445625d4b873f0ca5d44ddb72b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Feb 2021 23:12:20 +0000 Subject: [PATCH 11/38] php73Packages.phpstan: 0.12.71 -> 0.12.74 --- pkgs/development/php-packages/phpstan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 1d6de288562..f8124e43d7f 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.71"; + version = "0.12.74"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-VSA/37LTawwIL1qdyp35auml7we3xDdrZN21/V3BWlM="; + sha256 = "sha256-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; }; phases = [ "installPhase" ]; From 6f1319a4d6dac91cc91b77a149828cd0989e0144 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:54:58 -0800 Subject: [PATCH 12/38] symbiyosys: fix the interpreter of the `sby` binary. Signed-off-by: David Anderson --- pkgs/applications/science/logic/symbiyosys/default.nix | 3 +++ pkgs/development/python-modules/nmigen/default.nix | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 1f2ad4634de..118bb8ecd20 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation { substituteInPlace sbysrc/sby_core.py \ --replace '##yosys-program-prefix##' '"${yosys}/bin/"' + + substituteInPlace sbysrc/sby.py \ + --replace '/usr/bin/env python3' '${python3}/bin/python' ''; buildPhase = "true"; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 4a2327bf928..ca898b988c7 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -38,13 +38,6 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" ''; - # Fail b/c can't find sby (symbiyosys) executable, which should be on path. - disabledTests = [ - "test_distance" - "test_reversible" - "FIFOFormalCase" - ]; - meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; From 6a865bf06096c423156eab9d64749333eb62fe0e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:47:21 -0800 Subject: [PATCH 13/38] nmigen: 2020-04-02 -> 2021-02-09 Signed-off-by: David Anderson --- .../python-modules/nmigen/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index ca898b988c7..1e38a087bce 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -6,6 +6,8 @@ , setuptools_scm , pyvcd , jinja2 +, importlib-resources +, importlib-metadata # for tests , pytestCheckHook @@ -16,21 +18,27 @@ buildPythonPackage rec { pname = "nmigen"; - version = "unstable-2020-04-02"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.2.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.3.dev243+g${lib.substring 0 7 src.rev}"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen"; - rev = "c79caead33fff14e2dec42b7e21d571a02526876"; - sha256 = "sha256-3+mxHyg0a92/BfyePtKT5Hsk+ra+fQzTjCJ2Ech44/s="; + rev = "f7c2b9419f9de450be76a0e9cf681931295df65f"; + sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ setuptools pyvcd jinja2 ]; + propagatedBuildInputs = [ + setuptools + pyvcd + jinja2 + ] ++ + lib.optional (pythonOlder "3.9") importlib-resources ++ + lib.optional (pythonOlder "3.8") importlib-metadata; checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; From 4785251626d1d9eead49ed5187adc5f6d7b3da8f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:48:09 -0800 Subject: [PATCH 14/38] nmigen-boards: 2020-02-06 -> 2021-02-09 Signed-off-by: David Anderson --- pkgs/development/python-modules/nmigen-boards/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index 55f70f74db9..f397454e7e1 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-boards"; - version = "unstable-2020-02-06"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev92+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev173+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-boards"; - rev = "f37fe0295035db5f1bf82ed086b2eb349ab3a530"; - sha256 = "16112ahil100anfwggj64nyrj3pf7mngwrjyqyhf2ggxx9ir24cc"; + rev = "a35d870a994c2919116b2c06166dc127febb1512"; + sha256 = "1flbcyb2xz174dgqv2964qra80xj2vbzbqwjb27shvxm6knj9ikf"; }; nativeBuildInputs = [ setuptools_scm ]; From 08a70a12e7615b2c801227a8d6070821cbbe512e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 9 Feb 2021 20:48:29 -0800 Subject: [PATCH 15/38] nmigen-soc: 2020-02-08 -> 2021-02-09 Signed-off-by: David Anderson --- pkgs/development/python-modules/nmigen-soc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index afc0c63a38f..b987557d5f6 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "nmigen-soc"; - version = "unstable-2020-02-08"; + version = "unstable-2021-02-09"; # python setup.py --version - realVersion = "0.1.dev24+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev43+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "nmigen"; repo = "nmigen-soc"; - rev = "f5b5cd563e8e8d081b0535c4554c02b5456ee8b4"; - sha256 = "04kjaq9qp6ac3h0r1wlb4jyz56bb52l1rikmz1x7azvnr10xhrad"; + rev = "ecfad4d9abacf903a525f0a252c38844eda0d2dd"; + sha256 = "0afmnfs1ms7p1r4c1nc0sfvlcq36zjwaim7775v5i2vajcn3020c"; }; nativeBuildInputs = [ setuptools_scm ]; From 44321d73f742575c0edfa4922b5e5c7fe80b343f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Feb 2021 03:57:53 +0100 Subject: [PATCH 16/38] poetry2nix: 1.15.2 -> 1.15.3 --- .../tools/poetry2nix/poetry2nix/default.nix | 2 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 188 +++++++++--------- 2 files changed, 97 insertions(+), 93 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index dbec90d8bf5..f6dd768a06d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.15.2"; + version = "1.15.3"; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index d400986d3d7..c0af7a51f52 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -39,7 +39,7 @@ self: super: ansible-lint = super.ansible-lint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; preBuild = '' export HOME=$(mktemp -d) ''; @@ -48,42 +48,42 @@ self: super: astroid = super.astroid.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); av = super.av.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ]; } ); bcrypt = super.bcrypt.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ); cairocffi = super.cairocffi.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.cairocffi) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); cairosvg = super.cairosvg.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); cssselect2 = super.cssselect2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -93,14 +93,14 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ]; } ) ); cftime = super.cftime.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } @@ -108,13 +108,13 @@ self: super: colour = super.colour.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.d2to1 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; } ); configparser = super.configparser.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; @@ -126,9 +126,12 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; + } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { + CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; } ); @@ -136,17 +139,17 @@ self: super: postPatch = '' substituteInPlace setup.py --replace "setuptools==" "setuptools>=" ''; - buildInputs = old.buildInputs ++ [ self.setuptools ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; }); ddtrace = super.ddtrace.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ + buildInputs = (old.buildInputs or [ ]) ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; }); dictdiffer = super.dictdiffer.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; } ); @@ -178,8 +181,8 @@ self: super: enableParallelBuilding = true; dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs; + buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs; } ); @@ -206,7 +209,7 @@ self: super: faker = super.faker.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -223,13 +226,13 @@ self: super: fastparquet = super.fastparquet.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); grandalf = super.grandalf.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); @@ -246,8 +249,8 @@ self: super: h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; configure_flags = "--hdf5=${pkgs.hdf5}"; postConfigure = '' ${self.python.executable} setup.py configure ${configure_flags} @@ -287,7 +290,7 @@ self: super: ''; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ # Commented out packages are declared required, but not actually # needed to build. They are not yet packaged for nixpkgs. # bitshuffle @@ -347,7 +350,7 @@ self: super: jira = super.jira.overridePythonAttrs ( old: { inherit (pkgs.python3Packages.jira) patches; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytestrunner self.cryptography self.pyjwt @@ -372,7 +375,7 @@ self: super: keyring = super.keyring.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.toml ]; postPatch = '' @@ -383,7 +386,7 @@ self: super: kiwisolver = super.kiwisolver.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cppy ]; } @@ -404,7 +407,7 @@ self: super: llvmlite = super.llvmlite.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.llvm ]; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -433,8 +436,8 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; } ); @@ -459,11 +462,11 @@ self: super: XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; @@ -494,16 +497,16 @@ self: super: mccabe = super.mccabe.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); mip = super.mip.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoPatchelfHook ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ]; - buildInputs = old.buildInputs ++ [ pkgs.zlib self.cppy ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ]; } ); @@ -519,11 +522,11 @@ self: super: excludes = [ "pyproject.toml" ]; }) ]; - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; } )) else super.molecule.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; }); mongomock = super.mongomock.overridePythonAttrs (oa: { @@ -557,19 +560,19 @@ self: super: multiaddr = super.multiaddr.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); mysqlclient = super.mysqlclient.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; } ); netcdf4 = super.netcdf4.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; @@ -613,8 +616,8 @@ self: super: }; in { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; + buildInputs = (old.buildInputs or [ ]) ++ [ blas self.cython ]; enableParallelBuilding = true; preBuild = '' ln -s ${cfg} site.cfg @@ -628,21 +631,21 @@ self: super: openexr = super.openexr.overridePythonAttrs ( old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; } ); osqp = super.osqp.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; dontUseCmakeConfigure = true; } ); parsel = super.parsel.overridePythonAttrs ( old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -653,7 +656,7 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; @@ -662,8 +665,8 @@ self: super: pillow = super.pillow.overridePythonAttrs ( old: { - nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + nativeBuildInputs = [ pkgs.pkg-config ] ++ (old.nativeBuildInputs or [ ]); + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]); } ); @@ -714,17 +717,17 @@ self: super: psycopg2 = super.psycopg2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { - buildInputs = old.buildInputs + buildInputs = (old.buildInputs or [ ]) ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; } ); @@ -751,7 +754,7 @@ self: super: in if arrowCppVersion != pyArrowVersion then throw errorMessage else { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config pkgs.cmake @@ -764,7 +767,7 @@ self: super: PARQUET_HOME = _arrow-cpp; inherit ARROW_HOME; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.arrow-cpp ]; @@ -783,7 +786,7 @@ self: super: ) else super.pyarrow.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } @@ -799,7 +802,7 @@ self: super: ).overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.meson pkgs.ninja pkgs.pkg-config @@ -818,7 +821,7 @@ self: super: pycocotools = super.pycocotools.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython self.numpy ]; @@ -869,27 +872,27 @@ self: super: pygobject = super.pygobject.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); pylint = super.pylint.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; } ); pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; } ); python-bugzilla = super.python-bugzilla.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.docutils ]; } @@ -897,7 +900,7 @@ self: super: python-ldap = super.python-ldap.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ]; } ); @@ -919,7 +922,7 @@ self: super: old: { format = "other"; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.qt5.qmake pkgs.xorg.lndir @@ -936,7 +939,7 @@ self: super: ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.dbus pkgs.qt5.qtbase pkgs.qt5.qtsvg @@ -1071,13 +1074,13 @@ self: super: ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); python-prctl = super.python-prctl.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libcap ]; } @@ -1085,7 +1088,7 @@ self: super: pyzmq = super.pyzmq.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); @@ -1108,13 +1111,13 @@ self: super: pandas = super.pandas.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; } ); panel = super.panel.overridePythonAttrs ( old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.nodejs ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ]; } ); @@ -1138,11 +1141,11 @@ self: super: scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES @@ -1155,14 +1158,14 @@ self: super: scikit-learn = super.scikit-learn.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gfortran pkgs.glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ pkgs.llvmPackages.openmp ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ]; @@ -1172,7 +1175,7 @@ self: super: shapely = super.shapely.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos self.cython ]; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } ); @@ -1190,8 +1193,8 @@ self: super: tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; } ); @@ -1220,7 +1223,7 @@ self: super: tinycss2 = super.tinycss2.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1241,13 +1244,14 @@ self: super: # is explicitly disabled with USE_CUDA=0. find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; ''; - buildInputs = (old.buildInputs or [ ]) + buildInputs = + (old.buildInputs or [ ]) ++ [ self.typing-extensions ] ++ lib.optionals enableCuda [ - pkgs.linuxPackages.nvidia_x11 - pkgs.nccl.dev - pkgs.nccl.out - ]; + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; propagatedBuildInputs = [ self.numpy self.future @@ -1285,7 +1289,7 @@ self: super: vispy = super.vispy.overrideAttrs ( old: { inherit (pkgs.python3.pkgs.vispy) patches; - nativeBuildInputs = old.nativeBuildInputs ++ [ + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython self.setuptools-scm-git-archive ]; @@ -1294,7 +1298,7 @@ self: super: uvloop = super.uvloop.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.CoreServices ]; @@ -1312,7 +1316,7 @@ self: super: weasyprint = super.weasyprint.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.weasyprint) patches; - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; } ); @@ -1368,19 +1372,19 @@ self: super: credis = super.credis.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.cython ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ]; } ); hashids = super.hashids.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ self.flit-core ]; + buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; } ); packaging = super.packaging.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ + buildInputs = (old.buildInputs or [ ]) ++ # From 20.5 until 20.7, packaging used flit for packaging (heh) # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ]; @@ -1407,13 +1411,13 @@ self: super: # is not translated correctly to a nix dependency. tqdm = super.tqdm.overrideAttrs ( old: { - buildInputs = [ super.toml ] ++ old.buildInputs; + buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]); } ); watchdog = super.watchdog.overrideAttrs ( old: { - buildInputs = old.buildInputs or [ ] + buildInputs = (old.buildInputs or [ ]) ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; } ); From 19fa94d020d807bc8ebcaf0c17ffdbaba84be428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 15:14:15 +0000 Subject: [PATCH 17/38] ibus-engines.table: 1.9.25 -> 1.12.3 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index a7a640b2c6e..1a137c1e712 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.9.25"; + version = "1.12.3"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "0v570qpnb2q79aqr9f0xnska34y7hw34ibiwsf7ybcw69fhi1zkg"; + sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8="; }; postPatch = '' From 6088dcf945d7054e6baeea86ce41cbe1e12f44c8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 07:57:31 +0100 Subject: [PATCH 18/38] ibus-engines.table: Fix ibus-setup-table It now requires dbus-python. Missed this in https://github.com/NixOS/nixpkgs/pull/109973 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 1a137c1e712..00a499fb104 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { -e "/export IBUS_LOCALEDIR=/ s/^.$//" \ -i "setup/ibus-setup-table.in" substituteInPlace engine/tabcreatedb.py --replace '/usr/share/ibus-table' $out/share/ibus-table + substituteInPlace engine/ibus_table_location.py \ + --replace '/usr/libexec' $out/libexec \ + --replace '/usr/share/ibus-table/' $out/share/ibus-table/ ''; buildInputs = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { gtk3 ibus (python3.withPackages (pypkgs: with pypkgs; [ + dbus-python pygobject3 (toPythonModule ibus) ])) From 707bb2712ef36e798c46a4b07213dc3703c93617 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 07:28:33 +0100 Subject: [PATCH 19/38] libmysqlconnectorcpp: 8.0.21 -> 8.0.23 - https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-23.html - https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-22.html Binary distribution now ships plug-ins and and users will have to set path to them as if they want to use LDAP since it cannot really be installed to this package (where it will likely look for plug-ins). --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 4c00d642588..40d814814ca 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.21"; + version = "8.0.23"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "08z40419aip26z6ss30g59mvnddb8dfam82l556jyj3gxs0irqbh"; + sha256 = "sha256-mvBklaaggP7WLacJePHLDGbwWO3V6p7ak0WmS/jsaI8="; }; nativeBuildInputs = [ From 283eaaff3e54967a7c1e8edd4ca5ecda349403bb Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Sun, 27 Dec 2020 02:16:19 +0100 Subject: [PATCH 20/38] nixos-rebuild: use remote $PATH in buildHostCmd this fixes the issue when using nixos-rebuild switch --target-host --use-remote-sudo when the local machine does not have anything in `$PATH` that would resolve to `sudo` on the remote machine. the single quotes prevent expansion of `$PATH` on the local machine, such that the remote machine's value of that variable is used. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index cc72e2e42b4..38b5e3241c1 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -145,7 +145,7 @@ buildHostCmd() { if [ -z "$buildHost" ]; then "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" env PATH="$remoteNix:$PATH" "${maybeSudo[@]}" "$@" + ssh $SSHOPTS "$buildHost" env PATH="$remoteNix":'$PATH' "${maybeSudo[@]}" "$@" else ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi From 0e7742c5baa688d9c65d35542ea7014040e08199 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Jan 2021 14:46:36 +0000 Subject: [PATCH 21/38] jalv: 1.6.4 -> 1.6.6 --- pkgs/applications/audio/jalv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 5d322eeca93..611956089ed 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jalv"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2"; + sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; nativeBuildInputs = [ pkg-config wafHook ]; From 4c04b4cef9de2fe1c333912cf758e0baa5a65859 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 21:57:11 +0000 Subject: [PATCH 22/38] firmware-manager: 0.1.1 -> 0.1.2 --- .../os-specific/linux/firmware/firmware-manager/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix index c4649557b11..f7f02037800 100644 --- a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -1,13 +1,13 @@ { rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: rustPlatform.buildRustPackage rec { pname = "firmware-manager"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = "make prefix='$(out)' install"; - cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + cargoSha256 = "sha256-TISYaSOu8c+74ie4QHLqflXfLWwcLHEOch/hAx3iu60="; doCheck = false; From b033cd4be937918d9aa7d553c28a44a4148e8801 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Feb 2021 18:11:36 +0000 Subject: [PATCH 23/38] vips: 8.10.2 -> 8.10.5 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 9b29e114b88..333c4848db2 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.2"; + version = "8.10.5"; outputs = [ "bin" "out" "man" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp"; + sha256 = "sha256-h21Ep6f4/y+m0kdrCA5dcULFeOOyLtMx2etAziG6f9Y="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From 3106e35abe95f86188fe132f57a894dfcc3481ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Feb 2021 20:19:01 +0000 Subject: [PATCH 24/38] suitesparse-graphblas: 3.3.3 -> 4.0.3 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 7696b18e7ca..151a0eef891 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.3"; + version = "4.0.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; + sha256 = "sha256-Bf3+w/kQtFpeUGp2zWVqja535EbaUw7DbhCw54B6A8k="; }; nativeBuildInputs = [ From c81739f1b9a4c0ea2303ca7b81fbb8fc1ceba151 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Feb 2021 22:45:45 +0000 Subject: [PATCH 25/38] rpm-ostree: 2020.8 -> 2021.1 --- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 9d95085296f..0e094a4b2ad 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.8"; + version = "2021.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1iyl6bjkj3drlwds579bh25xcmlwj9lkkbdmcdanq5b3shbmpyhi"; + sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; }; nativeBuildInputs = [ From e937d5db28035b20ed3ce43f052cfab4f110a0eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 15:05:42 +0000 Subject: [PATCH 26/38] ibus-engines.m17n: 1.4.3 -> 1.4.4 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 07ab09b8e6c..8fbd9254486 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "0lb2vcnkzy64474j7306ydyw1ali0qbx07sxfms2fqv1nmh161i2"; + sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; }; nativeBuildInputs = [ From ddebd054e384cdd8e2b2be8c49a7a8b134ce7c88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 15:20:24 +0000 Subject: [PATCH 27/38] gnome3.gvfs: 1.46.1 -> 1.46.2 --- pkgs/development/libraries/gvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index c30d678e02d..2c9bac002fd 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; + sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; }; postPatch = '' From 56565e3568b9897b8e282e66f743c1189198b24b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Feb 2021 13:29:31 +0000 Subject: [PATCH 28/38] gthumb: 3.10.1 -> 3.10.2 --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index cefb9c03dc0..faa25f4aef0 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; + sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; }; nativeBuildInputs = [ From 25c2bf8cea9145b7e3b9ace3f2ec0baf86e77829 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 30 Jan 2021 12:17:32 +0000 Subject: [PATCH 29/38] libwpe: 1.7.1 -> 1.8.0 --- pkgs/development/libraries/libwpe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 102d658000c..4397f65ac4b 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0h6kh8wy2b370y705pl2vp6vp18dkdsgdxh0243ji2v51kxbg157"; + sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; }; nativeBuildInputs = [ From 0cf1f67aa1bfe89998a0d754d5ccdbd4d1be8c56 Mon Sep 17 00:00:00 2001 From: Matt Jibson Date: Mon, 14 Dec 2020 21:40:11 -0700 Subject: [PATCH 30/38] ddccontrol-db: 20180908 -> 20201221 --- pkgs/data/misc/ddccontrol-db/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 38f72b5a2ef..2212b158c8a 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation { - name = "ddccontrol-db-20180908"; +stdenv.mkDerivation rec { + pname = "ddccontrol-db"; + version = "20201221"; + src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; - rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84"; - sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w"; + rev = version; + sha256 = "1sryyjjad835mwc7a2avbij6myln8b824kjdr78gc9hh3p16929b"; }; preConfigure = '' From 8909b5de82884f3b13d5ff23abb0e565ed005ea4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 08:26:20 +0100 Subject: [PATCH 31/38] ddccontrol: 0.4.4 -> 0.5.1 desktop file is now upstream --- pkgs/tools/misc/ddccontrol/default.nix | 52 +++++++++++--------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 604ba0cbf75..41f2bede999 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkg-config, gtk2, ddccontrol-db -, makeDesktopItem +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, intltool +, libxml2 +, pciutils +, pkg-config +, gtk2 +, ddccontrol-db }: -let version = "0.4.4"; in stdenv.mkDerivation rec { pname = "ddccontrol"; - inherit version; + version = "0.5.1"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.4.4"; - sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; + rev = "0.5.1"; + sha256 = "sha256-e6Rzzz5S+Um2ZBuUkfAJQA4V+zqCqsUHB0f1t/dTU2w="; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; buildInputs = [ libxml2 @@ -24,8 +34,6 @@ stdenv.mkDerivation rec { ddccontrol-db ]; - hardeningDisable = [ "format" "bindnow" ]; - prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" @@ -37,29 +45,11 @@ stdenv.mkDerivation rec { intltoolize --force ''; - postInstall = '' - mkdir -p $out/share/applications/ - cp $desktopItem/share/applications/* $out/share/applications/ - for entry in $out/share/applications/*.desktop; do - substituteAllInPlace $entry - done - ''; - - desktopItem = makeDesktopItem { - name = "gddccontrol"; - desktopName = "gddccontrol"; - genericName = "DDC/CI control"; - comment = meta.description; - exec = "@out@/bin/gddccontrol"; - icon = "gddccontrol"; - categories = "Settings;HardwareSettings;"; - }; - meta = with lib; { description = "A program used to control monitor parameters by software"; homepage = "https://github.com/ddccontrol/ddccontrol"; - license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ lib.maintainers.pakhfn ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ pakhfn ]; }; } From 4ef8bd3d16e893a80be1a78fbff0c2c81dbcb7c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 09:36:19 +0100 Subject: [PATCH 32/38] ibus-engines.libpinyin: 1.11.1 -> 1.12.0 --- .../inputmethods/ibus-engines/ibus-libpinyin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 8b530921940..b51efc2cb81 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "0b8rilk9zil9gvfhlk3rphcby6ph11dw66j175wp0na6h6hjlaf2"; + sha256 = "sha256-fEEiwRoGGFAki1DMQvGuzjz2NAjhExyH11l8KTwjjsI="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; From 34e2c2b310a4ede14a9c948b8407e4a9a459b051 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 10:20:34 +0100 Subject: [PATCH 33/38] appstream: 0.13.1 -> 0.14.0 --- .../libraries/appstream/default.nix | 22 +++++++------- .../libraries/appstream/fix-paths.patch | 29 +++++++++++++++++++ pkgs/development/libraries/appstream/qt.nix | 2 +- 3 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/libraries/appstream/fix-paths.patch diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 1e3c2bcd2eb..6fa4a6e0a4a 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext +{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , pcre, itstool, gperf, vala, lmdb, libsoup @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.13.1"; + version = "0.14.0"; outputs = [ "out" "dev" ]; @@ -14,9 +14,17 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; + sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; }; + patches = [ + # Fix hardcoded paths + (substituteAll { + src = ./fix-paths.patch; + libstemmer_includedir = "${lib.getDev libstemmer}/include"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext libxslt xmlto docbook_xsl docbook_xml_dtd_45 @@ -25,14 +33,6 @@ stdenv.mkDerivation rec { buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; - prePatch = '' - substituteInPlace meson.build \ - --replace /usr/include ${libstemmer}/include - - substituteInPlace data/meson.build \ - --replace /etc $out/etc - ''; - mesonFlags = [ "-Dapidocs=false" "-Ddocs=false" diff --git a/pkgs/development/libraries/appstream/fix-paths.patch b/pkgs/development/libraries/appstream/fix-paths.patch new file mode 100644 index 00000000000..0da72a78cbc --- /dev/null +++ b/pkgs/development/libraries/appstream/fix-paths.patch @@ -0,0 +1,29 @@ +diff --git a/data/meson.build b/data/meson.build +index 1eb3dfb0..623b66ec 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -26,4 +26,4 @@ i18n.merge_file ( + ) + + install_data ('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') +diff --git a/meson.build b/meson.build +index dc1fb1a5..5ee03b73 100644 +--- a/meson.build ++++ b/meson.build +@@ -108,12 +108,12 @@ if get_option ('gir') + dependency('gobject-introspection-1.0', version: '>=1.56') + endif + +-stemmer_inc_dirs = include_directories(['/usr/include']) ++stemmer_inc_dirs = include_directories(['@libstemmer_includedir@']) + if get_option('stemming') + stemmer_lib = cc.find_library('stemmer', required: true) + if not cc.has_header('libstemmer.h') + if cc.has_header('libstemmer/libstemmer.h') +- stemmer_inc_dirs = include_directories('/usr/include/libstemmer') ++ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer') + else + error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.') + endif diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 9ae1cce684a..0bcb4741ff1 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -4,7 +4,7 @@ mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src prePatch; + inherit (appstream) version src patches; outputs = [ "out" "dev" ]; From c68ff72627ec162940f297a39908b62fc6500b57 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 11 Feb 2021 12:19:58 +0100 Subject: [PATCH 34/38] python3Packages.trezor: export as trezorctl application too --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d70cdef3c..b7b3fa54a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8420,6 +8420,8 @@ in trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; + trezorctl = with python3Packages; toPythonApplication trezor; + trezord = callPackage ../servers/trezord { }; trezor_agent = with python3Packages; toPythonApplication trezor_agent; From 7fdadc140ce11aefe028b6d67f8a5f03b153a998 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 11 Feb 2021 12:36:34 +0100 Subject: [PATCH 35/38] fscryptctl: init at 1.0.0 (#112651) Release notes: https://github.com/google/fscryptctl/releases/tag/v1.0.0 fscryptctl-experimental will remain at version 0.1.0 to ensure a smooth transition. --- pkgs/os-specific/linux/fscryptctl/default.nix | 9 ++-- pkgs/os-specific/linux/fscryptctl/legacy.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/fscryptctl/legacy.nix diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix index ae89cd43f25..bd1b414f4cb 100644 --- a/pkgs/os-specific/linux/fscryptctl/default.nix +++ b/pkgs/os-specific/linux/fscryptctl/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -# Don't use this for anything important yet! - stdenv.mkDerivation rec { pname = "fscryptctl"; - version = "0.1.0"; + version = "1.0.0"; goPackagePath = "github.com/google/fscrypt"; @@ -12,10 +10,10 @@ stdenv.mkDerivation rec { owner = "google"; repo = "fscryptctl"; rev = "v${version}"; - sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + sha256 = "1hwj726mm0yhlcf6523n07h0yq1rvkv4km64h3ydpjcrcxklhw6l"; }; - makeFlags = [ "DESTDIR=$(out)/bin" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "Small C tool for Linux filesystem encryption"; @@ -34,6 +32,7 @@ stdenv.mkDerivation rec { documentation for filesystem encryption before using fscryptctl. ''; inherit (src.meta) homepage; + changelog = "https://github.com/google/fscryptctl/releases/tag/v{version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/os-specific/linux/fscryptctl/legacy.nix b/pkgs/os-specific/linux/fscryptctl/legacy.nix new file mode 100644 index 00000000000..64a409fb58b --- /dev/null +++ b/pkgs/os-specific/linux/fscryptctl/legacy.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub }: + +# Don't use this for anything important! +# TODO: Drop fscryptctl-experimental after the NixOS 21.03/21.05 release. + +stdenv.mkDerivation rec { + pname = "fscryptctl"; + version = "0.1.0"; + + goPackagePath = "github.com/google/fscrypt"; + + src = fetchFromGitHub { + owner = "google"; + repo = "fscryptctl"; + rev = "v${version}"; + sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb"; + }; + + makeFlags = [ "DESTDIR=$(out)/bin" ]; + + meta = with lib; { + description = "Small C tool for Linux filesystem encryption"; + longDescription = '' + fscryptctl is a low-level tool written in C that handles raw keys and + manages policies for Linux filesystem encryption, specifically the + "fscrypt" kernel interface which is supported by the ext4, f2fs, and + UBIFS filesystems. + fscryptctl is mainly intended for embedded systems which can't use the + full-featured fscrypt tool, or for testing or experimenting with the + kernel interface to Linux filesystem encryption. fscryptctl does not + handle key generation, key stretching, key wrapping, or PAM integration. + Most users should use the fscrypt tool instead, which supports these + features and generally is much easier to use. + As fscryptctl is intended for advanced users, you should read the kernel + documentation for filesystem encryption before using fscryptctl. + ''; + inherit (src.meta) homepage; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + knownVulnerabilities = [ '' + fscryptctl version 1.0.0 was released and now uses v2 encryption + policies. fscryptctl-experimental will remain at version 0.1.0 which + still supports the v1 encryption policies. Please try to switch from the + "fscryptctl-experimental" package to "fscryptctl". The v1 encryption + policies can be insecure, are hard to use correctly, and have different + semantics from v2 policies (which is why they are no longer supported in + fscryptctl 1.0.0+). + '' ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d70cdef3c..753a5da0fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18792,9 +18792,10 @@ in erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; + fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; From d35eb344f8e9c398b5a21799b0d3af879d16c612 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 11 Feb 2021 12:35:03 +0100 Subject: [PATCH 36/38] chromiumBeta: 89.0.4389.40 -> 89.0.4389.47 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0e41c904abd..38d1d535076 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "89.0.4389.40", - "sha256": "1da7l8i8hhsjnziyapynnwzfxjrj6m4p8076hg8bjqqv8alhg2zq", - "sha256bin64": "17f9yhz1w0r7panvzavmx7zyaw0i8yarlxx4zb5ghxl8hs37sasr", + "version": "89.0.4389.47", + "sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", + "sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", "deps": { "gn": { "version": "2021-01-07", From 0c5984cf83c30dd6079ae3113580a163362f43b1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 20 Jan 2021 17:28:05 +0100 Subject: [PATCH 37/38] twemoji-color-font: use prebuilt from release Building from sources takes 1.5 hours on hydra for minimal advantages. Relevant discussion: https://github.com/NixOS/nixpkgs/issues/97871 --- .../data/fonts/twemoji-color-font/default.nix | 39 +++++++------------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 5e690e7fd6f..7618c653ef4 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,37 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "twemoji-color-font"; version = "12.0.1"; - src = fetchFromGitHub { - owner = "eosrei"; - repo = "twemoji-color-font"; - rev = "v${version}"; - sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; + + # We fetch the prebuilt font because building it takes 1.5 hours on hydra. + # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 + src = fetchurl { + url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; + sha256 = "1kdy2k7b1k7sjp2l8g10lp2v000iwk8i3wcwgkhqfbwrrj7dg1kq"; }; - patches = [ - # Fix build with Inkscape 1.0 - # https://github.com/eosrei/twemoji-color-font/pull/82 - (fetchpatch { - url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch"; - sha256 = "TV8I++BEnVUQg7FNbnrEQ/MLV9n3drmspqjmDZgTGFI="; - postFetch = '' - substituteInPlace $out \ - --replace "inkscape --without-gui" "inkscape --export-png" - ''; - }) - ]; - - nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; - # silence inkscape errors about non-writable home - preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; - makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; - enableParallelBuilding = true; + dontBuild = true; installPhase = '' - install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf - install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf + install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf + install -Dm644 fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 753a5da0fcc..df1ab7db465 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20899,9 +20899,7 @@ in ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; - twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { - inherit (nodePackages) svgo; - }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { }; twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { }; From 50385ab2597e883f004d475a2bbd9af4d1c36a5f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 20 Jan 2021 17:30:08 +0100 Subject: [PATCH 38/38] twemoji-color-font: 12.0.1 -> 13.0.1 --- pkgs/data/fonts/twemoji-color-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 7618c653ef4..a2fde6813b7 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "twemoji-color-font"; - version = "12.0.1"; + version = "13.0.1"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; - sha256 = "1kdy2k7b1k7sjp2l8g10lp2v000iwk8i3wcwgkhqfbwrrj7dg1kq"; + sha256 = "1mn2cb6a3v0q8i81s9a8bk49nbwxq91n6ki7827i7rhjkncb0mbn"; }; dontBuild = true;