From 6693dadb51fedf1f932342ccb6d382857cf39b72 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Fri, 31 Jul 2020 10:59:50 +0200 Subject: [PATCH 001/234] pop-gtk: 2020-04-22 -> 2020-06-30 --- pkgs/data/themes/pop-gtk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 244240dde9f70..feb2ddebb3933 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-04-22"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "b3f98dfd61cfff81f69cdc7f57bce7a9efaa36f4"; - sha256 = "0vhcc694x33sgcpbqkrc5bycbd7017k4iii0mjjxgd22jd5lzgkb"; + rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1"; + sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky"; }; nativeBuildInputs = [ From a5667bef4913fadfd34256dbd3b263ac5ff9542f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 08:50:43 +0200 Subject: [PATCH 002/234] python3Packages.ftfy: remove outdated comment about version 4 vs 5 --- pkgs/development/python-modules/ftfy/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 0f0dd3e76c4e0..a781230a9193b 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -10,13 +10,8 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.8"; - # ftfy v5 only supports python3. Since at the moment the only - # packages that use ftfy are spacy and textacy which both support - # python 2 and 3, they have pinned ftfy to the v4 branch. - # I propose to stick to v4 until another package requires v5. - # At that point we can make a ftfy_v4 package. + disabled = !isPy3k; src = fetchPypi { From d337469f6f445374b7dff1d092974a76728b6bac Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 31 Jul 2020 02:05:04 -0400 Subject: [PATCH 003/234] ndi: 4.5.1 -> 4.5.3 --- pkgs/development/libraries/ndi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index ec39bbd659370..c0e1816c0e12a 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.5.1"; + fullVersion = "4.5.3"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r"; + sha256 = "0w9f4a4a3xzg0nvmvrlda1wwkyi0m5aqvk07immmwgg7f1z1sqj5"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: From 08028619f71d52cf623d871f7864dee349a7e707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 22 Jul 2020 10:51:04 +0200 Subject: [PATCH 004/234] resilio-sync: 2.7.1 -> 2.7.2 Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log --- pkgs/applications/networking/resilio-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index cdc2f5e147846..fe75268c0ecb3 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm"; - i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i"; + x86_64-linux = "0gar5lzv1v4yqmypwqsjnfb64vffzn8mw9vnjr733fgf1pmr57hf"; + i686-linux = "1bws7r86h1vysjkhyvp2zk8yvxazmlczvhjlcayldskwq48iyv6w"; }.${stdenv.hostPlatform.system}; }; From 59bf582686186b5ed8f1d2f073188c634aa87118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 17:28:31 +0100 Subject: [PATCH 005/234] temporary delete github actions We are currently seeing a lot of misterious github actions failures. They might be linked to our github actions: https://github.com/nixos/nixpkgs/actions --- .github/workflows/editorconfig.yml | 22 --------------------- .github/workflows/wait-ofborg.yml | 31 ------------------------------ 2 files changed, 53 deletions(-) delete mode 100644 .github/workflows/editorconfig.yml delete mode 100644 .github/workflows/wait-ofborg.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml deleted file mode 100644 index 70959b42aa16e..0000000000000 --- a/.github/workflows/editorconfig.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: actions - -on: - pull_request: - branches: - - master - -jobs: - editorconfig: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v2.0.2 - - name: editorconfig check - env: - VERSION: "2.0.4" - OS: "linux" - ARCH: "amd64" - run: | - curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \ - tar xzf ec-$OS-$ARCH.tar.gz && \ - ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }} diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml deleted file mode 100644 index 35c58b2e91205..0000000000000 --- a/.github/workflows/wait-ofborg.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: "Wait for ofborg" -on: - pull_request: -jobs: - tests: - runs-on: ubuntu-latest - steps: - - name: Wait for ofborg CI - run: | - # wait for ~30min... - # ..in future a better fix would be to make ofborg mark CI as pending right away. - for i in $(seq 360); do - res=$(curl --silent \ - -H "Accept: application/vnd.github.antiope-preview+json" \ - -H "Authorization: token ${GITHUB_TOKEN}" \ - "https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \ - jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])") - if [[ "$res" == "true" ]]; then - exit 0 - fi - sleep 5 - echo "." - done - echo "Timeout!" - exit 1 - # ofborg is not checking forks. - if: github.repository_owner == 'NixOS' - env: - GITHUB_TOKEN: ${{ github.token }} - COMMIT: ${{ github.event.pull_request.head.sha }} - OFBORG_APP_ID: 20500 From d3fd6f6c860a9619360e1bf74354691214bf323f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 31 Jul 2020 17:34:37 +0100 Subject: [PATCH 006/234] Revert "temporary delete github actions" This reverts commit 256dbf698028f7c0fe2f7907cd3c4fcc3401af22. This did not solve the github action failures --- .github/workflows/editorconfig.yml | 22 +++++++++++++++++++++ .github/workflows/wait-ofborg.yml | 31 ++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/editorconfig.yml create mode 100644 .github/workflows/wait-ofborg.yml diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 0000000000000..70959b42aa16e --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,22 @@ +name: actions + +on: + pull_request: + branches: + - master + +jobs: + editorconfig: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: technote-space/get-diff-action@v2.0.2 + - name: editorconfig check + env: + VERSION: "2.0.4" + OS: "linux" + ARCH: "amd64" + run: | + curl -sSf -O -L -C - https://github.com/editorconfig-checker/editorconfig-checker/releases/download/$VERSION/ec-$OS-$ARCH.tar.gz && \ + tar xzf ec-$OS-$ARCH.tar.gz && \ + ./bin/ec-$OS-$ARCH -disable-indentation ${{ env.GIT_DIFF }} diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml new file mode 100644 index 0000000000000..35c58b2e91205 --- /dev/null +++ b/.github/workflows/wait-ofborg.yml @@ -0,0 +1,31 @@ +name: "Wait for ofborg" +on: + pull_request: +jobs: + tests: + runs-on: ubuntu-latest + steps: + - name: Wait for ofborg CI + run: | + # wait for ~30min... + # ..in future a better fix would be to make ofborg mark CI as pending right away. + for i in $(seq 360); do + res=$(curl --silent \ + -H "Accept: application/vnd.github.antiope-preview+json" \ + -H "Authorization: token ${GITHUB_TOKEN}" \ + "https://api.github.com/repos/NixOS/nixpkgs/commits/${COMMIT}/check-runs" | \ + jq ".check_runs | map(.app) | map(.id) | contains([${OFBORG_APP_ID}])") + if [[ "$res" == "true" ]]; then + exit 0 + fi + sleep 5 + echo "." + done + echo "Timeout!" + exit 1 + # ofborg is not checking forks. + if: github.repository_owner == 'NixOS' + env: + GITHUB_TOKEN: ${{ github.token }} + COMMIT: ${{ github.event.pull_request.head.sha }} + OFBORG_APP_ID: 20500 From 0f2c709c5d1bc3601a0ebc0e93dbcb38433ce616 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 09:37:42 +0000 Subject: [PATCH 007/234] simplenote: 1.19.0 -> 1.20.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7cc5bc6eb7fca..52aa215987b91 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.19.0"; + version = "1.20.0"; sha256 = { - x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb"; + x86_64-linux = "0fzv8nbac5bnxvm2p7p4jsjvfrzk3h9j57zjmwvsi2dq6l80d2n7"; }.${system} or throwSystem; meta = with stdenv.lib; { From ca01f47abc710b2fe1ff94162d3c79d68912f71a Mon Sep 17 00:00:00 2001 From: Tina Bu Date: Fri, 31 Jul 2020 09:41:39 -0700 Subject: [PATCH 008/234] pythonPackages.qds_sdk: 1.12.0 -> 1.15.2 --- pkgs/development/python-modules/qds_sdk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index 7b4cfa501ddf8..56b3f36c367c8 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -11,29 +11,29 @@ buildPythonPackage rec { pname = "qds_sdk"; - version = "1.12.0"; + version = "1.15.2"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; rev = "V${version}"; - sha256 = "18xhvlcfki8llv7fw2r5yfk20zds3gr78b4klwm9mkvhlhwds9rx"; + sha256 = "0xxg9s0y6fz7vb1kab4q93q7ryi71z8x6q9qspm6s506yr3mc67l"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ boto inflection requests - six - urllib3 + six + urllib3 ]; checkInputs = [ pytest mock ]; checkPhase = '' py.test --disable-pytest-warnings tests ''; - + meta = with lib; { description = "A Python module that provides the tools you need to authenticate with, and use the Qubole Data Service API"; homepage = "https://github.com/qubole/qds-sdk-py"; From 453b9878181779e232b03b3240240f9ef8af1f9d Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 27 Jul 2020 12:41:38 -0500 Subject: [PATCH 009/234] maintainers: add KarlJoad --- maintainers/maintainer-list.nix | 6 ++++++ .../networking/browsers/tor-browser-bundle-bin/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 240ed312e522e..e36ef49760f22 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4151,6 +4151,12 @@ github = "karantan"; githubId = 7062631; }; + KarlJoad = { + email = "karl@hallsby.com"; + github = "KarlJoad"; + githubId = 34152449; + name = "Karl Hallsby"; + }; karolchmist = { email = "info+nix@chmist.com"; name = "karolchmist"; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 4b8a1238c0101..87886462a65dd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -404,7 +404,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ]; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap KarlJoad ]; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain From 810658b7b2d079d428c742d5037b79ddb6fdf016 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 27 Jul 2020 12:41:49 -0500 Subject: [PATCH 010/234] tor-browser-bundle-bin: 9.5 -> 9.5.3 Squashed commits: 1. tor-browser-bundle-bin: 9.5 -> 9.5.1 2. tor-browser-bundle-bin: 9.5.1 -> 9.5.3 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 87886462a65dd..21a34539b86ee 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5"; + version = "9.5.3"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0l4fz2zkgwv2qniia4nv53a4pd79hfbgb66jn68r44diails1z08"; + sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1h4awhyaiws68s727pq9r32xqg2878dl2df4kbc2nmllwrl2fxq3"; + sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; }; }; in From 788a44fffe37da24087ac0da2e8247065503ccc9 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Fri, 24 Jul 2020 21:56:25 +0300 Subject: [PATCH 011/234] python3Packages.pyphotonfile: init at 0.2.1 --- .../python-modules/pyphotonfile/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pyphotonfile/default.nix diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix new file mode 100644 index 0000000000000..dd8d643f6bb3f --- /dev/null +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, numpy +}: +let + version = "0.2.1"; +in +buildPythonPackage { + pname = "pyphotonfile"; + inherit version; + propagatedBuildInputs = [ pillow numpy ]; + + src = fetchFromGitHub { + owner = "fookatchu"; + repo = "pyphotonfile"; + rev = "v${version}"; + sha256 = "1hh1fcn7q3kyk2413pjs18xnxvzrchrisbpj2cd59jrdp0qzgv2s"; + }; + + meta = with lib; { + maintainers = [ maintainers.cab404 ]; + license = licenses.gpl3Plus; + description = "Library for reading and writing files for the Anycubic Photon 3D-Printer"; + homepage = "https://github.com/fookatchu/pyphotonfile"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc2fe7db55826..28a98171f5a36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1106,6 +1106,8 @@ in { pyperf = callPackage ../development/python-modules/pyperf { }; + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + pefile = callPackage ../development/python-modules/pefile { }; perfplot = callPackage ../development/python-modules/perfplot { }; From 2b7e625aed8454253c55b233706333128ec5f8a7 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Sat, 25 Jul 2020 03:00:26 +0300 Subject: [PATCH 012/234] sl1-to-photon: init at 0.1.3 --- .../misc/sl1-to-photon/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/sl1-to-photon/default.nix diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix new file mode 100644 index 0000000000000..a8a0bfb1e10aa --- /dev/null +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pillow +, pyside2 +, numpy +, pyphotonfile +, shiboken2 +, which +}: +let + version = "0.1.3"; +in + buildPythonApplication rec { + pname = "sl1-to-photon"; + inherit version; + + src = fetchFromGitHub { + owner = "fookatchu"; + repo = "SL1toPhoton"; + rev = "v${version}"; + sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw"; + }; + + propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; + + format = "other"; + + installPhase = '' + install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} + sed -i '1i#!/usr/bin/env python' $out/bin/${pname} + ''; + + meta = with lib; { + maintainers = [ maintainers.cab404 ]; + license = licenses.gpl3Plus; + description = "Tool for converting Slic3r PE's SL1 files to Photon files for the Anycubic Photon 3D-Printer"; + homepage = "https://github.com/fookatchu/SL1toPhoton"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c9a2bbe35497..f2f7078893e35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3068,6 +3068,8 @@ in doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; + slade = callPackage ../applications/misc/slade { wxGTK = wxGTK30; }; From cbbb5bc2f890d4331c1f8094ddb29bbdd23251ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jul 2020 07:23:20 +0000 Subject: [PATCH 013/234] python37Packages.opt-einsum: 3.2.1 -> 3.3.0 --- pkgs/development/python-modules/opt-einsum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 6bf0e451f040a..2ded1dfc19610 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }: buildPythonPackage rec { - version = "3.2.1"; + version = "3.3.0"; pname = "opt_einsum"; src = fetchPypi { inherit version pname; - sha256 = "165r7rsl5j94kna4q3vsaq71z23lgxd9b20dgb6abrlas6c6mdw3"; + sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr"; }; propagatedBuildInputs = [ numpy ]; From 45ebfde78c3d43734949eee76eb98b64837f2412 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Sat, 21 Mar 2020 17:22:19 +0100 Subject: [PATCH 014/234] plexamp: init at 3.0.3 Desktop file does not work. --- pkgs/applications/audio/plexamp/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/plexamp/default.nix diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix new file mode 100644 index 0000000000000..98cc1065bdbd8 --- /dev/null +++ b/pkgs/applications/audio/plexamp/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchurl, appimageTools, pkgs }: + +let + pname = "plexamp"; + version = "3.0.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; + sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop + install -m 444 -D ${appimageContents}/plexamp.png \ + $out/plexamp.png + substituteInPlace $out/share/applications/plexamp.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + homepage = "https://plexamp.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ killercup ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f7078893e35..d2ec2f5573723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22007,6 +22007,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plexamp = callPackage ../applications/audio/plexamp { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; From d53559458f336a1986a35fba04889f1ef4a08437 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Tue, 21 Jul 2020 13:52:14 +0200 Subject: [PATCH 015/234] plexamp: 3.0.3 -> 3.1.1 Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 98cc1065bdbd8..baa1f741ca846 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.0.3"; + version = "3.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; name="${pname}-${version}.AppImage"; }; From c1935f8046d3dfa625ccf2dc69b2094587f86710 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Thu, 23 Jul 2020 09:13:40 +0200 Subject: [PATCH 016/234] plexamp: fix icon Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index baa1f741ca846..caa703f59ce48 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 { ln -s $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ - $out/plexamp.png + $out/share/icons/hicolor/512x512/apps/plexamp.png substituteInPlace $out/share/applications/plexamp.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; From 7b56fd7549a2c26b14a4123b3dc632cf827d1624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 29 Jul 2020 08:07:35 +0200 Subject: [PATCH 017/234] python3Packages.pytorch: 1.5.1 -> 1.6.0 Changelog: https://github.com/pytorch/pytorch/releases/tag/v1.6.0 --- pkgs/development/python-modules/pytorch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index efe6400fcbdaa..4eabaf26f7723 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.5.1"; + version = "1.6.0"; pname = "pytorch"; disabled = !isPy3k; @@ -119,7 +119,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1xjbn4hi96m7xslv3p2jc6qcsng0fx3w1m6isqfah81piljf8wng"; + sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz"; }; patches = lib.optionals stdenv.isAarch64 [ @@ -129,7 +129,7 @@ in buildPythonPackage rec { # Fix from: # https://github.com/pytorch/pytorch/pull/40584 # - # This patch can be removed with the next major version (1.6.0). + # This patch can be removed with the next major version (1.7.0). (fetchpatch { name = "qnnpack-neon-fix.patch"; url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff"; From 43ecf2f2a6edda3c8156378a2db2591b55315272 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 12:46:30 +0000 Subject: [PATCH 018/234] ugrep: 2.4.1 -> 2.5.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 9702cc9283599..95399006dbba4 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "16nr7zq4l2si9pfckfinbqnv94hw51z2qcbygc9x81jbjlvg3003"; + sha256 = "0aps4srdss71p6riixcdk50f2484bmq6p2kg95gcb8wbcv3ad3c9"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; From ac490f4628864eb4aa68ddb99fb719e12baa10a9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 1 Aug 2020 00:08:09 +0800 Subject: [PATCH 019/234] cargo-expand: 0.6.4 -> 1.0.0 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 8dd09a2deef41..93121a11eea23 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.6.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0a00sw6r8z6pyqqa6f5c7czxjnjdx3kz1bacy790nsngvz17l30h"; + sha256 = "0bdv6h3mzmv46pdyvwl0v0bg719dlsxlx378ws6vgi1cga24g37i"; }; - cargoSha256 = "0x92yh9pl30h4k53269dgnryb6z8nfl2mfx3wpcp3ph5na2knwpj"; + cargoSha256 = "0qpihfgfqxw5fyhn124c5lbfaxr717bqf8mrbagh3vdgvk75j0qz"; meta = with lib; { description = From 1006ad92101c43c0e99c16eaffc972589de320e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 24 Jul 2020 12:45:37 +0200 Subject: [PATCH 020/234] liblinear: 2.30 -> 2.40 Also improve the derivation a bit: - Use fetchFromGitHub in place of fetchurl. - Replace buildPhase by buildFlags. - Create multiple outputs. - Replace mkdir/cp by install. --- .../libraries/liblinear/default.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index af09b1241de60..09f3aacca63eb 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: -stdenv.mkDerivation rec { +let + soVersion = "4"; +in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.30"; + version = "2.40"; - src = fetchurl { - url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "1b66jpg9fdwsq7r52fccr8z7nqcivrin5d8zg2f134ygqqwp0748"; + src = fetchFromGitHub { + owner = "cjlin1"; + repo = "liblinear"; + rev = "v${builtins.replaceStrings ["."] [""] version}"; + sha256 = "041fby9vc7nvj0gls5zd9mhw7yqazm530bmln38mfz7wd06z1d6b"; }; - buildPhase = '' - make - make lib - ''; + outputs = [ "bin" "dev" "out" ]; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + + buildFlags = [ "lib" "predict" "train" ]; installPhase = '' - mkdir -p $out/lib $out/bin $out/include ${if stdenv.isDarwin then '' - cp liblinear.so.3 $out/lib/liblinear.3.dylib - ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib + install -D liblinear.so.${soVersion} $out/lib/liblinear.${soVersion}.dylib + ln -s $out/lib/liblinear.${soVersion}.dylib $out/lib/liblinear.dylib '' else '' - cp liblinear.so.3 $out/lib/liblinear.so.3 - ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so + install -Dt $out/lib liblinear.so.${soVersion} + ln -s $out/lib/liblinear.so.${soVersion} $out/lib/liblinear.so ''} - cp train $out/bin/liblinear-train - cp predict $out/bin/liblinear-predict - cp linear.h $out/include + install -D train $bin/bin/liblinear-train + install -D predict $bin/bin/liblinear-predict + install -Dm444 -t $dev/include linear.h ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; - meta = with stdenv.lib; { description = "A library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; From d68daa412f49ca71b805a99e979a207d2a63b5e4 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 18 Jul 2020 12:00:00 +0000 Subject: [PATCH 021/234] linux: enable io cost and io latency block group controller They are enabled by default on Arch. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3c1b33bada12c..e80e29aad3d9e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -91,6 +91,8 @@ let scheduler = { IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1 BLK_CGROUP = yes; # required by CFQ" + BLK_CGROUP_IOLATENCY = whenAtLeast "4.19" yes; + BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes; IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1 MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes; BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes; From 6c13c3643250473ab6d97a519d3eea86f10019d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 16:07:37 +0000 Subject: [PATCH 022/234] blender: 2.83.1 -> 2.83.3 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 232ab1b2df02d..45df354754592 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.1"; + version = "2.83.3"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; + sha256 = "18m27abp4j3xv48dr6ddr2mqcvx2vkjffr487z90059yv9k0yh2p"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From b2d3715ac10ebd933e7a4391975d0b0e12dbabff Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 31 Jul 2020 20:41:04 +0200 Subject: [PATCH 023/234] tig: Don't install the broken ZSH completion There are some Nixpkgs specific issues that we could fix but due to changes in Git it currently isn't possible to source git-completion.bash from ZSH (at least not how tig-completion.bash expects it). Upstream issue: https://github.com/jonas/tig/issues/940 For the meantime it seems best to simply not install it anymore so that the fallback implementation from ZSH can be used (more inaccurate as the git-log completion is reused but it is helpful to complete remotes, branches, tags, etc. and doesn't emit an error to the console). --- .../version-management/git-and-tools/tig/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index cb03a9b42a255..9415c0eecf165 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -34,13 +34,14 @@ stdenv.mkDerivation rec { # fixes tig-completion __git-complete dependency sed -i '1s;^;source ${git}/share/bash-completion/completions/git\n;' contrib/tig-completion.bash - substituteInPlace contrib/tig-completion.zsh \ - --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/share/bash-completion/completions/tig" - install -D contrib/tig-completion.bash $out/share/bash-completion/completions/tig - install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig cp contrib/vim.tigrc $out/etc/ + # Note: Until https://github.com/jonas/tig/issues/940 is resolved it is best + # not to install the ZSH completion so that the fallback implemenation from + # ZSH can be used (Completion/Unix/Command/_git: "_tig () { _git-log }"): + #install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig + wrapProgram $out/bin/tig \ --prefix PATH ':' "${git}/bin" ''; From 6f5230b3a02454be3e3fbbb0980f69996bcb4034 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 17:28:10 +0200 Subject: [PATCH 024/234] LTS Haskell 16.7 --- .../configuration-hackage2nix.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b0cce0cc6909b..daf0041f1c3d5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.6 + # LTS Haskell 16.7 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -262,7 +262,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.3 - - aura ==3.1.5 + - aura ==3.1.6 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -430,7 +430,7 @@ default-package-overrides: - chimera ==0.3.1.0 - chiphunk ==0.1.2.1 - choice ==0.2.2 - - chronologique ==0.3.1.1 + - chronologique ==0.3.1.3 - chronos ==1.1.1 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 @@ -912,7 +912,7 @@ default-package-overrides: - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4 - ghc-typelits-extra ==0.4 - - ghc-typelits-knownnat ==0.7.2 + - ghc-typelits-knownnat ==0.7.3 - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.1 - ghost-buster ==0.1.1.0 @@ -1135,7 +1135,7 @@ default-package-overrides: - http-client-openssl ==0.3.1.0 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.0 + - http-common ==0.8.2.1 - http-conduit ==2.3.7.3 - http-date ==0.0.8 - http-directory ==0.1.8 @@ -1338,7 +1338,7 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lifted-async ==0.10.1.1 + - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - line ==4.0.1 @@ -1397,6 +1397,7 @@ default-package-overrides: - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 + - matrix-as-xyz ==0.1.1.3 - matrix-market-attoparsec ==0.1.1.3 - matrix-static ==0.3 - maximal-cliques ==0.1.1 @@ -1754,7 +1755,7 @@ default-package-overrides: - profunctors ==5.5.2 - projectroot ==0.2.0.1 - project-template ==0.2.1.0 - - prometheus-client ==1.0.0.1 + - prometheus-client ==1.0.1 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 @@ -2096,7 +2097,7 @@ default-package-overrides: - stratosphere ==0.53.0 - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - - streaming-commons ==0.2.2.0 + - streaming-commons ==0.2.2.1 - streamly ==0.7.2 - streamly-bytestring ==0.1.2 - streams ==3.3 From b225c37fc793cfd46a8d5236452072aabbb9ad9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jul 2020 02:30:36 +0200 Subject: [PATCH 025/234] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-12-g1b02e1b from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/edb0920a8dbbd592d67a781d0b905728515ab623. --- .../haskell-modules/hackage-packages.nix | 2319 ++++++++++++----- 1 file changed, 1661 insertions(+), 658 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c320df264ae8f..48b675d8dca35 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2250,6 +2250,24 @@ self: { broken = true; }) {}; + "C-structs" = callPackage + ({ mkDerivation, base, doctest, Glob, HUnit, QuickCheck + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "C-structs"; + version = "0.1.0.1"; + sha256 = "0b3mqp20am2yn7jbgxxg08rds1c5mxx827app23hrhsl4ysslfkg"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base doctest Glob HUnit QuickCheck template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "C-Structs implementation for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "CBOR" = callPackage ({ mkDerivation, base, binary, binary-bits, bytestring , data-binary-ieee754, doctest, QuickCheck, test-framework @@ -13134,6 +13152,8 @@ self: { pname = "MapWith"; version = "0.1.0.0"; sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v"; + revision = "1"; + editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -16931,8 +16951,8 @@ self: { }: mkDerivation { pname = "Rattus"; - version = "0.1.1.0"; - sha256 = "1f7dv71bamszjfsdva88iwiy85pb1gpn6i016dndzzydlxsrrvsz"; + version = "0.2"; + sha256 = "0mz6hwg4barn8iszi01lwrkx4i322r5a738kw7sd9mrmdlzd0fh9"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base containers ghc simple-affine-space @@ -20230,7 +20250,8 @@ self: { ]; description = "It provides the functionality like unix \"uniq\" utility"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Unixutils" = callPackage @@ -20930,12 +20951,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_8_5_0" = callPackage + "Win32_2_9_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.8.5.0"; - sha256 = "1hvbb9zwp84y5s5hxz7a3g3xqlgcbwrlhhxdprj5qqhkizzb3vai"; + version = "2.9.0.0"; + sha256 = "1m9v1qimqi19siy1a7mzb52f3jdj5zs81085nybnyj7yk9988s1p"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -24088,15 +24109,18 @@ self: { }) {}; "aeson-deriving" = callPackage - ({ mkDerivation, aeson, base, hedgehog, text, unordered-containers + ({ mkDerivation, aeson, base, hedgehog, regex-tdfa, text + , unordered-containers }: mkDerivation { pname = "aeson-deriving"; - version = "0.1.0.0"; - sha256 = "18zdncbvhlpa5v6yvsj30fyrh44hchaps8jjh93z6ji08cb6wdni"; - libraryHaskellDepends = [ aeson base text unordered-containers ]; + version = "0.1.1.1"; + sha256 = "1yqiw8imp30gv3jij4f724yi8mmf6w8fn84kmq9r7yjn7scfz4dj"; + libraryHaskellDepends = [ + aeson base regex-tdfa text unordered-containers + ]; testHaskellDepends = [ - aeson base hedgehog text unordered-containers + aeson base hedgehog regex-tdfa text unordered-containers ]; description = "data types for compositional, type-directed serialization"; license = stdenv.lib.licenses.mit; @@ -25741,6 +25765,21 @@ self: { broken = true; }) {}; + "algebra-driven-design" = callPackage + ({ mkDerivation, base, containers, file-embed, JuicyPixels, mtl + , QuickCheck, quickspec + }: + mkDerivation { + pname = "algebra-driven-design"; + version = "0.1.0.1"; + sha256 = "0jydvrmrz6kvrbk8hv0mb01g67j0bdxi519s7blwf3gfkxfjvyyv"; + libraryHaskellDepends = [ + base containers file-embed JuicyPixels mtl QuickCheck quickspec + ]; + description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "algebra-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, ansi-wl-pprint, base , bytestring, containers, Decimal, dlist, errors, fgl, filepath @@ -31202,8 +31241,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.8.1.0"; - sha256 = "1mnp33c8dghgmn62czyrbmw86czhznbhb75ac1ps1is1p1ik6mih"; + version = "0.8.2.0"; + sha256 = "0bhf20b5h095d5a6955hk43k7z4ypkiivq755a21y7nc83l8q5x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34072,27 +34111,27 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal - , cli-setup, composition-prelude, containers, cpphs, dependency - , dhall, directory, file-embed, filepath, http-client - , http-client-tls, language-ats, libarchive, lzma, microlens, mtl - , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, temporary, text, unix, unix-compat + ({ mkDerivation, ansi-wl-pprint, archive-libarchive, archive-sig + , base, binary, bytestring, Cabal, cli-setup, composition-prelude + , containers, cpphs, dependency, dhall, directory, file-embed + , filepath, http-client, http-client-tls, language-ats, lzma + , microlens, mtl, optparse-applicative, parallel-io, process, shake + , shake-ats, shake-c, shake-ext, temporary, text, unix, unix-compat , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.0"; - sha256 = "0ky17b8s4rg42gr2wwarvlgf0r0zgllrxqcdramsiyh8w9zgmc71"; + version = "3.5.0.1"; + sha256 = "09vv8cmag4189sv0nv213vhxp4pak5swk3gi4pnl777lmm0qgxxh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring Cabal composition-prelude - containers dependency dhall directory file-embed filepath - http-client http-client-tls libarchive lzma microlens mtl - parallel-io process shake shake-ats shake-c shake-ext text unix - unix-compat zip-archive zlib + ansi-wl-pprint archive-libarchive archive-sig base binary + bytestring Cabal composition-prelude containers dependency dhall + directory file-embed filepath http-client http-client-tls lzma + microlens mtl parallel-io process shake shake-ats shake-c shake-ext + text unix unix-compat zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -34685,42 +34724,6 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring - , containers, filepath, hashable, http-client, http-client-tls - , http-types, language-bash, megaparsec, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions - }: - mkDerivation { - pname = "aura"; - version = "3.1.5"; - sha256 = "17xihg6gifg47vmskp5wk3x485y3qc3ky769hh7nnrw138nhvkgn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson algebraic-graphs aur base bytestring containers filepath - hashable http-client http-types language-bash megaparsec - network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions - ]; - executableHaskellDepends = [ - aeson aur base bytestring containers http-client http-client-tls - megaparsec optparse-applicative prettyprinter - prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions - ]; - testHaskellDepends = [ - base bytestring containers megaparsec rio tasty tasty-hunit text - versions - ]; - description = "A secure package manager for Arch Linux and the AUR"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aura_3_1_6" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -36405,8 +36408,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "2.0.0"; - sha256 = "1ymapbsx3gzkxmaikxnsszdgcnyks535msf0ydbq99v54jvbb2yz"; + version = "2.1.0"; + sha256 = "0zrblqyq7zm2zya20zaxvcgb489y2kywns72kxyp6ymi2sax586g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36421,14 +36424,14 @@ self: { executableHaskellDepends = [ aeson base binary bytestring containers directory extensible-effects filepath hspec hspec-expectations lens - neat-interpolation optparse-applicative QuickCheck shake text - unordered-containers vector yaml + neat-interpolation optparse-applicative process QuickCheck shake + text unordered-containers vector yaml ]; testHaskellDepends = [ aeson base binary bytestring containers directory extensible-effects filepath hspec hspec-expectations lens - neat-interpolation optparse-applicative QuickCheck shake text - unordered-containers vector yaml + neat-interpolation optparse-applicative process QuickCheck shake + text unordered-containers vector yaml ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; @@ -37333,6 +37336,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base16-lens_0_1_3_0" = callPackage + ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest + , doctest, lens, text, text-short + }: + mkDerivation { + pname = "base16-lens"; + version = "0.1.3.0"; + sha256 = "1612v5lj99szshz7vm3mr5p4xxcrga1xxcfm9q9zzpnyd5z5vkn2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base16 bytestring lens text text-short + ]; + testHaskellDepends = [ base doctest lens ]; + description = "Optics for the Base16 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base32" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, memory , random-bytestring, tasty, tasty-hunit, text @@ -39736,14 +39757,17 @@ self: { }) {}; "binary-io" = callPackage - ({ mkDerivation, async, base, binary, bytestring, deque, hspec - , process, stm + ({ mkDerivation, async, base, binary, bytestring, concurrency + , deque, exceptions, hspec, process, stm, transformers }: mkDerivation { pname = "binary-io"; - version = "0.3.0"; - sha256 = "1jc362y8ql983fhgcwb8sxgqjnhqd3xis2igcl9dv0zvqmi5jpv6"; - libraryHaskellDepends = [ base binary bytestring deque process ]; + version = "0.4.0"; + sha256 = "0yqxrzkria4bycc23ywc6cz12n15cr3lmmcphamwr0ngdgn1lf9i"; + libraryHaskellDepends = [ + base binary bytestring concurrency deque exceptions process + transformers + ]; testHaskellDepends = [ async base binary bytestring hspec process stm ]; @@ -42064,6 +42088,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bitset-word8_0_1_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hspec, hspec-discover, QuickCheck, template-haskell + , th-lift-instances, vector + }: + mkDerivation { + pname = "bitset-word8"; + version = "0.1.1.2"; + sha256 = "06axklmjzwq2s9s3p5m5z0isl4smxhs8hij7zm9c7pd5hj7xhipj"; + libraryHaskellDepends = [ + base containers template-haskell th-lift-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck template-haskell th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq template-haskell + th-lift-instances vector + ]; + description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib , bindings-gobject, gtk2, pango @@ -44951,19 +45000,19 @@ self: { "brok" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude - , connection, directory, file-embed, http-client, http-client-tls - , http-conduit, tasty, tasty-discover, tasty-expected-failure - , tasty-hunit, template-haskell, text, time + , connection, containers, directory, file-embed, http-client + , http-client-tls, http-conduit, tasty, tasty-discover + , tasty-expected-failure, tasty-hunit, template-haskell, text, time }: mkDerivation { pname = "brok"; - version = "1.0.0"; - sha256 = "07zi88xsacacqw6mg87ipic5y72vjpn9mx789bk9gk4jvd69z7x1"; + version = "1.1.0"; + sha256 = "0y8gppdyhwwlpw3d0kii2varqd25lxq3813xnjm632h4942l76xv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal attoparsec base classy-prelude connection directory - file-embed http-client http-client-tls http-conduit + ansi-terminal attoparsec base classy-prelude connection containers + directory file-embed http-client http-client-tls http-conduit template-haskell text time ]; executableHaskellDepends = [ base classy-prelude file-embed ]; @@ -45946,15 +45995,15 @@ self: { }) {}; "bustle" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus - , directory, filepath, gio, glib, gtk3, HUnit, mtl, pango, pcap - , process, QuickCheck, system-glib, test-framework - , test-framework-hunit, text, time + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , directory, filepath, gio, gio-unix, glib, gtk3, HUnit, libpcap + , mtl, pango, process, QuickCheck, system-glib, test-framework + , test-framework-hunit, text, time, transformers }: mkDerivation { pname = "bustle"; - version = "0.7.5"; - sha256 = "0r0ng67b2q9ww0adv1fdrpmgmdyjqv6ksd9g6kkn9cjwnaascq3p"; + version = "0.8.0"; + sha256 = "0g2p4s3z0xqng8bhcqml6dvvshmn8xlyhqz77jdcvcvxm7cykcrg"; configureFlags = [ "-f-hgettext" ]; isLibrary = false; isExecutable = true; @@ -45962,16 +46011,23 @@ self: { setupHaskellDepends = [ base Cabal directory filepath process ]; libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gio glib - gtk3 mtl pango pcap process text time + base bytestring cairo containers directory filepath gio glib gtk3 + mtl pango process text time transformers ]; + executableSystemDepends = [ libpcap ]; testHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gtk3 HUnit - mtl pango pcap QuickCheck test-framework test-framework-hunit text + base bytestring cairo containers directory filepath glib gtk3 HUnit + mtl pango QuickCheck test-framework test-framework-hunit text + transformers ]; + testSystemDepends = [ libpcap ]; + testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; license = stdenv.lib.licenses.lgpl21Plus; - }) {system-glib = pkgs.glib;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {gio-unix = null; inherit (pkgs) libpcap; + system-glib = pkgs.glib;}; "butcher" = callPackage ({ mkDerivation, base, bifunctors, containers, deque, extra, free @@ -46112,21 +46168,27 @@ self: { }) {}; "byline" = callPackage - ({ mkDerivation, ansi-terminal, base, colour, containers - , exceptions, haskeline, mtl, terminfo-hs, text, transformers + ({ mkDerivation, ansi-terminal, base, colour, exceptions, free + , haskeline, mtl, relude, tasty, tasty-hunit, terminfo-hs, text }: mkDerivation { pname = "byline"; - version = "0.4.0.0"; - sha256 = "1q8xb5b194ywm1sacxx47yhicww3m9hpffidgpj6l79fjqivgv09"; + version = "1.0.0.0"; + sha256 = "1jwjdjiraq37pr2ysc9h5qqlma6j7rd2dkip2y2f6bx07d1v7fpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base colour containers exceptions haskeline mtl - terminfo-hs text transformers + ansi-terminal base colour exceptions free haskeline mtl relude + terminfo-hs text + ]; + testHaskellDepends = [ + ansi-terminal base colour exceptions free haskeline mtl relude + tasty tasty-hunit terminfo-hs text ]; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytable" = callPackage @@ -46222,8 +46284,6 @@ self: { ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "bytedump" = callPackage @@ -46359,8 +46419,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.6.0"; - sha256 = "0idkkmmw5n8dv7hx236s1543n0k6gsj9s0yk6fggbaqydlsxn641"; + version = "0.3.7.0"; + sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -48986,8 +49046,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.18.0"; - sha256 = "146p8w9ydamzfzp55w6zh9rawsgnsayc755wjqfa7vhjfa6dqmfq"; + version = "0.1.19.2"; + sha256 = "14vw42zsyzcdi5nmgfl2mi4zxqbkvmd525ybsx324qj3cp3k8mn6"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -50529,6 +50589,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-generic" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, data-default + , text, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-generic"; + version = "0.1.0.1"; + sha256 = "0xm2ba4wmx5dbd83zpdyld65ga87fb9ja7hd33y5kba1zbw486g8"; + libraryHaskellDepends = [ + aeson base bytestring cassava data-default text + unordered-containers vector + ]; + description = "Cassave instances for functor-like datatypes like `Either String a`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cassava-megaparsec" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec , megaparsec, unordered-containers, vector @@ -52909,22 +52985,6 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, aeson, base, bytestring, hourglass, hspec - , QuickCheck, text, time, vector - }: - mkDerivation { - pname = "chronologique"; - version = "0.3.1.1"; - sha256 = "05ly96mdm4nxmn7yz04wq9kgzlq8biaaaxs1mvsc3f8wgcpbqf65"; - libraryHaskellDepends = [ aeson base hourglass text time vector ]; - testHaskellDepends = [ - aeson base bytestring hourglass hspec QuickCheck vector - ]; - description = "Time to manipulate time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "chronologique_0_3_1_3" = callPackage ({ mkDerivation, aeson, base, bytestring, hourglass, hspec , QuickCheck, text, time, vector }: @@ -52938,7 +52998,6 @@ self: { ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chronos" = callPackage @@ -53940,6 +53999,35 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-ghc_1_2_4" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable + , haskeline, integer-gmp, lens, mtl, primitive, process, reflection + , split, template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.2.4"; + sha256 = "1xzpz0bkdfvhkk496q4zr7f6ix23dgg6w5r14j5gxy4jb8f8bxln"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory filepath ghc + ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens + mtl primitive process reflection split template-haskell text time + transformers uniplate unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "CAES Language for Synchronous Hardware"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers @@ -53976,6 +54064,44 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-lib_1_2_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary + , bytestring, clash-prelude, concurrent-supply, containers + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, prettyprinter, primitive, process + , reducers, tasty, tasty-hunit, template-haskell, temporary + , terminal-size, text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.2.4"; + sha256 = "147cahsid3l6ff8d96ndzli1v79i9lbmad0bkmy0s5vcbgp90q7c"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base binary bytestring clash-prelude + concurrent-supply containers data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers prettyprinter primitive process + reducers template-haskell temporary terminal-size text text-show + time transformers trifecta unordered-containers utf8-string vector + vector-binary-instances + ]; + testHaskellDepends = [ + base clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty + tasty-hunit template-haskell text transformers unordered-containers + ]; + description = "CAES Language for Synchronous Hardware - As a Library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -54029,6 +54155,44 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "clash-prelude_1_2_4" = callPackage + ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal + , cabal-doctest, constraints, containers, criterion + , data-binary-ieee754, data-default-class, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp + , interpolate, lens, QuickCheck, quickcheck-classes-base + , recursion-schemes, reflection, singletons, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-show + , th-abstraction, th-lift, th-orphans, time, transformers + , type-errors, uniplate, vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.2.4"; + sha256 = "1yizprs6i4y2vyhjj6pvpd5xmdbxyqjwclk6saaws0g3xv008ffg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base bifunctors binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base doctest ghc-typelits-knownnat hint quickcheck-classes-base + tasty tasty-hunit tasty-quickcheck template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "CAES Language for Synchronous Hardware - Prelude library"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -58158,8 +58322,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.2.0"; - sha256 = "18rdrp8j2vjg6yp2zxiw10wsq8r5gjz0jywzxc13nd4g3l5a2wcm"; + version = "0.7.3.0"; + sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -58184,8 +58348,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.2.0"; - sha256 = "1xdl5phr1yj5m2rdb9jv71l71apbx6j94qvcs0932dz7xjgb8llr"; + version = "0.7.3.0"; + sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -58202,8 +58366,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.7.2.0"; - sha256 = "091s9gi1q7h6rq4xyfgs08p3z0afqslwwnmpa6qvqjy1im991n35"; + version = "0.7.3.0"; + sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl @@ -58224,8 +58388,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.7.2.0"; - sha256 = "0620ix1zyixrlxgcc6yh7zj4ypz69xddf41bf7spyxf9zxdllwli"; + version = "0.7.3.0"; + sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -58242,8 +58406,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.2.0"; - sha256 = "11rc4bzqhfhrhs3ap08pzywx7qsmprs4cin7az036kp09b790frv"; + version = "0.7.3.0"; + sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -58266,8 +58430,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.2.0"; - sha256 = "0l2h6m527xakr20gj6vqnaagcw66bqchvs8yn4qbsli67kmm5br7"; + version = "0.7.3.0"; + sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -61104,6 +61268,21 @@ self: { broken = true; }) {}; + "context" = callPackage + ({ mkDerivation, async, base, containers, ghc-prim, hspec + , hspec-discover + }: + mkDerivation { + pname = "context"; + version = "0.1.0.0"; + sha256 = "17w0narhg25ls1rs2xp8x0yxh5jhw52b0c3zgi9ivn99j7c8qrhd"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ async base ghc-prim hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Thread-indexed, nested contexts"; + license = stdenv.lib.licenses.mit; + }) {}; + "context-free-art" = callPackage ({ mkDerivation, base, bifunctors, blaze-markup, blaze-svg , directory, HUnit, random, text, text-show @@ -61152,6 +61331,37 @@ self: { broken = true; }) {}; + "context-http-client" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, context + , hspec, hspec-discover, http-client, http-types, stm, wai, warp + }: + mkDerivation { + pname = "context-http-client"; + version = "0.1.0.0"; + sha256 = "0ad917jnzqd2idzh6a5j9nvjf2pg7l968vmn38cxgh9hfq3yhwm7"; + libraryHaskellDepends = [ base context http-client ]; + testHaskellDepends = [ + async base bytestring case-insensitive context hspec http-client + http-types stm wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Modify HTTP requests/responses using context"; + license = stdenv.lib.licenses.mit; + }) {}; + + "context-resource" = callPackage + ({ mkDerivation, async, base, context, hspec, hspec-discover }: + mkDerivation { + pname = "context-resource"; + version = "0.1.0.0"; + sha256 = "0695m9hnx8grfmyy7mzd6n3426qc18sh14hy6glhr5nwj9c4k4c2"; + libraryHaskellDepends = [ base context ]; + testHaskellDepends = [ async base context hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Thread-safe, pool-compatible resource provider"; + license = stdenv.lib.licenses.mit; + }) {}; + "context-stack" = callPackage ({ mkDerivation, base, classy-prelude, mtl, unordered-containers }: mkDerivation { @@ -61167,6 +61377,24 @@ self: { broken = true; }) {}; + "context-wai-middleware" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, context + , hspec, hspec-discover, http-client, http-types, stm, wai, warp + }: + mkDerivation { + pname = "context-wai-middleware"; + version = "0.1.0.0"; + sha256 = "0bisqsngccddkamf60qyk4h9w4w80ppks51i4p9bl39kmf7hd65l"; + libraryHaskellDepends = [ base context wai ]; + testHaskellDepends = [ + async base bytestring case-insensitive context hspec http-client + http-types stm wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Add request-specific (or not!) context to your WAI applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "contiguous" = callPackage ({ mkDerivation, base, deepseq, primitive, primitive-unlifted , QuickCheck, quickcheck-classes, quickcheck-instances, random @@ -62059,6 +62287,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-data_0_2_1_7" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.7"; + sha256 = "19fcbp6ccwggpv1lm1z03m3innk9agiwbz03whiivr3zg2gzcglh"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + prettyprinter-ansi-terminal scientific text unordered-containers + vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -62097,6 +62344,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-program_0_2_4_4" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, prettyprinter-ansi-terminal + , safe-exceptions, stm, template-haskell, terminal-size, text + , text-short, transformers, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.4.4"; + sha256 = "1mkhwfw4h5q2dly1gm082k3s9jsq2wb0xksfa6xv8ghvxpvypvck"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + prettyprinter-ansi-terminal safe-exceptions stm template-haskell + terminal-size text text-short transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell @@ -62114,6 +62383,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-text_0_2_3_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable + , prettyprinter, prettyprinter-ansi-terminal, template-haskell + , text, text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.2.3.5"; + sha256 = "085w21vh5rgl1pc7731ih47gh8gszjj0xfgkr3acy0r9rbh33m9c"; + libraryHaskellDepends = [ + base bytestring deepseq fingertree hashable prettyprinter + prettyprinter-ansi-terminal template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -64441,25 +64728,27 @@ self: { }) {}; "cryptol" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, base, base-compat - , blaze-html, bytestring, containers, criterion, cryptohash-sha1 - , deepseq, directory, filepath, gitrev, GraphSCC, happy, haskeline - , heredoc, monad-control, monadLib, mtl, panic, pretty, process - , random, sbv, simple-smt, strict, text, tf-random, time - , transformers, transformers-base + ({ mkDerivation, alex, ansi-terminal, array, async, base + , base-compat, blaze-html, bv-sized, bytestring, containers + , criterion, cryptohash-sha1, deepseq, directory, exceptions + , filepath, gitrev, GraphSCC, happy, haskeline, heredoc, libBF + , monad-control, monadLib, mtl, panic, parameterized-utils, pretty + , process, random, sbv, simple-smt, strict, text, tf-random, time + , transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.8.0"; - sha256 = "1fqhk7glh1y0a1f0iwdzrljh9k7v06pn0ybhlcs51ph9vs4byqdh"; + version = "2.9.0"; + sha256 = "0bxx4pslmyjaqhskbi95a67fmpjhnbmgcys68xzs2y8ndjnz9jrb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base base-compat bytestring containers cryptohash-sha1 - deepseq directory filepath gitrev GraphSCC heredoc monad-control - monadLib mtl panic pretty process random sbv simple-smt strict text - tf-random time transformers-base + array async base base-compat bv-sized bytestring containers + cryptohash-sha1 deepseq directory exceptions filepath gitrev + GraphSCC heredoc libBF monad-control monadLib mtl panic + parameterized-utils pretty process random sbv simple-smt strict + text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -65767,8 +66056,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "1.2.0"; - sha256 = "0p7h3g1b5qxrvggrbnaskx6f5ywd0v0yv5gqbl1yc560dzv323qx"; + version = "1.3.0"; + sha256 = "1pvqz44panx6xp0zw2wip0hz66gsjz569d0n6gayr4sj8scskasp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75619,8 +75908,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.12.0.0"; - sha256 = "1x14wybv1r0da3hjwv3ya5byvy5ah819c2b3yyrsx0y4i3vhc8a4"; + version = "0.13.0.0"; + sha256 = "10xpr7nqhx1djsgcgfr40v7axkl8a0fxx16vrpvr7h525ygyibp5"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = stdenv.lib.licenses.mit; @@ -75641,8 +75930,8 @@ self: { ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.5.0.0"; - sha256 = "0nahsy5jhvg2q3zvalfr0p0pbjhschsvvly3hi59rp593p2n82hg"; + version = "0.7.0.0"; + sha256 = "0c2838dn34hwh9z0j1qhz276zf7zypr0gq25ym4m6wzpni14scj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; @@ -76336,15 +76625,14 @@ self: { }) {}; "dom-lt" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq }: + ({ mkDerivation, array, base, containers, criterion, deepseq, HUnit + }: mkDerivation { pname = "dom-lt"; - version = "0.2.0"; - sha256 = "15jf1csnqwd56izw5zk6kbp2kk6y0zkgm9ddbwrk0k3ngmdqzkli"; - revision = "1"; - editedCabalFile = "1rkjm9ssi7j2klf11b8w1wlw3hg4ybcfxdi2klik6lm5mpb52x7w"; + version = "0.2.1"; + sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7"; libraryHaskellDepends = [ array base containers ]; - testHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; @@ -79364,8 +79652,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.1.0.0"; - sha256 = "0ykyrirm2ncsaaak2q1p71zy15qw3wjkppnzfmzyas1jxpwvgi2v"; + version = "0.2.0.0"; + sha256 = "1fh6pyjalrns01sg1rnz2h462xgcmnj6xfg6xg61cdb4zh5i9gpp"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -79661,6 +79949,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "either-result" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hspec + , hspec-discover + }: + mkDerivation { + pname = "either-result"; + version = "0.1.2.0"; + sha256 = "1ch6m0bimbkq73xchhfczssl6pzszkrhcgbcccbzi752r4vps31s"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "‘Result a’ is a wrapper of ‘Either String a’"; + license = stdenv.lib.licenses.asl20; + }) {}; + "either-unwrap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80660,15 +80963,15 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.2.2"; - sha256 = "19fj65klv8pyan6n6i0mzcwpsprkhvxirh82hdmr3b3y2zaw10h6"; + version = "0.3.0"; + sha256 = "15qnsbbfmyyxmhzs5ly84w4yficcmnl3v49wjqhr86836l770rbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring elynx-tools optparse-applicative slynx tlynx ]; description = "Validate and (optionally) redo ELynx analyses"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80681,20 +80984,33 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.2.2"; - sha256 = "1w7wxha82xaanfnzyn8ygfpxmk7lalfvzwr157crz8nm59ai4c05"; + version = "0.3.0"; + sha256 = "0w889wjyj4g8yr4ysvh2v1jnsf6bpdri8pj9klslnrpmk4b7x14n"; libraryHaskellDepends = [ base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix integration math-functions megaparsec mwc-random parallel primitive statistics vector ]; testHaskellDepends = [ - base bytestring containers elynx-tools elynx-tree hmatrix hspec - hspec-megaparsec integration math-functions megaparsec mwc-random - parallel primitive statistics vector + base containers elynx-tools elynx-tree hmatrix hspec + hspec-megaparsec mwc-random vector ]; description = "Simulate molecular sequences along trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "elynx-nexus" = callPackage + ({ mkDerivation, base, bytestring, hspec, megaparsec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.3.0"; + sha256 = "00aikdx89b0x9zw78srp5qmx564myn9dhwy1k6nq9b411cxsfz0v"; + libraryHaskellDepends = [ base bytestring megaparsec ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80706,19 +81022,17 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.2.2"; - sha256 = "1m09indy34zgx16m2rnmwjf9fvrhi8qcdxpfz7myjl2hxbp8hz1j"; + version = "0.3.0"; + sha256 = "0y7raavskrxgqmfsszm3f177hsjwnf69302vq3k7anj4fzqydvcn"; libraryHaskellDepends = [ aeson base bytestring containers elynx-tools matrices megaparsec mwc-random parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - aeson base bytestring containers elynx-tools hspec hspec-megaparsec - matrices megaparsec mwc-random parallel primitive vector - vector-th-unbox word8 + base bytestring elynx-tools hspec hspec-megaparsec matrices vector ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -80733,8 +81047,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.2.2"; - sha256 = "0gdnfyag704yfvrakc7d0adh3mb9r1kf1v8cpdrspaxxr77brw9q"; + version = "0.3.0"; + sha256 = "1ba9vcmzf7kwm8h493m2n9naq1pzhsddd8mv3mp8vb30jgg75vhj"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring containers cryptohash-sha256 deepseq directory fast-logger hmatrix matrices @@ -80743,36 +81057,35 @@ self: { transformers transformers-base vector zlib ]; description = "Tools for ELynx"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "elynx-tree" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , elynx-tools, hspec, hspec-megaparsec, math-functions, megaparsec - , mwc-random, primitive, QuickCheck, quickcheck-instances - , statistics + ({ mkDerivation, aeson, base, bytestring, comonad, containers + , criterion, deepseq, elynx-nexus, elynx-tools, hspec + , hspec-megaparsec, math-functions, megaparsec, mwc-random + , primitive, QuickCheck, statistics, vector }: mkDerivation { pname = "elynx-tree"; - version = "0.2.2"; - sha256 = "00c7rli9vfi1crz9plpc5xgh960ba245kisxihbx54vqlc94b5hj"; + version = "0.3.0"; + sha256 = "10z7fm5ir91vh3j39kf2ylx02i4fvnwxzk7x9bfpp6f26cr0mfcb"; libraryHaskellDepends = [ - base bytestring containers elynx-tools math-functions megaparsec - mwc-random primitive statistics + aeson base bytestring comonad containers deepseq elynx-nexus + elynx-tools math-functions megaparsec mwc-random primitive + statistics vector ]; testHaskellDepends = [ base bytestring containers elynx-tools hspec hspec-megaparsec - math-functions megaparsec mwc-random primitive QuickCheck - quickcheck-instances statistics + megaparsec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools math-functions - megaparsec mwc-random primitive statistics + base bytestring containers criterion elynx-tools ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -85664,7 +85977,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_7_0" = callPackage + "fakedata_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, string-random, template-haskell, text, time @@ -85672,8 +85985,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.7.0"; - sha256 = "0vzc2jyhan1igc7ffvch0zzsdnsyn5l857a5kr0zbsmri76sb59c"; + version = "0.7.1"; + sha256 = "1fbrfndwamwdnklbmyldhn45qxyyc61akbwvw0bmf645l0mkpn12"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -85696,6 +86009,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fakedata-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, text }: + mkDerivation { + pname = "fakedata-parser"; + version = "0.1.0.0"; + sha256 = "0rf4mr9977p70vsinr3iga6l5wzkxnkxd52j4jmdmrk5b6i3flcp"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ attoparsec base hspec text ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: mkDerivation { @@ -88225,6 +88549,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable_0_1_4_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "filtrable"; + version = "0.1.4.0"; + sha256 = "11jas9w611pslc3hanybsdwrh4292zvgigng8y4cv7gm0j908xng"; + libraryHaskellDepends = [ base transformers ]; + description = "Class of filtrable containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fin" = callPackage ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing , QuickCheck, tagged @@ -88778,13 +89114,13 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "2.2.0"; - sha256 = "0nwl9gxaxjdvgr0ji7r0hh9z43s473rb69dgb3p8ab3kdc3mld11"; + version = "2.3.0"; + sha256 = "1ysz764i24l30cclw5zzwkk78di8i9qh136abwlpcxyyw4zy2n6d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts - pretty process split text time uniplate + mtl pretty process split text time uniplate ]; testHaskellDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts @@ -94023,6 +94359,8 @@ self: { pname = "fused-effects-th"; version = "0.1.0.0"; sha256 = "05apm97hlk1k0h6px5sf25gwb6wnrg5za3z8r64rcxmzcfhd10c9"; + revision = "1"; + editedCabalFile = "00zyzq1xz78vbnygayvc78i023xqib0k2p0qvxzx4d2908l36g6f"; libraryHaskellDepends = [ base fused-effects template-haskell ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit template-haskell @@ -94092,8 +94430,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.16.2"; - sha256 = "06kiig31z5c2sgpqisbf2dx3ipbglq49ga7w3sx1p89wakzkqyi5"; + version = "0.16.3"; + sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98387,8 +98725,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.2"; - sha256 = "1wdippdn029rpd1v3mk470gyp8v13d2bna8p8q6cn7q7nhm1dhhc"; + version = "0.7.3"; + sha256 = "1vz2qjgdv5hv7zrq0hm9f4ly0q3bl1cz2spcqrdpdzhivfff651g"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -99580,15 +99918,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "gi-gobject_2_0_23" = callPackage + "gi-gobject_2_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.23"; - sha256 = "15wkma8akcy50c2xiiwlc4zm5k1v4vnrk3mhn3bbz1rdfbdhvr9v"; + version = "2.0.24"; + sha256 = "1i19s7pcs3gnhhyif8y3j7hngmdzfqbgaw52j8dvrz7w11fbx9sj"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib haskell-gi haskell-gi-base @@ -100010,24 +100348,24 @@ self: { "gi-harfbuzz" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, harfbuzz, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-harfbuzz"; - version = "0.0.2"; - sha256 = "15l5iwnj9awd04626mqagd4rldxi2byr53gvqqnlxljbskb7ch2m"; + version = "0.0.3"; + sha256 = "1rapwaf8rz18rsai54lq9wcccf9j0ihcafvwhrzvgl17fjqcfqaz"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ harfbuzz ]; + libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) harfbuzz;}; + }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -100370,8 +100708,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.8"; - sha256 = "1zgzxx5v0cc0z9xq1nkbqixa7r0m0m00gzvdypxqddlpzvrxn63c"; + version = "3.0.9"; + sha256 = "1cy1nzld3220rg0f1gzr5cw756s5vm9las8p8xyqhjmk3awy0cbp"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -102259,25 +102597,25 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , regex-tdfa, semigroupoids, split, stm, template-haskell, text - , time, transformers, unix, unordered-containers, vector, vty + , HUnit, irc-core, kan-extensions, lens, mwc-random, network + , process, psqueues, regex-tdfa, semigroupoids, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.35"; - sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f"; - revision = "1"; - editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v"; + version = "2.36"; + sha256 = "0s136d0nnw0vs198kzana10ybnka4mx0jyqdf1wsz5m9a4y3cnvj"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues regex-tdfa semigroupoids split stm template-haskell text - time transformers unix unordered-containers vector vty + hookup HsOpenSSL irc-core kan-extensions lens mwc-random network + process psqueues regex-tdfa semigroupoids split stm + template-haskell text time transformers unix unordered-containers + vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -106999,24 +107337,25 @@ self: { }) {}; "graphql" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations - , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck - , raw-strings-qq, scientific, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, base, conduit, containers, exceptions + , hspec, hspec-expectations, hspec-megaparsec, megaparsec + , parser-combinators, QuickCheck, raw-strings-qq, scientific, text + , transformers, unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.8.0.0"; - sha256 = "08xi2q8jzk78a62q5qbi8i2d2kq0qcn0dzdx1haq2c4qjsf09798"; + version = "0.9.0.0"; + sha256 = "1lyzrnbf1w3j60wwi8cwbh1hxzvsw8vn9aymy1qzxgjgmi2wx94g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec parser-combinators scientific text - transformers unordered-containers vector + aeson base conduit containers exceptions hspec-expectations + megaparsec parser-combinators scientific text transformers + unordered-containers ]; testHaskellDepends = [ - aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec parser-combinators QuickCheck raw-strings-qq scientific - text transformers unordered-containers vector + aeson base conduit containers exceptions hspec hspec-expectations + hspec-megaparsec megaparsec parser-combinators QuickCheck + raw-strings-qq scientific text transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -110429,16 +110768,17 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring , base64-bytestring, binary, bytestring, containers - , cryptohash-sha256, deepseq, directory, ed25519 - , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit - , lukko, mtl, network, network-uri, old-locale, parsec, pretty - , process, random, split, stm, tar, template-haskell, text, time - , transformers, unix, xml, zlib + , cryptohash-sha256, deepseq, directory, doctest, ed25519 + , extensible-exceptions, filepath, ghc-prim, hashable, hspec + , hspec-discover, HTTP, lukko, mtl, network, network-uri + , old-locale, parsec, pretty, process, QuickCheck, random, split + , stm, tar, template-haskell, text, time, transformers, unix, xml + , zlib }: mkDerivation { pname = "hackport"; - version = "0.6.5"; - sha256 = "1869fkrcapnvvzgqwfaivjgcmbmmg53l335qgb6fw672g4bhkc2x"; + version = "0.6.6"; + sha256 = "0cdwcrk8cqfbfi2kg074zmiq3j5fv3790inwc4hxwhrhv34hz437"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110449,12 +110789,13 @@ self: { stm tar template-haskell text time transformers unix xml zlib ]; testHaskellDepends = [ - array base binary bytestring containers deepseq directory - extensible-exceptions filepath HUnit parsec pretty process split - text time transformers unix xml + array base binary bytestring containers deepseq directory doctest + extensible-exceptions filepath hspec mtl parsec pretty process + QuickCheck split template-haskell text time transformers unix xml ]; + testToolDepends = [ hspec-discover ]; description = "Hackage and Portage integration tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -111655,8 +111996,8 @@ self: { }: mkDerivation { pname = "hal"; - version = "0.4.2"; - sha256 = "0z12a4avydwcld5rwzb5fvffz6dpqqc4h04i43f9nih8dr19zpdp"; + version = "0.4.3"; + sha256 = "0iqyayya1j3l1jrb2i68shn4zgrqf63pv3l9v29s0chn3gyyij1r"; libraryHaskellDepends = [ aeson base bytestring containers envy exceptions http-conduit http-types mtl text time @@ -113675,8 +114016,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.1.4.0"; - sha256 = "1w57jw8b3hiqhl372zc5fj30lgvh9nywhg70fqpz4jlm86a2bjqw"; + version = "0.2.0.0"; + sha256 = "1khdlkf2n6x3rck9sc7jir08mx7n7dv9p25j80g27q6a1nm0pq91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114965,7 +115306,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - "haskell-gi_0_24_2" = callPackage + "haskell-gi_0_24_3" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -114973,8 +115314,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.24.2"; - sha256 = "1m7zcmqr9alq6bbq04szxwypvhxv54ns1f2gw9af7k4pv5mwn2p9"; + version = "0.24.3"; + sha256 = "1bzbb0hbk0hz265rbh4dsypwiqxcjn0gy0sql287bm57rj0mvnn0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -115000,12 +115341,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_1" = callPackage + "haskell-gi-base_0_24_2" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.1"; - sha256 = "0d777sqi1wjhgw1avsp7b1ps2irblvpr0bpnzbw1ybv3yhb49zmr"; + version = "0.24.2"; + sha256 = "0qjbbfxlx4gqnyfnjpr4ray7fih8alsa2bxb5imkckhrzfx4xmq0"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -117410,8 +117751,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.37.0"; - sha256 = "1ig2968p7b6zncazsqn258c4zz0j12sxka8g64nav7581d1sbfg4"; + version = "0.37.3"; + sha256 = "1gkgznvx0y30568l2rs0px2pfyzn9sbzqv9vnd5ps5ib33yb853s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117452,8 +117793,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.37.0"; - sha256 = "1qgn75mqp8xq33hn3y0myycwp4y5j6l3g3y8pj0hhyiwn7brsjbw"; + version = "0.37.3"; + sha256 = "1wz0nwm4izsxaxij9s4vfjdlcqp1jca16g2phdn3k2dp35kyfymi"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -118525,8 +118866,6 @@ self: { ]; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-notifications" = callPackage @@ -123073,22 +123412,23 @@ self: { "hgeometry" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-clist, deepseq, dlist, doctest, doctest-discover, fingertree - , fixed-vector, hgeometry-combinatorial, hspec, lens, linear - , MonadRandom, mtl, primitive, QuickCheck, quickcheck-instances - , reflection, semigroupoids, semigroups, template-haskell, text - , vector, vector-builder, vinyl, yaml + , fixed-vector, hashable, hgeometry-combinatorial, hspec, lens + , linear, MonadRandom, mtl, primitive, QuickCheck + , quickcheck-instances, random, reflection, semigroupoids + , semigroups, template-haskell, text, vector, vector-builder, vinyl + , yaml }: mkDerivation { pname = "hgeometry"; - version = "0.10.0.0"; - sha256 = "01kf7cmjdr2s172xj25i9vyjpfd0wayh0bjgccxqqy886kxrkhfw"; + version = "0.11.0.0"; + sha256 = "1vbj26j06byz9x0c03q5k7fijl31hsi7x9f5wfr2w9g96d7zl3ls"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-clist deepseq - dlist fingertree fixed-vector hgeometry-combinatorial hspec lens - linear MonadRandom mtl primitive QuickCheck quickcheck-instances - reflection semigroupoids semigroups template-haskell text vector - vector-builder vinyl yaml + dlist fingertree fixed-vector hashable hgeometry-combinatorial + hspec lens linear MonadRandom mtl primitive QuickCheck + quickcheck-instances random reflection semigroupoids semigroups + template-haskell text vector vector-builder vinyl yaml ]; testHaskellDepends = [ base doctest doctest-discover QuickCheck ]; description = "Geometric Algorithms, Data structures, and Data types"; @@ -123098,22 +123438,23 @@ self: { "hgeometry-combinatorial" = callPackage ({ mkDerivation, aeson, approximate-equality, base, bifunctors , bytestring, containers, contravariant, data-clist, deepseq - , directory, dlist, doctest, filepath, fingertree, hspec - , hspec-discover, lens, linear, MonadRandom, mtl, QuickCheck - , quickcheck-instances, random, reflection, semigroupoids - , semigroups, singletons, template-haskell, text, vector - , vector-builder, vinyl, yaml + , directory, dlist, doctest, filepath, fingertree, hashable, hspec + , hspec-discover, lens, linear, MonadRandom, mtl, primitive + , QuickCheck, quickcheck-instances, random, reflection + , semigroupoids, semigroups, singletons, template-haskell, text + , vector, vector-builder, vinyl, yaml }: mkDerivation { pname = "hgeometry-combinatorial"; - version = "0.10.0.0"; - sha256 = "0v168wxnzkmylh8gzxzrq0sfq5y2xn3i8r6kqnahc14x1c1jzzk1"; + version = "0.11.0.0"; + sha256 = "0qhb4aflqcjjm1qnhq7xsd086pk09gnq7q503ys4kzr8j0knc2j5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring containers contravariant - data-clist deepseq dlist fingertree lens MonadRandom mtl QuickCheck - quickcheck-instances reflection semigroupoids semigroups - template-haskell text vector vector-builder vinyl yaml + data-clist deepseq dlist fingertree hashable lens linear + MonadRandom mtl primitive QuickCheck quickcheck-instances random + reflection semigroupoids semigroups template-haskell text vector + vector-builder vinyl yaml ]; testHaskellDepends = [ approximate-equality base bytestring containers data-clist @@ -123136,8 +123477,8 @@ self: { }: mkDerivation { pname = "hgeometry-ipe"; - version = "0.10.0.0"; - sha256 = "1802yl65sy489s7pk58cd92qvzvdnw9z3ms6jr8wcrs6ipfqsa60"; + version = "0.11.0.0"; + sha256 = "0h78rsxc281wxmg27zxzzak0k15mv61i146gzafihrdg9hpbw1lk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bifunctors bytestring colour containers data-clist @@ -123362,8 +123703,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.2.4"; - sha256 = "1mmnz6vipl42p2raxn26hjlcrjhrk3xfbvzyxhjl5ciybgi6dc3w"; + version = "0.2.5"; + sha256 = "06ikaxxa70x71w4rq7a9rcp4mj12d8wlwzfdxnrapg9x9yr3py85"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -125286,6 +125627,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hkgr_0_2_6_1" = callPackage + ({ mkDerivation, base, directory, extra, filepath, simple-cabal + , simple-cmd, simple-cmd-args, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.2.6.1"; + sha256 = "0hq059l3byw3vcxw56z341q56xnb86kdqj5vnn16v29ql677xm26"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath simple-cabal simple-cmd + simple-cmd-args xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -127928,10 +128289,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.3.1.0"; - sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; - revision = "1"; - editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9"; + version = "0.4"; + sha256 = "0zfplby1lkbdr3s6icv1p4vii77a2sb3mx0ylp9pjg7f3ic9lw8i"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -130088,8 +130447,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "hs-gchart"; - version = "0.4.1"; - sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459"; + version = "0.4.2"; + sha256 = "1kky6fr7s4v3hpnabp95crrd6fd67rq49sbdpjbm4n5gbyby110q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl ]; description = "Haskell wrapper for the Google Chart API"; @@ -135518,8 +135877,8 @@ self: { }: mkDerivation { pname = "http-common"; - version = "0.8.2.0"; - sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599"; + version = "0.8.2.1"; + sha256 = "1pzi1h9qb6mpzkmv1bfa54vfzrp5jcdlbwj1i7qiricrwhqxh3dk"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive directory mtl network text transformers unordered-containers @@ -136171,6 +136530,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-streams_0_8_7_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, blaze-builder, bytestring, case-insensitive + , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations + , http-common, HUnit, io-streams, lifted-base, mtl, network + , network-uri, openssl-streams, snap-core, snap-server + , system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.7.2"; + sha256 = "1q0lp8hkzfc0srci9y794q5cqkih50r3iw2c32wbx8h502jcvv1q"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive directory HsOpenSSL http-common io-streams mtl + network network-uri openssl-streams text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; + description = "An HTTP client using io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -137881,13 +138272,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, hspec-discover, monad-loops, random, rdkafka, text + , either, hspec, hspec-discover, monad-loops, rdkafka, text , transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "3.1.1"; - sha256 = "109ld374fzrnin94s12ig5hhimjbnh643nbbgp7zdxjpr1qmjcz6"; + version = "3.1.2"; + sha256 = "1yqzh9cvs9yr88wa0r26izd35hg2vfzqvzxbx0l6c1apgc3m7hd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137896,8 +138287,7 @@ self: { librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops - random text transformers + base bifunctors bytestring containers either hspec monad-loops text ]; testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; @@ -138049,6 +138439,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -143248,6 +143640,8 @@ self: { doHaddock = false; description = "A GHC Core plugin for intensional datatype refinement checking"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "interact" = callPackage @@ -144015,6 +144409,17 @@ self: { broken = true; }) {}; + "involutive-semigroups" = callPackage + ({ mkDerivation, base, bytestring, containers, text, vector }: + mkDerivation { + pname = "involutive-semigroups"; + version = "0.1.0.0"; + sha256 = "1nms6w5b8apdz9xlwdqyj9n4m0b192simxg9zl7pv8zkyklyb3aw"; + libraryHaskellDepends = [ base bytestring containers text vector ]; + description = "Semigroups with involution"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "io-capture" = callPackage ({ mkDerivation, base, bytestring, hspec, hspec-core , streaming-bytestring, unix @@ -144339,8 +144744,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ip-quoter" = callPackage @@ -144743,10 +145146,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.7.2"; - sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq"; - revision = "1"; - editedCabalFile = "1xkvy5igrx4ri8gmmwzxs2mq7ih57gps8a592ya6bv1crrm45cy2"; + version = "2.8"; + sha256 = "1msn18qxvwywwkqz2mv6d5awk29w3f3jqjdjw7dwvk5k25llmc3l"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -145058,6 +145459,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "isbn_1_1_0_1" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "isbn"; + version = "1.1.0.1"; + sha256 = "0s7b06a0d37bhb38k2my6g6brn6bywxr59kw2c103dp4y4kzrcpn"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "ISBN Validation and Manipulation"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "isdicom" = callPackage ({ mkDerivation, base, directory, doctest, filepath, QuickCheck , template-haskell @@ -145996,6 +146410,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ixset-typed-binary-instance" = callPackage + ({ mkDerivation, base, binary, ixset-typed }: + mkDerivation { + pname = "ixset-typed-binary-instance"; + version = "0.1.0.0"; + sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4"; + libraryHaskellDepends = [ base binary ixset-typed ]; + description = "Binary instance for ixset-typed"; + license = stdenv.lib.licenses.mit; + }) {}; + "ixset-typed-conversions" = callPackage ({ mkDerivation, base, exceptions, hashable, ixset-typed , unordered-containers, zipper-extra @@ -146012,6 +146437,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ixset-typed-hashable-instance" = callPackage + ({ mkDerivation, base, hashable, ixset-typed }: + mkDerivation { + pname = "ixset-typed-hashable-instance"; + version = "0.1.0.1"; + sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk"; + libraryHaskellDepends = [ base hashable ixset-typed ]; + description = "Hashable instance for ixset-typed"; + license = stdenv.lib.licenses.mit; + }) {}; + "ixshader" = callPackage ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec , prettyclass, singletons, template-haskell, text @@ -148585,17 +149021,17 @@ self: { "jukebox" = callPackage ({ mkDerivation, alex, array, base, containers, directory, dlist , filepath, minisat, pretty, process, symbol, transformers - , uglymemo + , uglymemo, utf8-string }: mkDerivation { pname = "jukebox"; - version = "0.4.4"; - sha256 = "0xjyyklwyzblgyakziwyh4420q1fcbqsss35dpxm592wd74wk0mw"; + version = "0.5.1"; + sha256 = "0f74mml9qpxlfxxvldz9qz89bscj7qwmc5gb42rgfgbkfin6zrdk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory dlist filepath minisat pretty - process symbol transformers uglymemo + process symbol transformers uglymemo utf8-string ]; libraryToolDepends = [ alex ]; executableHaskellDepends = [ base ]; @@ -152752,20 +153188,20 @@ self: { , composition-prelude, containers, cpphs, criterion, deepseq , directory, filepath, happy, haskeline, microlens, microlens-mtl , mtl, optparse-applicative, pretty-simple, prettyprinter, random - , tasty, tasty-golden, tasty-hunit, template-haskell, text + , split, tasty, tasty-golden, tasty-hunit, template-haskell, text , transformers, zstd }: mkDerivation { pname = "language-dickinson"; - version = "1.1.0.0"; - sha256 = "0hq74ijqqlmddins28m35jbyckfs27462jymc9kdjyzvmcp01fh9"; + version = "1.1.0.1"; + sha256 = "0j163whdxpzi2aklb5x7f42y61whm941x0rjls02crgmpdaj0z75"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring composition-prelude containers deepseq directory filepath microlens microlens-mtl mtl prettyprinter random - template-haskell text transformers + split template-haskell text transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -157306,27 +157742,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, criterion, deepseq - , HUnit, lifted-base, monad-control, mtl, tasty - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.1.1"; - sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base criterion deepseq ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_1_2" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -157345,7 +157760,6 @@ self: { benchmarkHaskellDepends = [ async base criterion deepseq ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -158466,8 +158880,8 @@ self: { ({ mkDerivation, base, bytestring, hashable, unix }: mkDerivation { pname = "linux-inotify"; - version = "0.3.0.1"; - sha256 = "0fir9qajp1vrgr8l6q6h0w2dh4rbi8ibhnni9wl1cnkv5h7rrg1l"; + version = "0.3.0.2"; + sha256 = "1dl71xkfjlwjsmv0mqf2fpkfjl3hyzk5q1drsykg7rdblpjfbzlc"; libraryHaskellDepends = [ base bytestring hashable unix ]; description = "Thinner binding to the Linux Kernel's inotify interface"; license = stdenv.lib.licenses.bsd3; @@ -158701,28 +159115,75 @@ self: { broken = true; }) {}; + "liquid-base" = callPackage + ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: + mkDerivation { + pname = "liquid-base"; + version = "4.14.0.0"; + sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; + description = "Drop-in base replacement for LiquidHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-bytestring" = callPackage + ({ mkDerivation, base, bytestring, Cabal, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-bytestring"; + version = "0.10.10.0"; + sha256 = "1fkl637zdxpsginnr0gqv68kch0dkr4yhmmmryzqy2h8fxm8gmg7"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; + description = "LiquidHaskell specs for the bytestring package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-containers" = callPackage + ({ mkDerivation, base, Cabal, containers, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-containers"; + version = "0.6.2.1"; + sha256 = "07k9sg1q5xvsab2dvikkjb9rpx9rcabs4szm5rbh1m5mqnwivr1l"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; + description = "LiquidHaskell specs for the containers package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, cereal, cmdargs, containers - , deepseq, directory, fgl, filepath, ghc-prim, git, hashable - , intern, mtl, nettools, ocaml, parallel, parsec, pretty, process - , stm, syb, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text - , text-format, transformers, unordered-containers, z3 + , deepseq, directory, fgl, filepath, git, hashable, intern, mtl + , nettools, ocaml, parallel, parsec, pretty, process, stm, syb + , tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.8.0.2"; - sha256 = "1x8xbcf2xc9hwfpsl1s15qkmgdhr30fff4gp09dvnwi3z4mgi2wf"; - revision = "1"; - editedCabalFile = "013q8xj4ib5llyq9wmnx98dprw2zn4rkc1jndavcjjg2cwwrw56w"; + version = "0.8.10.1"; + sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array ascii-progress async attoparsec base binary boxes cereal cmdargs containers deepseq directory fgl filepath - ghc-prim hashable intern mtl parallel parsec pretty process syb - text text-format transformers unordered-containers + hashable intern mtl parallel parsec pretty process syb text + text-format transformers unordered-containers ]; executableHaskellDepends = [ base ]; executableSystemDepends = [ ocaml ]; @@ -158739,37 +159200,118 @@ self: { }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; + "liquid-ghc-prim" = callPackage + ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: + mkDerivation { + pname = "liquid-ghc-prim"; + version = "0.6.1"; + sha256 = "1zpb0izg4y98xz87ivn6rs5nfshvawrxyb5hc8jzif2p17j0aqpb"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ ghc-prim liquidhaskell ]; + description = "Drop-in ghc-prim replacement for LiquidHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-parallel" = callPackage + ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, parallel + }: + mkDerivation { + pname = "liquid-parallel"; + version = "3.2.2.0"; + sha256 = "0dg0k1lx74p3lj3vc43wypy5a3lpnww5w456ccp4xy3k83b3c4xd"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; + description = "LiquidHaskell specs for the parallel package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-platform" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "liquid-platform"; + version = "0.8.10.1"; + sha256 = "1l1qpg08fhf2xbj7i3hy36idm2z4yggg7mlzyncjkjlqxdnmm44k"; + isLibrary = false; + isExecutable = true; + description = "A battery-included platform for LiquidHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-prelude" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, liquid-base + , liquidhaskell + }: + mkDerivation { + pname = "liquid-prelude"; + version = "0.8.10.1"; + sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn"; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ + bytestring containers liquid-base liquidhaskell + ]; + description = "General utility modules for LiquidHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "liquid-vector" = callPackage + ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: + mkDerivation { + pname = "liquid-vector"; + version = "0.12.1.2"; + sha256 = "1kpa7c5a774ixqky3msp2xnq1nl16hh95azvaxdk0bhizfi3zjy3"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal liquidhaskell ]; + libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; + description = "LiquidHaskell specs for the vector package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "liquidhaskell" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs - , containers, data-default, deepseq, Diff, directory, filepath - , fingertree, ghc, ghc-boot, ghc-paths, ghc-prim, githash, gitrev - , hashable, hscolour, liquid-fixpoint, mtl, optparse-applicative - , optparse-simple, parsec, pretty, process, stm, syb, tagged, tasty - , tasty-ant-xml, tasty-hunit, tasty-rerun, template-haskell + ({ mkDerivation, aeson, base, binary, bytestring, Cabal, cereal + , cmdargs, containers, data-default, deepseq, Diff, directory + , extra, filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-prim + , githash, gitrev, hashable, hscolour, liquid-fixpoint, mtl, optics + , optparse-applicative, optparse-simple, parsec, pretty, process + , split, stm, string-conv, syb, tagged, tasty, tasty-ant-xml + , tasty-golden, tasty-hunit, tasty-rerun, template-haskell , temporary, text, time, transformers, unordered-containers, vector , z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.6.2"; - sha256 = "1hqs1zfcz4fprrrcwj3j731ksldviafivk0kv2hprslmz4m1kfb2"; + version = "0.8.10.1"; + sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm"; revision = "1"; - editedCabalFile = "14mvnjgd65n6j2zlzw0c679zvlik02cn6x8rhxm3rb1155zybjil"; + editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring cereal cmdargs containers data-default - deepseq Diff directory filepath fingertree ghc ghc-boot ghc-paths - ghc-prim githash gitrev hashable hscolour liquid-fixpoint mtl - optparse-simple parsec pretty syb template-haskell temporary text - time transformers unordered-containers vector + aeson base binary bytestring Cabal cereal cmdargs containers + data-default deepseq Diff directory extra filepath fingertree ghc + ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour + liquid-fixpoint mtl optics optparse-simple parsec pretty split syb + template-haskell temporary text time transformers + unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory filepath liquid-fixpoint mtl - optparse-applicative parsec process stm syb tagged tasty - tasty-ant-xml tasty-hunit tasty-rerun text transformers + base containers directory extra filepath ghc liquid-fixpoint mtl + optparse-applicative parsec process stm string-conv syb tagged + tasty tasty-ant-xml tasty-golden tasty-hunit tasty-rerun text + transformers ]; testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; @@ -160214,16 +160756,18 @@ self: { }) {}; "locators" = callPackage - ({ mkDerivation, base, bytestring, containers, cryptohash, hspec - , HUnit, QuickCheck + ({ mkDerivation, base, bytestring, containers, cryptonite, hspec + , HUnit, memory, QuickCheck }: mkDerivation { pname = "locators"; - version = "0.3.0.2"; - sha256 = "0bzf88cjd58rf0pp197ziy4fqs4a8bqfj44pr796gszhqggnjr95"; - libraryHaskellDepends = [ base bytestring containers cryptohash ]; + version = "0.3.0.3"; + sha256 = "1rjlgjm41mxflq4b7y7cl86mlkdlh5lgxsm40lmy1lwfcx7l2fmq"; + libraryHaskellDepends = [ + base bytestring containers cryptonite memory + ]; testHaskellDepends = [ - base bytestring containers cryptohash hspec HUnit QuickCheck + base bytestring containers cryptonite hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.mit; @@ -161414,31 +161958,21 @@ self: { "lorentz" = callPackage ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints - , containers, data-default, filepath, first-class-families, fmt - , formatting, ghc-prim, hedgehog, HUnit, interpolate, lens, morley - , morley-prelude, mtl, named, optparse-applicative, pretty-terminal - , QuickCheck, singletons, spoon, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit-compat, template-haskell, text - , type-spec, unordered-containers, vinyl + , containers, data-default, first-class-families, fmt, interpolate + , lens, morley, morley-prelude, mtl, named, optparse-applicative + , pretty-terminal, QuickCheck, singletons, text + , unordered-containers, vinyl }: mkDerivation { pname = "lorentz"; - version = "0.4.0"; - sha256 = "1wihk6vmcnc7bcy3xayffdivkqfjjcb8zg3bdkqhnnfvccmwyckg"; + version = "0.5.0"; + sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers - data-default first-class-families fmt formatting ghc-prim hedgehog - HUnit interpolate lens morley morley-prelude mtl named - optparse-applicative pretty-terminal QuickCheck singletons - template-haskell text unordered-containers vinyl + data-default first-class-families fmt interpolate lens morley + morley-prelude mtl named optparse-applicative pretty-terminal + QuickCheck singletons text unordered-containers vinyl ]; - testHaskellDepends = [ - base bimap bytestring constraints containers filepath - first-class-families fmt formatting hedgehog HUnit morley - morley-prelude singletons spoon tasty tasty-hedgehog - tasty-hunit-compat text type-spec unordered-containers vinyl - ]; - testToolDepends = [ tasty-discover ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161695,7 +162229,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_2" = callPackage + "lsp-test_0_11_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -161704,8 +162238,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.2"; - sha256 = "0sl2n38q9xa3hr8psjrwlw2mq63vanjdyn5vry6mp87l8vba9s8f"; + version = "0.11.0.3"; + sha256 = "065g80nbiw9lrk4rjnbksrnjc79klxxl8vxvpmcsinqmvxcynm8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164890,6 +165424,8 @@ self: { pname = "matchable"; version = "0.1.2"; sha256 = "0wrbq9pqndr9rm8iy3vmz756q77s0ih3y2is0hvv48w89hn5a4r0"; + revision = "1"; + editedCabalFile = "15gh6v6wicnl670j6knqcm1a589rdyh1drpk8ia7p4w9lhyav7vk"; libraryHaskellDepends = [ base containers hashable tagged unordered-containers vector ]; @@ -164906,10 +165442,8 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.0.0"; - sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3"; - revision = "1"; - editedCabalFile = "0az3cwf4gy0vhv0zqdvqpvk3j6ckhf1h2946kklvmij7z46x17ql"; + version = "0.1.1.0"; + sha256 = "0hmdy38k1il2b0j6bkr3m4f1c8d8rvw21k3rlrd0q345xjx8y8p1"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -165208,13 +165742,23 @@ self: { }) {}; "matlab" = callPackage - ({ mkDerivation, array, base, Cabal, eng, filepath, mat, mx }: + ({ mkDerivation, array, base, Cabal, containers, eng, exceptions + , filepath, mat, mx, path, profunctors, template-haskell, text + }: mkDerivation { pname = "matlab"; - version = "0.2.0.0"; - sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x"; - libraryHaskellDepends = [ array base Cabal filepath ]; + version = "0.3.0.0"; + sha256 = "1ghvmq8izn2rhv19qm3v3cxf8c2ry7jd627d49k4479sj9brs2wb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base Cabal containers filepath path profunctors + ]; librarySystemDepends = [ eng mat mx ]; + executableHaskellDepends = [ + base exceptions filepath path template-haskell text + ]; + executableSystemDepends = [ eng mat mx ]; description = "Matlab bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165462,7 +166006,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kiwi ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api" = callPackage @@ -165825,21 +166370,21 @@ self: { "mcmc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , directory, hspec, hspec-discover, log-domain, microlens - , mwc-random, QuickCheck, statistics, text, time, transformers - , vector, zlib + , data-default, directory, hspec, hspec-discover, log-domain + , microlens, mwc-random, QuickCheck, statistics, text, time + , transformers, vector, zlib }: mkDerivation { pname = "mcmc"; - version = "0.1.3"; - sha256 = "1rrbbnw6wi6k1p63n65a5rjr3fznzb48ksldb1w2xdbzmsa71nim"; + version = "0.2.0"; + sha256 = "1nybslnvn9g6cha19m2xhs6nba5nap572yxhgv4bjv44dmr6lvf7"; libraryHaskellDepends = [ - aeson base bytestring containers directory log-domain microlens - mwc-random statistics text time transformers vector zlib + aeson base bytestring containers data-default directory log-domain + microlens mwc-random statistics text time transformers vector zlib ]; testHaskellDepends = [ - base hspec hspec-discover log-domain mwc-random QuickCheck - statistics vector + base directory hspec hspec-discover log-domain mwc-random + QuickCheck statistics vector ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ @@ -169464,8 +170009,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; - revision = "1"; - editedCabalFile = "10dlh96l6fdbpl1slr8v022735z9zkdszd1aziid5ml3gf63ssd8"; + revision = "2"; + editedCabalFile = "0q633c7zv0liaz0a46llgy21x0snbfhl33qx9plh2sxhjvhvhmpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -170418,8 +170963,8 @@ self: { }: mkDerivation { pname = "monad-control-identity"; - version = "0.1.0.2"; - sha256 = "0662yps3s6r3ifrjw0mqn4shzawaz4llhxn68806xc88dzgb4a3a"; + version = "0.1.0.3"; + sha256 = "0nxsyhyvp04xr7js2z8mvmh2w2b2fwv5zzkbgjagm6l51pqpam6q"; libraryHaskellDepends = [ base monad-control transformers transformers-base ]; @@ -172386,52 +172931,36 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base - , base16-bytestring, base58-bytestring, binary, bytestring - , constraints, containers, criterion, cryptonite, data-default - , directory, filepath, first-class-families, fmt, formatting, gauge - , ghc-prim, gitrev, hedgehog, hex-text, hspec, hspec-expectations - , HUnit, interpolate, lens, megaparsec, memory, morley-prelude, mtl - , named, o-clock, optparse-applicative, parser-combinators - , pretty-simple, QuickCheck, quickcheck-arbitrary-adt - , quickcheck-instances, semigroups, show-type, singletons - , statistics, syb, tasty, tasty-ant-xml, tasty-discover - , tasty-hedgehog, tasty-hspec, tasty-hunit-compat, tasty-quickcheck - , template-haskell, text, th-lift, th-lift-instances, time, timerep - , transformers-compat, unordered-containers, vector, vinyl - , wl-pprint-text + , base58-bytestring, binary, bytestring, constraints, containers + , cryptonite, data-default, first-class-families, fmt + , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens + , megaparsec, memory, morley-prelude, mtl, named + , optparse-applicative, parser-combinators, pretty-simple + , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances + , semigroups, show-type, singletons, syb, template-haskell, text + , th-lift, th-lift-instances, time, timerep, transformers-compat + , unordered-containers, vector, vinyl, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.4.0"; - sha256 = "0696bp3851plhwm9x0bq4i1j6ygkqi1m91r0m73cn2svl8b5mnmw"; + version = "1.5.0"; + sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing aeson-pretty base base16-bytestring - base58-bytestring binary bytestring constraints containers - criterion cryptonite data-default first-class-families fmt - formatting ghc-prim gitrev hedgehog hex-text hspec - hspec-expectations HUnit interpolate lens megaparsec memory - morley-prelude mtl named o-clock optparse-applicative - parser-combinators QuickCheck quickcheck-arbitrary-adt - quickcheck-instances semigroups show-type singletons statistics syb - tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat - tasty-quickcheck template-haskell text th-lift th-lift-instances - time timerep transformers-compat unordered-containers vector vinyl + aeson aeson-casing aeson-pretty base base58-bytestring binary + bytestring constraints containers cryptonite data-default + first-class-families fmt generic-deriving gitrev hex-text + interpolate lens megaparsec memory morley-prelude mtl named + optparse-applicative parser-combinators QuickCheck + quickcheck-arbitrary-adt quickcheck-instances semigroups show-type + singletons syb template-haskell text th-lift th-lift-instances time + timerep transformers-compat unordered-containers vector vinyl wl-pprint-text ]; executableHaskellDepends = [ - base fmt morley-prelude named optparse-applicative pretty-simple - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - fmt formatting hedgehog hex-text hspec hspec-expectations HUnit - lens megaparsec morley-prelude singletons syb tasty tasty-hedgehog - tasty-hspec tasty-hunit-compat text unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge megaparsec morley-prelude + aeson base bytestring fmt haskeline megaparsec morley-prelude named + optparse-applicative pretty-simple text vinyl ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -174407,6 +174936,8 @@ self: { testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of "; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "multihash-serialise" = callPackage @@ -175631,6 +176162,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random_0_15_0_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, gauge, math-functions + , mersenne-random, primitive, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, time, vector + }: + mkDerivation { + pname = "mwc-random"; + version = "0.15.0.0"; + sha256 = "1hyqyakm9kbrbgr247n72rp90hcrwhak2p90bldkd2himmfaskxk"; + libraryHaskellDepends = [ + base math-functions primitive random time vector + ]; + testHaskellDepends = [ + base bytestring doctest primitive QuickCheck random tasty + tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base gauge mersenne-random random vector + ]; + doCheck = false; + description = "Fast, high quality pseudo random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random-accelerate" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -179905,8 +180461,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.3.0"; - sha256 = "1vp869aq7qi62bj02m11mg3hg1jz8qg3i67r945rhhjg9qzkn5ax"; + version = "0.5.4.1"; + sha256 = "153dswxwzai2fgn7k164zm1j2n144rncjyxj1k76mg9bqggplahs"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -180744,14 +181300,16 @@ self: { }) {}; "noli" = callPackage - ({ mkDerivation, base, cmark, directory, lucid, regex-compat, text + ({ mkDerivation, aeson, base, bytestring, cmark, directory + , frontmatter, lucid, regex-compat, text, yaml }: mkDerivation { pname = "noli"; - version = "0.1.0.3"; - sha256 = "1zyihhvr1aag9kzp9j3ksvp8imv1d2waab5grcnf5gdmnfcdchg8"; + version = "0.1.1.0"; + sha256 = "043rjr7p8jj33bkrl3mz7qbzl1az0v8acmbbzv8a6j6cpdd8vcxr"; libraryHaskellDepends = [ - base cmark directory lucid regex-compat text + aeson base bytestring cmark directory frontmatter lucid + regex-compat text yaml ]; description = "A static site generator"; license = stdenv.lib.licenses.mit; @@ -185614,17 +186172,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_1" = callPackage + "optparse-generic_1_4_2" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative - , semigroups, system-filepath, text, time, transformers, void + , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.1"; - sha256 = "0w9hl8ncw7v7bvzli68czqabxg7h15jn8b9rmgn53dn3xyw0h68y"; + version = "1.4.2"; + sha256 = "00b46pn3mi0kbx8a2xc92hlrykl9b344sq9ljmydv4zmrrhp5yr6"; libraryHaskellDepends = [ - base bytestring Only optparse-applicative semigroups - system-filepath text time transformers void + base bytestring Only optparse-applicative system-filepath text time + transformers void ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; @@ -186633,8 +187191,8 @@ self: { }: mkDerivation { pname = "packdeps"; - version = "0.4.5"; - sha256 = "07nsnxxs5y77w0v5dxw9mqgq98s3riws5846qshlnhq4l5q73php"; + version = "0.6.0.0"; + sha256 = "10hrsshzljs6yjzgpw6kpdc4fx4xrbafwicpapcmmj1y66rj00dz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186642,7 +187200,7 @@ self: { time ]; executableHaskellDepends = [ - base Cabal containers optparse-applicative process semigroups + base Cabal containers optparse-applicative process semigroups text ]; description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; @@ -187268,8 +187826,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc-preamble"; - version = "1.5"; - sha256 = "06zv358m9kzcmpbvl4a3bxzx46nf9g67rk12hbh9cc0crq5kyqdf"; + version = "1.6"; + sha256 = "0xx2l0xjx0baaqmdnk29knxxhwfix1wrg7zysvgilf33zsvdc5a8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -187591,22 +188149,23 @@ self: { broken = true; }) {}; - "pandoc-plot_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, directory - , filepath, githash, hashable, hspec, hspec-expectations - , lifted-async, mtl, optparse-applicative, pandoc, pandoc-types - , shakespeare, tasty, tasty-hspec, tasty-hunit, template-haskell - , text, typed-process, yaml + "pandoc-plot_0_8_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, directory, filepath, githash, hashable, hspec + , hspec-expectations, lifted-async, mtl, optparse-applicative + , pandoc, pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.8.0.0"; - sha256 = "10pv918mxyiv6fcpwdybymd4xrzif5qxpqdr9qarbjz6nh90ih2s"; + version = "0.8.1.0"; + sha256 = "11mn2baqya3xm325znxcsxglv6ydd67yd69p3fvqn9m2fcg1y9fr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers directory filepath hashable lifted-async - mtl pandoc pandoc-types shakespeare text typed-process yaml + base bytestring containers data-default directory filepath hashable + lifted-async mtl pandoc pandoc-types shakespeare tagsoup text + typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -188750,8 +189309,8 @@ self: { }: mkDerivation { pname = "parameterized-utils"; - version = "2.1.0"; - sha256 = "0jfl75a1282lb50v1jw3ghmnwp1fp0fmwgj46lw87rm6vc2qlzhb"; + version = "2.1.1"; + sha256 = "18z0ykpvr7m8ffqpqwnclnyifig61n9l41w3hn39f37455z1dy39"; libraryHaskellDepends = [ base base-orphans constraints containers deepseq ghc-prim hashable hashtables lens mtl template-haskell text th-abstraction vector @@ -190045,6 +190604,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "path-binary-instance" = callPackage + ({ mkDerivation, base, binary, path }: + mkDerivation { + pname = "path-binary-instance"; + version = "0.1.0.0"; + sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir"; + libraryHaskellDepends = [ base binary path ]; + description = "Binary instance for Path"; + license = stdenv.lib.licenses.mit; + }) {}; + "path-extensions" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { @@ -196782,6 +197352,19 @@ self: { broken = true; }) {}; + "polysemy-optics" = callPackage + ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: + mkDerivation { + pname = "polysemy-optics"; + version = "0.1.0.0"; + sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5"; + libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; + description = "Optics for Polysemy"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-plugin" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , ghc, ghc-tcplugins-extra, hspec, hspec-discover @@ -199329,8 +199912,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.7.1.0"; - sha256 = "16wc74wb6q890x1nm2d33al2vr3wc7vmpm1c5f83wfbx4w6qqmkc"; + version = "0.7.2.0"; + sha256 = "0ikgar72pc1cracqfswzajr2razv98iyanmf7vwd9nkqxkwyqkpk"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory hashable lens mtl pcre-heavy pcre-light pretty pretty-terminal @@ -199823,8 +200406,8 @@ self: { pname = "pretty-compact"; version = "3.0"; sha256 = "06m8n5rx1d62hwd017ss8nlxas5ia57lgxddm2hv2046938a5wm8"; - revision = "2"; - editedCabalFile = "04c309cdfrfwh031g8syyrwwn0lxdjj9f7d8szabscm19zwbi399"; + revision = "3"; + editedCabalFile = "08wmmcqsh7yv1h9g0kmg2w84w7b1ljw2wxz81gjg91z0ig3f3zs2"; libraryHaskellDepends = [ base base-compat containers ]; benchmarkHaskellDepends = [ aeson base base-compat bytestring criterion deepseq pretty text @@ -200172,6 +200755,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_7_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, deepseq, doctest, gauge, mtl, pgp-wordlist + , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.7.0"; + sha256 = "19z04sn0kqxgwcyfn5igjmbxw13xsb3mdhdidkb3kzswib78f6sr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers deepseq gauge mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -200185,6 +200794,25 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-ansi-terminal_1_1_2" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, containers + , deepseq, doctest, gauge, prettyprinter, QuickCheck, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1.2"; + sha256 = "168p5b7fzqs0g8ld26d3k78afgdx4r21dv0hw8ka2c08p4w76sz2"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base base-compat containers deepseq gauge prettyprinter QuickCheck + text + ]; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -200247,6 +200875,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter-convert-ansi-wl-pprint_1_1_1" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest + , prettyprinter, prettyprinter-ansi-terminal, text + }: + mkDerivation { + pname = "prettyprinter-convert-ansi-wl-pprint"; + version = "1.1.1"; + sha256 = "0bgf2np1ymy6zsd1qacndgyipcf0bamw1wkkikaq57npbb7psc41"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ base doctest ]; + description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-graphviz" = callPackage ({ mkDerivation, base, graphviz, prettyprinter, text }: mkDerivation { @@ -200936,9 +201582,8 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.6"; - sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz"; - enableSeparateDataOutput = true; + version = "0.2.7"; + sha256 = "1m494ya9yv25jdi9wm90zz8c16vq1kv73sgc6w3950020hsbfqj9"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; @@ -201871,8 +202516,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.3"; - sha256 = "1z8mar0l8kh8wd0hsv4ckgnr5ha1vsx83afg63z9pwmv5l3phj0q"; + version = "2.2.1"; + sha256 = "0wf7ayxxppdg1x1s2sjmlnnhdmlm18a90mgzg7wfvpmlb9kgvs3f"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-client-tls http-types network-uri text transformers wai warp @@ -201889,8 +202534,8 @@ self: { }: mkDerivation { pname = "prometheus-client"; - version = "1.0.0.1"; - sha256 = "0jmxmq4f3p8jlg7h5wlq0kk6z749fr4gmac5x9gim0mjjga6q0r7"; + version = "1.0.1"; + sha256 = "1gyclzl16dkq7yw84x0ppgmyav7scl4jvwq9b5ihzxy45crcdhin"; libraryHaskellDepends = [ atomic-primops base bytestring clock containers deepseq exceptions mtl stm text transformers transformers-compat utf8-string @@ -201942,8 +202587,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.1"; - sha256 = "18816z271daza8yl6sqagv4y26f977d66s26kvjq680pykcflxwx"; + version = "1.0.1.1"; + sha256 = "0afa29ym9jvagm8n99axj2qy6m4ps6qd07k1wlyb64078yc2nqn9"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -201974,8 +202619,8 @@ self: { }: mkDerivation { pname = "prometheus-wai-middleware"; - version = "1.0.0.0"; - sha256 = "0ndzhd0ghk9l2avi5agllfj3j1smamwplsnqlg0sav8n54r7n6wv"; + version = "1.0.1.0"; + sha256 = "1srp4j7841wfc29x5x8wkykjdqzdln26s219zrq15f5vir14lpar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208174,6 +208819,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rdf_0_1_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , dlist, fgl, text, transformers + }: + mkDerivation { + pname = "rdf"; + version = "0.1.0.4"; + sha256 = "1ncvh2rkxmy3k3scrpf7zyambvr94s5hq6n2yb4h7f5yx6xzr0wk"; + libraryHaskellDepends = [ + attoparsec base bytestring deepseq dlist fgl text transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Representation and Incremental Processing of RDF Data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rdf4h" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base, binary , bytestring, containers, criterion, deepseq, directory, exceptions @@ -208979,6 +209643,34 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "reanimate_0_4_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base + , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour + , containers, cubicbezier, directory, earcut, filepath, fsnotify + , geojson, hashable, hmatrix, JuicyPixels, lens, linear, matrix + , mtl, neat-interpolation, open-browser, optparse-applicative + , parallel, process, random, random-shuffle, reanimate-svg, split + , temporary, text, time, vector, vector-space, websockets, xml + }: + mkDerivation { + pname = "reanimate"; + version = "0.4.1.0"; + sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal array attoparsec base base64-bytestring + bytestring cassava cereal chiphunk colour containers cubicbezier + directory earcut filepath fsnotify geojson hashable hmatrix + JuicyPixels lens linear matrix mtl neat-interpolation open-browser + optparse-applicative parallel process random random-shuffle + reanimate-svg split temporary text time vector vector-space + websockets xml + ]; + description = "Animation library based on SVGs"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reanimate-svg" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , double-conversion, hspec, JuicyPixels, lens, linear, mtl @@ -208999,6 +209691,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reanimate-svg_0_10_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , double-conversion, hspec, JuicyPixels, lens, linear, mtl + , scientific, svg-tree, text, transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.10.0.0"; + sha256 = "16m1829ashjwmsammqhxkifxpgwnhvxf84w36hqr3f0g0zmhfhai"; + libraryHaskellDepends = [ + attoparsec base bytestring containers double-conversion JuicyPixels + lens linear mtl scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reason-export" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck @@ -216567,6 +217280,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rpmbuild-order_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, case-insensitive + , containers, directory, extra, fgl, filepath, hspec + , optparse-applicative, process, simple-cmd-args + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.0"; + sha256 = "1whjid4nml07wyy9al9w63213qbd2iacwz8dsfv7a9b3vn31yd3k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal case-insensitive containers directory extra fgl filepath + process + ]; + executableHaskellDepends = [ + base bytestring directory extra fgl optparse-applicative + simple-cmd-args + ]; + testHaskellDepends = [ base hspec ]; + description = "Order RPM packages by dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -217072,6 +217810,21 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "runhs" = callPackage + ({ mkDerivation, base, bytestring, file-embed, process, yaml }: + mkDerivation { + pname = "runhs"; + version = "1.0.0.3"; + sha256 = "019aabgxfkan0l3i8wawya84wix3qmclsx0lsc8p6hvz5fjdlx21"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring file-embed process yaml + ]; + description = "Stack wrapper for single-file Haskell programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "runmany" = callPackage ({ mkDerivation, async, base, bytestring, optparse-applicative , process, stm @@ -217425,8 +218178,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "2"; - editedCabalFile = "0qaqvczy8v4ghx6d0hjc2hk29z02l8ya5y3ii3rr7bp47b1z8z0i"; + revision = "3"; + editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -221803,8 +222556,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "seqid"; - version = "0.6.1"; - sha256 = "0gqmnckrrs85cwz2jvp2ip7a5c5qfbav4nb9d8bxax093jziz301"; + version = "0.6.2"; + sha256 = "07xxpdrr3lqqnzcxbync46c0kz3d2i7k4day630a6x6zmzpyay0i"; libraryHaskellDepends = [ base mtl transformers ]; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; @@ -221826,8 +222579,8 @@ self: { ({ mkDerivation, base, io-streams, seqid }: mkDerivation { pname = "seqid-streams"; - version = "0.7.1"; - sha256 = "0yasm87kjhdq13zacpd4qa3kssalwvkipf3rz2cq1dgdgps5mxf7"; + version = "0.7.2"; + sha256 = "0dd0vxs216ri0hdkz49hzzrryil7hhqb55cc9z6ca8f337imanm8"; libraryHaskellDepends = [ base io-streams seqid ]; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -221925,7 +222678,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sequence-formats_1_5_1" = callPackage + "sequence-formats_1_5_1_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -221933,8 +222686,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.5.1"; - sha256 = "0nm6g02cn6fzhzhydmw0kwl41r9r9bqnwpk2cynlmvylghmnkmmj"; + version = "1.5.1.1"; + sha256 = "1gfss5fnv16xg6qxsazh1r7jd9qv5klpnjl6fbmk8p4n7cy5rsxx"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -222282,7 +223035,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_17" = callPackage + "servant_0_18" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, deepseq, hspec, hspec-discover , http-api-data, http-media, http-types, mmorph, mtl, network-uri @@ -222291,8 +223044,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.17"; - sha256 = "0hrqwb9cin6wbwwqaw68i84ai46897ir4gy4issc6ya2qqmfq1ks"; + version = "0.18"; + sha256 = "1dcb92q8w2fim087plspf1hs2gq2hdfiaggp71jqbljhnznlf5vj"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph @@ -222841,7 +223594,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_17" = callPackage + "servant-client_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit @@ -222852,8 +223605,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.17"; - sha256 = "0161v6kfj4mm5rixw5lbm8sc2dng300xbwgdhi4d0fqxrx12kij7"; + version = "0.18"; + sha256 = "17m0cakf4apdrpq7wic9mbxcn2hd9cwh9xrcbxshabfffgkq791i"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -222895,7 +223648,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client-core_0_17" = callPackage + "servant-client-core_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck @@ -222903,8 +223656,8 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.17"; - sha256 = "1xskvmdr4998hj19wvhyb5rs5x193792f1b6ia7r21qdzp9garff"; + version = "0.18"; + sha256 = "198kixjiy34z05vavs18wb2kp62pk5bzr5cl7dvhkl73alvj3rhn"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -223481,8 +224234,8 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.17"; - sha256 = "1nyp6ijb8219yfbxrq2mz59m1vfpr56rbfn9j9zmx4pcvnb903xc"; + version = "0.18"; + sha256 = "1krpmmzjc1vagcy8rdgcl3zm8zlfjf8ikicaqrqp6d95f8bz4kaz"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -223784,7 +224537,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-mock_0_8_6" = callPackage + "servant-mock_0_8_7" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , bytestring-conversion, hspec, hspec-discover, hspec-wai , http-types, QuickCheck, servant, servant-server, transformers @@ -223792,8 +224545,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.8.6"; - sha256 = "1cr5davd7ldcm2a4f33mi74rk6qlgdqg7vzzfpf8kgxrc97syrrd"; + version = "0.8.7"; + sha256 = "0j8c9wb1njrl77hp94frlnjpbk2axlkcgbcyax6s4pmf9v3c8j6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224107,8 +224860,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.9.0"; - sha256 = "042g1y4dhfbvyppy4rkd1hxmv2n84j8cja5kny12a1q05ab616yk"; + version = "0.0.10.0"; + sha256 = "072q2nxapx9p1fkcs862a9irjhlg0sfpbr72a1m9a5lrfhf9ahmc"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -224390,7 +225143,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_17" = callPackage + "servant-server_0_18" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, directory, exceptions, filepath, hspec , hspec-discover, hspec-wai, http-api-data, http-media, http-types @@ -224401,10 +225154,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.17"; - sha256 = "11y7cb8r8bzkx3fb2cd5cbazxy87n0f4wm14qdxsz2g81k262k5l"; - revision = "1"; - editedCabalFile = "1kbdga7bi7slgcskqc3sb1xwmwif52dj8gvkxcskaw0b9xbdynhs"; + version = "0.18"; + sha256 = "0knbzr6ls9p2wjn3kfggy99gxavl817xw48m53plhf2r4s4vjrw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226184,8 +226935,8 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.3.0"; - sha256 = "1cnmwn63kx43khgy3n00sqla8pw11h7almir31zm0dzgld11znix"; + version = "0.4.5.0"; + sha256 = "1bhi4rfvhin16c4xhx50dxjhr2gfpngasv7fps9fhm6is372ln9v"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -226442,15 +227193,18 @@ self: { }) {}; "shake-plus-extended" = callPackage - ({ mkDerivation, base, comonad, extra, ixset-typed, path, rio - , shake, shake-plus, within + ({ mkDerivation, base, comonad, extra, ixset-typed + , ixset-typed-binary-instance, ixset-typed-hashable-instance, path + , path-binary-instance, rio, shake, shake-plus, within }: mkDerivation { pname = "shake-plus-extended"; - version = "0.1.0.0"; - sha256 = "1c91h4hfc20b9153mysq0fflgjqiq6b0q8hhp9iyp9j2dmlq7nw4"; + version = "0.3.0.0"; + sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4"; libraryHaskellDepends = [ - base comonad extra ixset-typed path rio shake shake-plus within + base comonad extra ixset-typed ixset-typed-binary-instance + ixset-typed-hashable-instance path path-binary-instance rio shake + shake-plus within ]; description = "Experimental extensions to shake-plus"; license = stdenv.lib.licenses.mit; @@ -229843,6 +230597,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_9" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core + }: + mkDerivation { + pname = "skylighting"; + version = "0.9"; + sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -229875,6 +230647,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_9" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.9"; + sha256 = "0gljyp007pcym2b0azg0sn654kmss9xwim84xw7hxc1q8rwvdxhr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl safe text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text utf8-string + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -230395,8 +231199,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.2.2"; - sha256 = "0jja57dcalxd1qp7fj338jwbpaxm1l3ika2zyd9rv3dk2k1xn6rj"; + version = "0.3.0"; + sha256 = "18nncc771b16ngkihza9skx1n73w811sg1p2hphp5pl7vkbl4wkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230404,13 +231208,9 @@ self: { elynx-tree hmatrix megaparsec monad-logger mwc-random optparse-applicative scientific text transformers vector ]; - executableHaskellDepends = [ - async base bytestring containers elynx-seq elynx-tools hmatrix - megaparsec monad-logger mwc-random optparse-applicative scientific - text transformers vector - ]; + executableHaskellDepends = [ base elynx-seq elynx-tools ]; description = "Handle molecular sequences"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -233482,27 +234282,30 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, extra - , filepath, hspec, megaparsec, mtl, process, template-haskell - , temporary, text, type-errors-pretty, vector + ({ mkDerivation, array, base, containers, deepseq, directory, extra + , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl + , process, template-haskell, temporary, text, type-errors-pretty + , vector }: mkDerivation { pname = "souffle-haskell"; - version = "1.0.0"; - sha256 = "1n2xxdmzsxdkn28j2wrrphhsg1y0v9s5xcq114g72785lr25n48r"; + version = "1.1.0"; + sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq directory filepath mtl process template-haskell + array base deepseq directory filepath mtl process template-haskell temporary text type-errors-pretty vector ]; executableHaskellDepends = [ - base containers deepseq directory extra filepath megaparsec mtl - process template-haskell temporary text type-errors-pretty vector + array base containers deepseq directory extra filepath megaparsec + mtl process template-haskell temporary text type-errors-pretty + vector ]; testHaskellDepends = [ - base deepseq directory filepath hspec mtl process template-haskell - temporary text type-errors-pretty vector + array base deepseq directory filepath hedgehog hspec hspec-hedgehog + mtl process template-haskell temporary text type-errors-pretty + vector ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -235845,6 +236648,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_2_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, file-embed, filepath, gitrev, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl + , optparse-applicative, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "2.2.0"; + sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory filepath + megaparsec mtl template-haskell text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base filepath gitrev optparse-applicative text + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec template-haskell text yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal @@ -236671,6 +237509,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "stackcollapse-ghc_0_0_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec + , hspec-golden, recursion-schemes, rosezipper, safe, text + , transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.3"; + sha256 = "05271x47b2aik2msfm9f6jsazb174p667acwyd84vs73nygpbmdk"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -238519,15 +239381,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_55_0" = callPackage + "stratosphere_0_56_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.55.0"; - sha256 = "0fs0npxspfg3yj03dzjq1a02z3ca3s82z6v92f3cb1bkn0dsqhq2"; + version = "0.56.0"; + sha256 = "00pszcypf0ckagxx2l5ldl0m6kacr3xbmw0yxfcjh6hs34543v8n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238921,28 +239783,6 @@ self: { }) {}; "streaming-commons" = callPackage - ({ mkDerivation, array, async, base, bytestring, deepseq, directory - , gauge, hspec, network, process, QuickCheck, random, stm, text - , transformers, unix, zlib - }: - mkDerivation { - pname = "streaming-commons"; - version = "0.2.2.0"; - sha256 = "0641z37cvd3sx5vn6irg7haa1mmyac7s1jw4bgd3f5kagmqlwrcs"; - libraryHaskellDepends = [ - array async base bytestring directory network process random stm - text transformers unix zlib - ]; - testHaskellDepends = [ - array async base bytestring deepseq hspec network QuickCheck text - unix zlib - ]; - benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; - description = "Common lower-level functions needed by various streaming data libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "streaming-commons_0_2_2_1" = callPackage ({ mkDerivation, array, async, base, bytestring, deepseq, directory , gauge, hspec, network, process, QuickCheck, random, stm, text , transformers, unix, zlib @@ -238962,7 +239802,6 @@ self: { benchmarkHaskellDepends = [ base bytestring deepseq gauge text ]; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-concurrency" = callPackage @@ -239327,6 +240166,8 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {archive = null;}; "streamly-binary" = callPackage @@ -239414,8 +240255,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.0.1"; - sha256 = "0ddzvhjwar2sj69b851avcsf7g5bph2kcc0m77inxj0jbnvmhd2g"; + version = "0.0.1.1"; + sha256 = "080w7c9dgw4dixnxhvpjnii53c5sk00h18vwps973q51qhl9qa18"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -242091,8 +242932,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.0.2"; - sha256 = "1arvkf3l24yvssdsnidb5jv9h11wxbxzfcjxl2z9b9djpv0qkvy1"; + version = "0.1.0.3"; + sha256 = "17xqkhlxqkmn1ayhsxl1pw3y4fqxbq4lcdaq9ispp57qd3dcvd7v"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -249873,25 +250714,26 @@ self: { }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, http-client - , http-client-tls, http-types, mtl, tasty, tasty-hunit, text - , text-binary, time, time-locale-compat, transformers + ({ mkDerivation, aeson, base, http-client, http-client-tls + , http-types, mtl, relude, tasty, tasty-hunit, text, time }: mkDerivation { pname = "themoviedb"; - version = "1.1.5.2"; - sha256 = "0pp603wvq03m56w0y12abjqbfv712aj3k6ki69jq60l9pxj4nni4"; + version = "1.2.0.0"; + sha256 = "1dchnsk9mx2v01apj5ilnsl3w9vj6f5pkqrm9701zw7rcp7xds0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls http-types - mtl text text-binary time time-locale-compat transformers + aeson base http-client http-client-tls http-types mtl relude text + time ]; executableHaskellDepends = [ - base text time time-locale-compat transformers + aeson base http-client http-client-tls http-types mtl relude text + time ]; testHaskellDepends = [ - base bytestring tasty tasty-hunit text time + aeson base http-client http-client-tls http-types mtl relude tasty + tasty-hunit text time ]; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; @@ -250111,6 +250953,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thread-hierarchy_0_3_0_2" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover, stm }: + mkDerivation { + pname = "thread-hierarchy"; + version = "0.3.0.2"; + sha256 = "1bhx1s7xwf4gb8qjbbifwl5cq3gfc1girrmzm4vr0fj05myk9xph"; + libraryHaskellDepends = [ base containers stm ]; + testHaskellDepends = [ base containers hspec stm ]; + testToolDepends = [ hspec-discover ]; + description = "Simple Haskell thread management in hierarchical manner"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thread-local-storage" = callPackage ({ mkDerivation, atomic-primops, base, containers, criterion }: mkDerivation { @@ -250142,6 +250998,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "thread-supervisor_0_1_0_1" = callPackage + ({ mkDerivation, base, clock, containers, data-default, hspec + , hspec-discover, QuickCheck, unliftio + }: + mkDerivation { + pname = "thread-supervisor"; + version = "0.1.0.1"; + sha256 = "0x10i81cvp5m5rx48mdhrxcs5rpcmbr2xrv3aq9s3lqdchy2vqzy"; + libraryHaskellDepends = [ + base clock containers data-default unliftio + ]; + testHaskellDepends = [ + base clock data-default hspec QuickCheck unliftio + ]; + testToolDepends = [ hspec-discover ]; + description = "A simplified implementation of Erlang/OTP like supervisor over thread"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -252283,8 +253159,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.2.2"; - sha256 = "0hf70zvcndjmlwbd2n2ncbl89xi2xmkr7ymq48hmdlg3vp0bdz62"; + version = "0.3.0"; + sha256 = "070r7j87s3206a5hpkhlfszpnpc7ngil88r6iq2752kijjik2x6v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252293,14 +253169,9 @@ self: { optparse-applicative parallel primitive scientific statistics text transformers vector ]; - executableHaskellDepends = [ - aeson array base bytestring comonad containers elynx-tools gnuplot - lifted-async megaparsec monad-logger mwc-random - optparse-applicative parallel primitive scientific statistics text - transformers vector - ]; + executableHaskellDepends = [ base elynx-tools ]; description = "Handle phylogenetic trees"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -253777,6 +254648,40 @@ self: { broken = true; }) {}; + "trade-journal" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , data-default, gmp, hedgehog, here, HUnit, lens, megaparsec, mpfr + , mtl, optparse-applicative, pretty, pretty-show, profunctors + , split, tasty, tasty-hedgehog, tasty-hunit, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "trade-journal"; + version = "0.0.1"; + sha256 = "1zmpqwrgwf26l9gwcavhgq8d9w0bc9c5sjqkr0i7d1rbiqiqf94j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cassava containers data-default lens + megaparsec mtl pretty pretty-show profunctors split text time + transformers unordered-containers vector + ]; + librarySystemDepends = [ gmp mpfr ]; + executableHaskellDepends = [ + aeson base bytestring cassava containers lens megaparsec mtl + optparse-applicative pretty-show text time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring cassava containers hedgehog here HUnit lens + megaparsec mtl pretty-show tasty tasty-hedgehog tasty-hunit text + time transformers unordered-containers + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; + "traildb" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, criterion , deepseq, directory, exceptions, Judy, primitive, profunctors @@ -253995,8 +254900,8 @@ self: { }: mkDerivation { pname = "transformers-abort"; - version = "0.6.0.1"; - sha256 = "0qd4nzrmp03mbikwmvabbygx3dv9c2v7lpp2cvrz96y9gj0a3k2a"; + version = "0.6.0.3"; + sha256 = "0svqpgwkg06k2hnhxxlx4nwn45r52azqa2gnrz8j538k75kzlglq"; libraryHaskellDepends = [ base monad-control pointed semigroupoids transformers transformers-base @@ -254220,34 +255125,37 @@ self: { }) {}; "transient-universe" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , directory, filepath, hashable, HTTP, iproute, mtl, network - , network-info, network-uri, process, random, stm, TCache, text - , time, transformers, transient, vector, websockets + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, directory, filepath, hashable, HTTP + , iproute, mtl, network, network-info, network-uri, old-time + , process, random, stm, TCache, text, time, transformers, transient + , vector, websockets }: mkDerivation { pname = "transient-universe"; - version = "0.5.0.0"; - sha256 = "1d3bp4xjpi28ph7fa9wm49ssg53jfvlq77ka0zvrkilw1j6f8v3l"; + version = "0.6.0.1"; + sha256 = "1dhgp2z0q90pnz13s88pbg6ppwl9ic7g04ikla3hg2jh019lgb1r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP iproute mtl network network-info network-uri process - random stm TCache text time transformers transient vector - websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP iproute mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; executableHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; testHaskellDepends = [ - base bytestring case-insensitive containers directory filepath - hashable HTTP mtl network network-info network-uri process random - stm TCache text time transformers transient vector websockets + aeson base base64-bytestring bytestring case-insensitive containers + directory filepath hashable HTTP mtl network network-info + network-uri old-time process random stm TCache text time + transformers transient vector websockets ]; - description = "Remote execution and map-reduce: distributed computing for Transient"; + description = "fully composable remote execution for the creation of distributed systems"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -256202,6 +257110,8 @@ self: { ]; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -257706,8 +258616,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.4.2.0"; - sha256 = "19ng2cf68v2j6csw39zxh756amq195479v883y5lgkvjzsx37dbn"; + version = "0.5.0.0"; + sha256 = "05hzcyp1lsf3dakdv3kqdl0hw6pz5mzh644d3k8lasrhrmx8l583"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -258768,8 +259678,8 @@ self: { ({ mkDerivation, base, io-streams, unagi-chan }: mkDerivation { pname = "unagi-streams"; - version = "0.2.6"; - sha256 = "1mw5h7dizrh4bg1avah201chfl96lapaj3141czfs9w8hyq4lp9h"; + version = "0.2.7"; + sha256 = "11vr8zxyksqb2np6f77d9ai6xrb7fpfjbgv191h3pppcanysm4w3"; libraryHaskellDepends = [ base io-streams unagi-chan ]; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; @@ -258804,26 +259714,18 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, async, base, bytestring, chronologique, containers - , core-data, core-program, core-text, deepseq, directory - , exceptions, filepath, fingertree, fsnotify, gauge, hashable - , hourglass, hspec, megaparsec, mtl, prettyprinter - , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm - , template-haskell, terminal-size, text, text-short, transformers - , unix, unordered-containers + ({ mkDerivation, base, bytestring, core-data, core-program + , core-text, fingertree, gauge, hashable, hspec, safe-exceptions + , text, text-short }: mkDerivation { pname = "unbeliever"; - version = "0.10.0.5"; - sha256 = "1h0zy19vfhg1x671yhfsr1rbpr7c9jhbr0lxhj7cb25jm94hjajw"; + version = "0.10.0.6"; + sha256 = "08rw2krphvs2z0ic19mfwlz3fcmpnbwbpvp7ks22pasi2zy45sb2"; libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ - async base bytestring chronologique containers core-data - core-program core-text deepseq directory exceptions filepath - fingertree fsnotify hashable hourglass hspec megaparsec mtl - prettyprinter prettyprinter-ansi-terminal safe-exceptions - scientific stm template-haskell terminal-size text text-short - transformers unix unordered-containers + base bytestring core-data core-program core-text fingertree + hashable hspec safe-exceptions text text-short ]; benchmarkHaskellDepends = [ base bytestring core-data core-program core-text gauge text @@ -258831,6 +259733,8 @@ self: { doHaddock = false; description = "Opinionated Haskell Interoperability"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "unbound" = callPackage @@ -264418,29 +265322,31 @@ self: { }) {}; "vimeta" = callPackage - ({ mkDerivation, aeson, base, byline, bytestring, containers - , directory, either, filepath, http-client, http-client-tls - , http-types, mtl, old-locale, optparse-applicative, parsec - , process, temporary, text, themoviedb, time, time-locale-compat - , transformers, xdg-basedir, yaml + ({ mkDerivation, aeson, base, byline, bytestring, directory + , exceptions, filepath, http-client, http-client-tls, http-types + , mtl, optparse-applicative, parsec, process, relude, temporary + , text, themoviedb, time, yaml }: mkDerivation { pname = "vimeta"; - version = "0.2.5.1"; - sha256 = "1v46b0215mcyhxma3ascg3paz683j8xqsf4czs8syx4amyls36qg"; - revision = "1"; - editedCabalFile = "1na8qghd918ck1pg058anbh9iy3w4x7hf72ygfwfy23hw00wn5j4"; + version = "0.3.0.0"; + sha256 = "0npz5mx9w6srz5p0is3yzgfwssakdycv8h0h38ff7q0sivq3pfnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base byline bytestring containers directory either filepath - http-client http-client-tls http-types mtl old-locale - optparse-applicative parsec process temporary text themoviedb time - time-locale-compat transformers xdg-basedir yaml + aeson base byline bytestring directory exceptions filepath + http-client http-client-tls http-types mtl optparse-applicative + parsec process relude temporary text themoviedb time yaml + ]; + executableHaskellDepends = [ + aeson base byline bytestring directory exceptions filepath + http-client http-client-tls http-types mtl optparse-applicative + parsec process relude temporary text themoviedb time yaml ]; - executableHaskellDepends = [ base ]; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vimus" = callPackage @@ -265496,13 +266402,13 @@ self: { }: mkDerivation { pname = "wai-control"; - version = "0.1.0.1"; - sha256 = "110zv6q5ya997sn21sd5mwgj9vx73afnwxzvi0xvv198gh6wc7iq"; + version = "0.1.0.2"; + sha256 = "0ygcqxyp8mmw81rrlk20ziyghi6snrzyyqgfllbh5b6jhx6z017h"; libraryHaskellDepends = [ base monad-control-identity transformers-base wai wai-websockets websockets ]; - description = "Give wai Applications an IO-based inner monad"; + description = "Run wai Applications in IO based monads"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -268428,6 +269334,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-api_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 + , bytestring, conduit, data-default, hspec, hspec-discover + , http-conduit, http-types, network-uri, optparse-applicative, text + , utf8-string, wai, warp + }: + mkDerivation { + pname = "webex-teams-api"; + version = "0.2.0.1"; + sha256 = "11qivxmp0cx3jsrpbp2zdfjhjrcd960ycbr08li3d327ff2qhdsh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bitset-word8 bytestring conduit data-default + http-conduit network-uri text + ]; + executableHaskellDepends = [ + aeson base bytestring data-default http-conduit + optparse-applicative text utf8-string + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring data-default hspec + http-conduit http-types network-uri text wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell bindings for Webex Teams API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webex-teams-conduit" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , data-default, hspec, http-client, http-conduit, http-types @@ -268453,6 +269389,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-conduit_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , data-default, hspec, hspec-discover, http-client, http-conduit + , http-types, network-uri, optparse-applicative, text, utf8-string + , wai, warp, webex-teams-api + }: + mkDerivation { + pname = "webex-teams-conduit"; + version = "0.2.0.1"; + sha256 = "0ig4krcvc256lyrqvj6g4kjklln5m7sm44c4bvbgkgr3lmrpfkr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base conduit webex-teams-api ]; + executableHaskellDepends = [ + base bytestring conduit data-default http-client + optparse-applicative text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring conduit data-default hspec http-conduit + http-types network-uri text wai warp webex-teams-api + ]; + testToolDepends = [ hspec-discover ]; + description = "Conduit wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webex-teams-pipes" = callPackage ({ mkDerivation, aeson, async, base, bytestring, data-default , hspec, http-client, http-conduit, http-types, network-uri @@ -268478,6 +269441,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webex-teams-pipes_0_2_0_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, data-default + , hspec, hspec-discover, http-client, http-conduit, http-types + , network-uri, optparse-applicative, pipes, text, utf8-string, wai + , warp, webex-teams-api + }: + mkDerivation { + pname = "webex-teams-pipes"; + version = "0.2.0.1"; + sha256 = "094wvrnv0609gp0iya34pciw2hc5wi7fax5wjwr3n1lmwdgf7i4g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes webex-teams-api ]; + executableHaskellDepends = [ + base bytestring data-default http-client optparse-applicative pipes + text utf8-string webex-teams-api + ]; + testHaskellDepends = [ + aeson async base bytestring data-default hspec http-conduit + http-types network-uri pipes text wai warp webex-teams-api + ]; + testToolDepends = [ hspec-discover ]; + description = "Pipes wrapper of Webex Teams List API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webfinger-client" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , hashable, http-client, http-client-tls, http-types @@ -274762,23 +275752,19 @@ self: { }) {}; "yapb" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , directory, hashable, json, network, pretty, prettyprinter + ({ mkDerivation, base, bytestring, directory, hashable, network , process, regex-tdfa }: mkDerivation { pname = "yapb"; - version = "0.1.0"; - sha256 = "184jrkyijlp644r4zgvicy9xlrx29xmbn7jszpwp3jk5yfavm5w2"; + version = "0.1.1"; + sha256 = "1zbk2whfi09wzx9ql4dhkbg50s7v45y309avxljypg7z9i9pvx3x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory hashable process regex-tdfa - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers json network pretty - prettyprinter regex-tdfa + base bytestring directory hashable network process regex-tdfa ]; + executableHaskellDepends = [ base regex-tdfa ]; testHaskellDepends = [ base ]; description = "Yet Another Parser Builder (YAPB)"; license = stdenv.lib.licenses.bsd3; @@ -279057,6 +280043,23 @@ self: { license = stdenv.lib.licenses.gpl2Plus; }) {}; + "zio" = callPackage + ({ mkDerivation, base, mtl, transformers, unexceptionalio + , unexceptionalio-trans + }: + mkDerivation { + pname = "zio"; + version = "0.1.0.0"; + sha256 = "001bkysr4n5azly7cmn7xbgw0bg00ib4yg83klz0k0b5217wg982"; + libraryHaskellDepends = [ + base mtl transformers unexceptionalio unexceptionalio-trans + ]; + testHaskellDepends = [ + base mtl transformers unexceptionalio unexceptionalio-trans + ]; + license = stdenv.lib.licenses.mpl20; + }) {}; + "zip" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory From 1009a6bb0c83e058d995dd98ada1052343ff4b2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:21:45 +0200 Subject: [PATCH 026/234] hackage2nix: build the package set for the proper compiler version --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index daf0041f1c3d5..fed60f0a32472 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.8.3 +compiler: ghc-8.8.4 core-packages: - array-0.5.4.0 From 4cf983bda824766cbf99c297dea5bf9d49f21146 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:16:06 +0200 Subject: [PATCH 027/234] hackage2nix: update list of broken packages to fix evaluation --- .../configuration-hackage2nix.yaml | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fed60f0a32472..b96f15c8a1945 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2646,10 +2646,8 @@ package-maintainers: - streaming-wai kiwi: - glirc - - matterhorn - mattermost-api - mattermost-api-qc - - Unique psibi: - path-pieces - persistent @@ -3557,9 +3555,11 @@ broken-packages: - buster - buster-gtk - buster-network + - bustle - butter - butterflies - bv-sized + - byline - bytable - bytearray-parsing - bytebuild @@ -4668,6 +4668,7 @@ broken-packages: - elm-websocket - elynx - elynx-markov + - elynx-nexus - elynx-seq - elynx-tools - elynx-tree @@ -6620,6 +6621,7 @@ broken-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-prim-bits - hw-rankselect - hw-simd - hw-succinct @@ -6799,6 +6801,7 @@ broken-packages: - integer-pure - integreat - intel-aes + - intensional-datatys - interlude-l - InternedData - internetmarke @@ -7341,7 +7344,15 @@ broken-packages: - lio-simple - lipsum-gen - liquid + - liquid-base + - liquid-bytestring + - liquid-containers - liquid-fixpoint + - liquid-ghc-prim + - liquid-parallel + - liquid-platform + - liquid-prelude + - liquid-vector - liquidhaskell - liquidhaskell-cabal - Liquorice @@ -7581,6 +7592,7 @@ broken-packages: - matrix-market - matrix-sized - matsuri + - matterhorn - maude - maxent - maxent-learner-hw @@ -7885,6 +7897,7 @@ broken-packages: - multibase - multifocal - multihash + - multihash-cryptonite - multihash-serialise - multilinear - multilinear-io @@ -8605,6 +8618,7 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-optics - polysemy-RandomFu - polysemy-webserver - polysemy-zoo @@ -9980,6 +9994,7 @@ broken-packages: - streaming-png - streaming-process - streaming-sort + - streamly-archive - streamly-lmdb - streamproc - strelka @@ -10408,6 +10423,7 @@ broken-packages: - trackit - traction - tracy + - trade-journal - traildb - trajectory - transactional-events @@ -10488,6 +10504,7 @@ broken-packages: - turingMachine - turtle-options - tweak + - twee - tweet-hs - twentefp-eventloop-graphics - twentefp-eventloop-trees @@ -10577,6 +10594,7 @@ broken-packages: - UMM - unagi-bloomfilter - unamb-custom + - unbeliever - unbound - unbound-generics - unbound-kind-generics @@ -10600,6 +10618,7 @@ broken-packages: - uniform-io - union - union-map + - Unique - uniqueid - uniquely-represented-sets - units-attoparsec @@ -10763,6 +10782,7 @@ broken-packages: - views - vigilance - Villefort + - vimeta - vimus - vintage-basic - vinyl-gl From ea9e607093dd910a47fa69907a3d867d0a1a83f8 Mon Sep 17 00:00:00 2001 From: ken Date: Sun, 26 Jul 2020 23:57:17 -0500 Subject: [PATCH 028/234] haskellPackages.hasql-migration unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b96f15c8a1945..ed636cdc33c4f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5904,7 +5904,6 @@ broken-packages: - hasql-dynamic-statements - hasql-generic - hasql-implicits - - hasql-migration - hasql-optparse-applicative - hasql-postgres - hasql-postgres-options From 05933a1506cda1ada950d8657c228ddccb1ac803 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 27 Jul 2020 10:31:43 +0200 Subject: [PATCH 029/234] haskellPackages.haskeline_0_8_0_0: add dontCheck Testsuite is trying to access executable which is part of the package being built. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8810444cce649..dc5ce78461d65 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1451,4 +1451,7 @@ self: super: { }; }; + # Testsuite trying to run `which haskeline-examples-Test` + haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 11817b92a3e4255ab2c7d0aeab9f8b88062610e3 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 27 Jul 2020 10:32:51 +0200 Subject: [PATCH 030/234] haskellPackages.zre: use repline_0_4_0_0 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc5ce78461d65..578db07300ae4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1454,4 +1454,11 @@ self: super: { # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + # Requires repline 0.4 which is the default only for ghc8101, override for the rest + zre = super.zre.override { + repline = self.repline_0_4_0_0.override { + haskeline = self.haskeline_0_8_0_0; + }; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 4c97a486b1565686dfa97b0c3a8a9eaa1f1aa82d Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Wed, 29 Jul 2020 15:39:18 +0200 Subject: [PATCH 031/234] bytebuild: disable test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 578db07300ae4..9879c8e6fdc7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -460,6 +460,9 @@ self: super: { bytestring-strict-builder = dontCheck super.bytestring-strict-builder; bytestring-tree-builder = dontCheck super.bytestring-tree-builder; + # https://github.com/byteverse/bytebuild/issues/19 + bytebuild = dontCheck super.bytebuild; + # https://github.com/ndmitchell/shake/issues/206 # https://github.com/ndmitchell/shake/issues/267 shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ed636cdc33c4f..024a2ed132fb1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3562,7 +3562,6 @@ broken-packages: - byline - bytable - bytearray-parsing - - bytebuild - bytelog - bytestring-arbitrary - bytestring-builder-varword From a16fe53478285ea81c6177bb6145347947e46b44 Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Wed, 29 Jul 2020 15:44:14 +0200 Subject: [PATCH 032/234] ip: disable test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9879c8e6fdc7c..9e82ab9f9ec47 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -463,6 +463,9 @@ self: super: { # https://github.com/byteverse/bytebuild/issues/19 bytebuild = dontCheck super.bytebuild; + # https://github.com/andrewthad/haskell-ip/issues/67 + ip = dontCheck super.ip; + # https://github.com/ndmitchell/shake/issues/206 # https://github.com/ndmitchell/shake/issues/267 shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 024a2ed132fb1..57c505d0c450d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6829,7 +6829,6 @@ broken-packages: - iostring - iothread - iotransaction - - ip - ip2location - ip2proxy - ipatch From 9aebf3bcb2a710a5fabc40d9e0751c78a46e1e14 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 29 Jul 2020 21:18:07 +0200 Subject: [PATCH 033/234] haskellPackages.hnix: fix build for ghc-8.10 by adding repline --- .../haskell-modules/configuration-ghc-8.10.x.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 69f212dad9af9..6be0c3c9b1a14 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -111,6 +111,10 @@ self: super: { }); # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. - hnix = generateOptparseApplicativeCompletion "hnix" super.hnix; + hnix = generateOptparseApplicativeCompletion "hnix" + (overrideCabal super.hnix (drv: { + # executable is allowed for ghc >= 8.10 and needs repline + executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; + })); } From bbf5968f31852d8c3e42ed62277f0cec753eb959 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Thu, 30 Jul 2020 08:58:28 +0200 Subject: [PATCH 034/234] haskellPackages.haskell-language-server+hls-ide: fix lsp-test override --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9e82ab9f9ec47..873ed8dddcfb5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1348,7 +1348,7 @@ self: super: { })).override { # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_2; + lsp-test = dontCheck self.lsp-test_0_11_0_3; }); haskell-language-server = (overrideCabal super.haskell-language-server @@ -1368,7 +1368,7 @@ self: super: { ghcide = self.hls-ghcide; # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_2; + lsp-test = dontCheck self.lsp-test_0_11_0_3; }; # https://github.com/kowainik/policeman/issues/57 From b5910e471319d4b77787990e4b822d9d49a186d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 17:33:47 +0200 Subject: [PATCH 035/234] haskell-streaming-commons: drop obsolete version override --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 873ed8dddcfb5..31c7e319579de 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,9 +1393,6 @@ self: super: { sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }); - # The current LTS 15.x version has a bug in the test suite. - streaming-commons = self.streaming-commons_0_2_2_1; - # Version bumps have not been merged by upstream yet. # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5 dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { From 46598fa90c0ddba53c6da2d14178848636b92248 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jul 2020 20:59:34 +0200 Subject: [PATCH 036/234] all-cabal-hashes: update to Hackage at 2020-07-30T22:14:54Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index c7528db49f11d..b1b8d6ce90268 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/8af27e77a015d06c7a8fe49a430fd5334a93ebf7.tar.gz"; - sha256 = "1w5cfcvliy1ly8iq42l76ai5wgfnrwxf6hw5kq6p913qhhrcn5wr"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/edb0920a8dbbd592d67a781d0b905728515ab623.tar.gz"; + sha256 = "08yvpwzw7c3xw3w970ysykj44vglqfiq057kx0axk81s68v83rcy"; } From 046989d6eea54ce5af27e84cbce31c2aea0da587 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Fri, 31 Jul 2020 21:45:35 +0200 Subject: [PATCH 037/234] bambootracker: init at 0.4.3 --- .../audio/bambootracker/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/audio/bambootracker/default.nix diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix new file mode 100644 index 0000000000000..c74c0ca4eff05 --- /dev/null +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -0,0 +1,72 @@ +{ mkDerivation +, stdenv +, fetchFromGitHub +, fetchpatch +, installShellFiles +, qmake +, qtbase +, qtmultimedia +, qttools +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsaLib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? stdenv.hostPlatform.isUnix +, libjack2 +}: +let + + inherit (stdenv.lib) optional optionals; + +in +mkDerivation rec { + pname = "bambootracker"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "rerrahkr"; + repo = "BambooTracker"; + rev = "v${version}"; + sha256 = "0gq40qmsdavsyl2d6a71rwp4mjlwvp1c8bry32srn4hliwfnvqa6"; + }; + + # Fix macOS build until new release + patches = [ + (fetchpatch { + url = "https://github.com/rerrahkr/BambooTracker/commit/45346ed99559d44c2e32a5c6138a0835b212e875.patch"; + sha256 = "1xkiqira1kpcqkacycy0y7qm1brhf89amliv42byijl4palmykh2"; + }) + ]; + + preConfigure = "cd BambooTracker"; + + nativeBuildInputs = [ qmake qttools installShellFiles ]; + + buildInputs = [ qtbase qtmultimedia ] + ++ optional alsaSupport alsaLib + ++ optional pulseSupport libpulseaudio + ++ optional jackSupport libjack2; + + qmakeFlags = [ "CONFIG+=release" "CONFIG-=debug" ] + ++ optional pulseSupport "CONFIG+=use_pulse" + ++ optionals jackSupport [ "CONFIG+=use_jack" "CONFIG+=jack_has_rename" ]; + + postInstall = '' + install -Dm644 ../BambooTracker.desktop $out/share/applications/BambooTracker.desktop + installManPage ../BambooTracker*.1 + + cp -r ../{demos,licenses,skins,LICENSE} $out/share/BambooTracker/ + + for size in 16x16 256x256; do + install -Dm644 res/icon/icon_$size.png $out/share/icons/hicolor/$size/apps/BambooTracker.png + done + ''; + + meta = with stdenv.lib; { + description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; + homepage = "https://github.com/rerrahkr/BambooTracker"; + license = licenses.gpl2Only; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2ec2f5573723..b69a1aa7220db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19099,6 +19099,8 @@ in azpainter = callPackage ../applications/graphics/azpainter { }; + bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; + cadence = qt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; From 10c8cd13d67be9436560093970e3689c33e56447 Mon Sep 17 00:00:00 2001 From: Ali Abrar Date: Fri, 17 Jul 2020 13:46:55 -0400 Subject: [PATCH 038/234] mattermost: 5.15.0 -> 5.25.0 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6327921aaac8e..520d28715d580 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.15.0"; + version = "5.25.0"; mattermost-server = buildGoPackage rec { pname = "mattermost-server"; @@ -11,7 +11,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "1bh53h0bmpc1qmnbpsmwkfrvj66z18m7b1xg7pqikid57ssqxjx9"; + sha256 = "002mbpgsk988pfjla84ngixq4jmgjgr3gj3h874y1njgz8xq0d92"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -29,7 +29,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "13xmc2y4pp0b0svzaf4v7ynx6rxcvznx3vqmlrpiil414s69xv45"; + sha256 = "08sp4idms7qyafk59plfzk380r72bphqa3ka648v25wh5h3293pn"; }; installPhase = '' From a4cebe8d1f4b72c90c07147575a523f9fa8c0c3f Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 20 Jul 2020 20:07:42 +0200 Subject: [PATCH 039/234] python3Packages.sh: 1.12.14 -> 1.13.1 Sandbox build will now succeed on Darwin and Linux Signed-off-by: Sirio Balmelli --- .../development/python-modules/sh/default.nix | 21 +++---- .../sh/disable-broken-tests-darwin.patch | 60 +++++++++---------- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index 913840110c911..de23241e37913 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -1,28 +1,22 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales, coreutils }: buildPythonPackage rec { pname = "sh"; - version = "1.12.14"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; + sha256 = "18w6wawmpzfh52s0jimwn59a7rfa7blrmg7bhwnq8siwbqhd58wp"; }; patches = [ - # Disable tests that fail on Darwin - # Some of the failures are due to Nix using GNU coreutils + # Disable tests that fail on Darwin sandbox ./disable-broken-tests-darwin.patch - # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468 - (fetchpatch { - url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch"; - sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94"; - excludes = [ ".travis.yml" ]; - }) ]; postPatch = '' sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py + sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py ''; checkInputs = [ coverage lsof glibcLocales ]; @@ -33,9 +27,10 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; - meta = { + meta = with lib; { description = "Python subprocess interface"; homepage = "https://pypi.python.org/pypi/sh/"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; }; } diff --git a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch index 6488dd1ffeaa5..c51490ce6a40f 100644 --- a/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch +++ b/pkgs/development/python-modules/sh/disable-broken-tests-darwin.patch @@ -1,49 +1,49 @@ -From 264f2f6a04d25156bba43524a6b172d2e99c53f4 Mon Sep 17 00:00:00 2001 -From: Ben Wolsieffer -Date: Fri, 21 Dec 2018 17:39:45 -0500 -Subject: [PATCH] Disable tests that fail on OSX. +From c596ad546fe7460b57a62799837757eb641309c1 Mon Sep 17 00:00:00 2001 +From: Sirio Balmelli +Date: Mon, 20 Jul 2020 19:51:20 +0200 +Subject: [PATCH] Disable tests that fail on Darwin (macOS) or with sandboxing -Some of the failures are due to the use of GNU ls. +Signed-off-by: Sirio Balmelli --- test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test.py b/test.py -index 68ef40c..2f53360 100644 +index f8029c0..ba1d141 100644 --- a/test.py +++ b/test.py -@@ -352,6 +352,7 @@ exit(3) +@@ -404,6 +404,7 @@ exit(3) self.assertEqual(sed(_in="one test three", e="s/test/two/").strip(), - "one two three") + "one two three") -+ @not_osx ++ @not_macos def test_ok_code(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 -@@ -498,6 +499,7 @@ while True: - self.assertEqual(out, match) +@@ -1004,6 +1005,7 @@ print(sys.argv[1]) + now = time.time() + self.assertGreater(now - start, sleep_time) - -+ @not_osx - def test_environment(self): - """ tests that environments variables that we pass into sh commands - exist in the environment, and on the sh module """ -@@ -861,6 +863,7 @@ print(sys.argv[1]) - self.assertTrue(now - start > sleep_time) - - -+ @not_osx ++ @not_macos def test_background_exception(self): from sh import ls, ErrorReturnCode_1, ErrorReturnCode_2 - p = ls("/ofawjeofj", _bg=True) # should not raise -@@ -2036,6 +2039,7 @@ else: - self.assertEqual(p, "test") - - -+ @not_osx - def test_signal_exception(self): - from sh import SignalException_15 + p = ls("/ofawjeofj", _bg=True, _bg_exc=False) # should not raise +@@ -1801,6 +1803,7 @@ exit(49) + p = python(py.name, _ok_code=49, _bg=True) + self.assertEqual(49, p.exit_code) + ++ @not_macos + def test_cwd(self): + from sh import pwd + from os.path import realpath +@@ -2899,6 +2902,7 @@ print("hi") + python(py.name, _in=stdin) + + @requires_utf8 ++ @skipUnless(False, "Does not work in sandbox") + def test_unicode_path(self): + from sh import Command -- -2.20.0 +2.27.0 From 9356f8194a441c3253975d02459a9054d82eebbc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 31 Jul 2020 16:09:51 +0300 Subject: [PATCH 040/234] slack: 4.4.3 -> 4.7.0 (linux), 4.6.0 -> 4.8.0 (darwin) --- .../instant-messengers/slack/default.nix | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index f46a293be9744..bebafe4319323 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , dpkg +, undmg , makeWrapper , nodePackages , alsaLib @@ -19,10 +20,12 @@ , gnome2 , gtk3 , libappindicator-gtk3 +, libdrm , libnotify , libpulseaudio , libuuid , libxcb +, mesa , nspr , nss , pango @@ -32,21 +35,26 @@ }: let - - pname = "slack"; - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - sha256 = { - x86_64-darwin = "09daxnqxyccshkrmr7ysgjvgvgmlgd590ym68fz0l8n6ayfpkgw0"; - x86_64-linux = "00ihhsgxm441nsmav7pq4n4y9s7p2r4x5dqld160658xyqi836cq"; + pname = "slack"; + version = { + x86_64-darwin = "4.8.0"; + x86_64-linux = "4.7.0"; }.${system} or throwSystem; - version = { - x86_64-darwin = "4.6.0"; - x86_64-linux = "4.4.3"; + src = let + base = "https://downloads.slack-edge.com"; + in { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; + }; + x86_64-linux = fetchurl { + url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; + sha256 = "1nwyl70caaz9k0hccfpkjli0jjc6m9zbjb3nf4bwmykpbxbzr9w3"; + }; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -58,11 +66,7 @@ let }; linux = stdenv.mkDerivation rec { - inherit pname meta version; - src = fetchurl { - url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - inherit sha256; - }; + inherit pname version src meta; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -81,10 +85,12 @@ let gnome2.GConf gtk3 libappindicator-gtk3 + libdrm libnotify libpulseaudio libuuid libxcb + mesa nspr nss pango @@ -143,21 +149,16 @@ let ''; }; - darwin = stdenv.mkDerivation rec { - inherit pname meta version; + darwin = stdenv.mkDerivation { + inherit pname version src meta; - phases = [ "installPhase" ]; + nativeBuildInputs = [ undmg ]; - src = fetchurl { - url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg"; - inherit sha256; - }; + sourceRoot = "Slack.app"; installPhase = '' - /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src - mkdir -p $out/Applications - cp -r ./slack-mnt/Slack.app $out/Applications - /usr/bin/hdiutil unmount slack-mnt + mkdir -p $out/Applications/Slack.app + cp -R . $out/Applications/Slack.app /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; From 92a2c91c1a7e5f46213622cc8616d08e10d5cd7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:52:25 +0000 Subject: [PATCH 041/234] cheat: 4.0.0 -> 4.0.2 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 42b03774749c8..3cc51c83616e4 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0j9w2rm8imb15njj7334xl6w0fgjvfqnrfvdq4zfsrwzl67ds86l"; + sha256 = "06dqwjyk7pmfxvkscn06sc307pxvyjqc6myighfsh3f5x83pg1nc"; }; subPackages = [ "cmd/cheat" ]; From 479fecc8a1759b2461a84b03580470fc20195856 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 1 Jul 2020 20:34:23 +0200 Subject: [PATCH 042/234] python3Packages.west: init at 0.7.2 Signed-off-by: Sirio Balmelli Co-authored-by: Joh --- .../python-modules/west/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/west/default.nix diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix new file mode 100644 index 0000000000000..3d4427f492d0e --- /dev/null +++ b/pkgs/development/python-modules/west/default.nix @@ -0,0 +1,53 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, colorama, configobj, packaging, pyyaml, pykwalify +}: + +buildPythonPackage rec { + version = "0.7.2"; + pname = "west"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "11dbzlcg48fymddqjrrs60pr7y33qjjv0y5zrfjc56gkc190gmz6"; + }; + + propagatedBuildInputs = [ + colorama + configobj + packaging + pyyaml + pykwalify + ]; + + # pypi package does not include tests (and for good reason): + # tests run under 'tox' and have west try to git clone repos (not sandboxable) + doCheck = false; + pythonImportsCheck = [ + "west" + ]; + + meta = with lib; { + homepage = "https://github.com/zephyrproject-rtos/west"; + description = "Zephyr RTOS meta tool"; + longDescription = '' + West lets you manage multiple Git repositories under a single directory using a single file, + called the west manifest file, or manifest for short. + + The manifest file is named west.yml. + You use west init to set up this directory, + then west update to fetch and/or update the repositories + named in the manifest. + + By default, west uses upstream Zephyr’s manifest file + (https://github.com/zephyrproject-rtos/zephyr/blob/master/west.yml), + but west doesn’t care if the manifest repository is a Zephyr tree or not. + + For more details, see Multiple Repository Management in the west documentation + (https://docs.zephyrproject.org/latest/guides/west/repo-tool.html). + ''; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28a98171f5a36..494155180731d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7679,6 +7679,8 @@ in { pykwalify = callPackage ../development/python-modules/pykwalify { }; + west = callPackage ../development/python-modules/west { }; + wfuzz = callPackage ../development/python-modules/wfuzz { }; wget = callPackage ../development/python-modules/wget { }; From 7e855dec9ea5b1cc02b8ccfb5bf4c57a965e484d Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 1 Aug 2020 00:34:43 +0200 Subject: [PATCH 043/234] cryptpad: 3.13.0 -> 3.20.1 (#94255) --- .../web-apps/cryptpad/bower-packages.nix | 22 ++-- pkgs/servers/web-apps/cryptpad/default.nix | 3 + pkgs/servers/web-apps/cryptpad/generate.sh | 2 +- .../cryptpad/node-packages-generated.nix | 124 ++++++++++-------- .../web-apps/cryptpad/node-packages.json | 2 +- .../web-apps/cryptpad/node-packages.nix | 2 +- 6 files changed, 85 insertions(+), 70 deletions(-) diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix index 76dc26c4e08f8..be0c3ab72c75d 100644 --- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix @@ -5,36 +5,38 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn") (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g") (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1") - (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414") - (fetchbower "codemirror" "5.52.0" "^5.19.0" "0yc9qyfp7g800mgbaxc5zyy6bp5q257rj7l8i1bp0667h1wvfchp") + (fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp") + (fetchbower "codemirror" "5.56.0+components1" "^5.19.0" "0fv8rxw6dspyv4bl6p2aka57544f45527rallnhnm5scv77qnakm") (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli") - (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r") + (fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz") (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv") (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh") (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") (fetchbower "chainpad-crypto" "0.2.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby") - (fetchbower "chainpad-listmap" "0.8.1" "^0.8.1" "04q1mb9cr510y0xzybd51j8x16vmjb8v7jv3vik0cx7kzqf4rh0f") - (fetchbower "chainpad" "5.1.3" "^5.1.0" "1la0zrh0i1h264jacn436w85hzq3l0d4whwxd2sslja9xbwgfaa0") + (fetchbower "chainpad-listmap" "0.9.0" "^0.9.0" "173yr5a6zxq7nb3fha6f1ajv2vy0mvqwmm949ww7ihvrhh7cd0f5") + (fetchbower "chainpad" "5.2.2" "^5.2.0" "1rmh039bqk11xnnh99sqrqksr4idly75y5q4f5wyl9cg4slsqrdp") (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv") (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq") (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") - (fetchbower "bootstrap" "4.4.1" "^v4.0.0" "0a3y5s6236jjw0ppzwdysf5mn87308ndadw1rgwgwswr9cgkz2ak") + (fetchbower "bootstrap" "4.5.0" "^v4.0.0" "0cfdn6z8jwx6y8lbbq6xpkfhq2vra0i84nkj9ji2bil1fzgzi40f") (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") - (fetchbower "localforage" "1.7.3" "^1.5.2" "0q1a996j4dn246xp55zldfh07s9m9skhnf9i0g1w4ngwsnqx23rw") + (fetchbower "localforage" "1.8.1" "^1.5.2" "0ci265385racnxvn4g1n672yaxi47msw6k042nxdb5vlpf5g327j") (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69") - (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x") + (fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx") (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v") (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") - (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp") + (fetchbower "jszip" "Stuk/jszip#3.5.0" "Stuk/jszip#^3.1.5" "1ra19d82cq1hrnbw88l8c61bs12kpgxvbfiiwpfi8fhy0l8hcsvk") (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") - (fetchbower "chainpad-netflux" "0.10.3" "^0.10.0" "0k8nf34bxwr070jjn4hc7ikiysnv22mix1mdg633j67b5ca0bm30") + (fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0") + (fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0") + (fetchbower "chainpad-netflux" "0.11.2" "^0.11.0" "1dqfricbm6s8iv7w1bsx1700m5cpk5rk1f4spqv0fqyf6mdz366v") (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") ]; } diff --git a/pkgs/servers/web-apps/cryptpad/default.nix b/pkgs/servers/web-apps/cryptpad/default.nix index 77e529f26abf4..abd20d6449906 100644 --- a/pkgs/servers/web-apps/cryptpad/default.nix +++ b/pkgs/servers/web-apps/cryptpad/default.nix @@ -15,6 +15,7 @@ let bowerPackages = buildBowerComponents { name = "${cryptpad.name}-bower-packages"; # this list had to be tweaked by hand: + # * add the second jquery ~2.1.0 entry # * add the second bootstrap ~3.1.1 entry generated = ./bower-packages.nix; src = cryptpad.src; @@ -48,6 +49,8 @@ let postInstall = '' out_cryptpad=$out/lib/node_modules/cryptpad + substituteInPlace $out_cryptpad/lib/workers/index.js --replace "lib/workers/db-worker" "$out_cryptpad/lib/workers/db-worker" + # add the bower components ln -sv \ ${bowerPackages}/bower_components \ diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index 2fe4099efa4fd..697b5a74a08a7 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -2,7 +2,7 @@ #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix set -euo pipefail -node2nix --nodejs-10 \ +node2nix --nodejs-12 \ --input node-packages.json \ --output node-packages-generated.nix \ --composition node-packages.nix \ diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 1fde7673fe81e..349ad59c60ab7 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -10,7 +10,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "array-flatten-1.1.1" = { @@ -28,7 +28,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "body-parser-1.18.3" = { @@ -55,16 +55,16 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz"; - sha512 = "1b9mfdy7p405fgwsjhv5dmy1p5mz6nzb3ss4qkj664xnq4bpz5nn42cpxzvdk3d4g8zf4p98xq4ja81kykl296rzpgrpprgw34xarkx"; + sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg=="; }; }; - "chainpad-server-4.0.5" = { + "chainpad-server-4.0.9" = { name = "chainpad-server"; packageName = "chainpad-server"; - version = "4.0.5"; + version = "4.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.5.tgz"; - sha512 = "11j36n90grxq83vpzjzff2nfcf4qkqwk6ply90sijkdcw575ql2ja9pww48inapqa3rqh3js0s4pccswyfyllnafvvrrv4xii08lwxw"; + url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.9.tgz"; + sha512 = "8h1W41ktE05TM6LuXrklpW2TUxWeNyIDiRaQygKsXaA/7pyJxF7+AmPVS+xW0c31VkHjQDPiaMzPoxhcxXnIyA=="; }; }; "content-disposition-0.5.2" = { @@ -82,7 +82,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "cookie-0.3.1" = { @@ -109,7 +109,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "depd-1.1.2" = { @@ -172,7 +172,7 @@ let version = "4.16.4"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; - sha512 = "0x2wjwybkq0ridr18abnsh5hymkh9fjma63ik8za1fl7jgmmhnrxg9qi8yy9p8hci4k8385xys0y28whamrn054zvfwl57q4sxr8pcg"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; }; }; "finalhandler-1.1.1" = { @@ -181,7 +181,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; "forwarded-0.1.2" = { @@ -208,7 +208,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "05qcmykw9czycnn3r2rrlspzd4dznr4796abdqzw150j7rafnlq8n4wp4dai34swb23lfvhw8s31l1k83vpwxqddyf1k724jq4dm430"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; "gar-1.0.4" = { @@ -217,7 +217,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz"; - sha512 = "3ikh31ywgrpmrh33kn82v8r5vjx0w4i1kva4gnc8rbd8dkbrps4gkgjdfab609fzhbzcbrch1cgn23s1ia1qn5cqj3vcgxjymqgv2f3"; + sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; "get-folder-size-2.0.1" = { @@ -226,16 +226,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz"; - sha512 = "3679cn6gprs8s2zfs0y73r0mv6pg9295y3r70pj75wcvilm4ds2yaim9b9918ap1vp48a9773nd9nwzjg179c1d75jbncy2c3w1n8gq"; + sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "http-errors-1.6.3" = { @@ -253,7 +253,7 @@ let version = "0.4.23"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz"; - sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x"; + sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA=="; }; }; "inherits-2.0.3" = { @@ -271,7 +271,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "jsonfile-4.0.0" = { @@ -334,25 +334,25 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "ms-2.0.0" = { @@ -370,7 +370,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "netflux-websocket-0.1.20" = { @@ -379,7 +379,7 @@ let version = "0.1.20"; src = fetchurl { url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz"; - sha512 = "1rdvzykqbvgkxk52k0f16vn1mzgrnxawyfnizlzqah3jv554pi7znbhlmjf5wjjabrj0k5dd7v53jzz0ncwg9vjf6j0kqi5ib1n9wdj"; + sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg=="; }; }; "nthen-0.1.8" = { @@ -388,7 +388,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; - sha512 = "1rn74v8zsxvg9pywjqz4gg3947flyhzz66m5vgb0rw6mffg7l3pf0xmkfgamj42yafn200qfp1s0s9ardg429fy9wafr3z1hv08479s"; + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; }; }; "on-finished-2.3.0" = { @@ -406,7 +406,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "path-to-regexp-0.1.7" = { @@ -424,7 +424,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "pull-stream-3.6.14" = { @@ -433,7 +433,7 @@ let version = "3.6.14"; src = fetchurl { url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz"; - sha512 = "1xjf24kjiqjzdx29ss7cqgr32vgd84b8xyd7d8n3yvwkay1jf84z2s9cpzwlmn0cq4sl26bxxpc89nnqv1630k90gaa87c7kaz9v2i8"; + sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew=="; }; }; "qs-6.5.2" = { @@ -442,7 +442,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-1.2.1" = { @@ -451,7 +451,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.3.3" = { @@ -460,7 +460,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz"; - sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm"; + sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; "safe-buffer-5.1.2" = { @@ -469,7 +469,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safer-buffer-2.1.2" = { @@ -478,7 +478,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "saferphore-0.0.1" = { @@ -496,7 +496,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; "serve-static-1.13.2" = { @@ -505,7 +505,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; "setprototypeof-1.1.0" = { @@ -514,7 +514,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; "sortify-1.0.4" = { @@ -532,7 +532,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; }; }; "stream-to-pull-stream-1.7.3" = { @@ -541,7 +541,7 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; - sha512 = "0dcrjpdn2j9k2zhnw5v2kp3k9vqsng8x822nchipwh4rgzb3y7y9cj3q01r9mishxrha0rc62xh6v0dbkycn3fq847d5rbbkal75hza"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; }; }; "tiny-each-async-2.0.3" = { @@ -578,7 +578,16 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "ulimit-0.0.2" = { + name = "ulimit"; + packageName = "ulimit"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ulimit/-/ulimit-0.0.2.tgz"; + sha1 = "2b51f9dc8381ae4102636cec5eb338c2630588a0"; }; }; "ultron-1.1.1" = { @@ -587,7 +596,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; "universalify-0.1.2" = { @@ -596,7 +605,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -632,20 +641,20 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz"; - sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; + sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA=="; }; }; }; in { - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" = nodeEnv.buildNodePackage { + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" = nodeEnv.buildNodePackage { name = "cryptpad"; packageName = "cryptpad"; - version = "3.13.0"; + version = "3.20.1"; src = fetchgit { url = "https://github.com/xwiki-labs/cryptpad.git"; - rev = "6b657c47ceba50c85275981f45895341370d3d66"; - sha256 = "d7b56930962fe5217d2051fb718954fd7aef96c9503e27d32148ea9b4a8dc098"; + rev = "9bc27d7d0d50d17c345bd545a45341a05293c558"; + sha256 = "4a1fc833b38b2097741500cef38c6b04f5b752c21736e95eb492c33012016332"; }; dependencies = [ sources."accepts-1.3.7" @@ -658,7 +667,7 @@ in sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" ]; }) - sources."chainpad-server-4.0.5" + sources."chainpad-server-4.0.9" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" @@ -677,7 +686,7 @@ in sources."fs-extra-7.0.1" sources."gar-1.0.4" sources."get-folder-size-2.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" @@ -689,8 +698,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."netflux-websocket-0.1.20" @@ -715,6 +724,7 @@ in sources."tiny-each-async-2.0.3" sources."tweetnacl-0.12.2" sources."type-is-1.6.18" + sources."ulimit-0.0.2" sources."ultron-1.1.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json index 3d068f6a44967..07e02a1a0a2e1 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.json +++ b/pkgs/servers/web-apps/cryptpad/node-packages.json @@ -1,3 +1,3 @@ [ - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" } + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.20.1" } ] diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 3eecf3c90999a..19c034aa78b30 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { From e000439d4715034b864bb91e4ae7703d286e4c94 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 19 May 2020 03:39:54 +0300 Subject: [PATCH 044/234] wrapNeovim: Rewrite Cleanups: - Removed unneeded neovim.meta.description reset. - Remove unnecessary -x checks in `postBuild`. - Use a ${placeholder "out"} if needed. Changes: - Switch to symlinkJoin, so e.g manpages link to the environment (#87929). - Use nvim-node from $out/bin/ just like all other providers. - Compute all arguments to makeWrapper in pure Nix "before" `postBuild`. - Prevent double wrapping in case `configure != {}` and rplugin.vim needs to be generated. Co-authored-by: Silvan Mosberger --- pkgs/applications/editors/neovim/wrapper.nix | 117 +++++++++++++------ 1 file changed, 82 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index c7d5f7649783c..716ec8d06aeed 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper +{ stdenv, symlinkJoin, lib, makeWrapper , vimUtils , bundlerEnv, ruby , nodejs @@ -55,44 +55,95 @@ let binPath = makeBinPath (optionals withRuby [rubyEnv] ++ optionals withNodeJs [nodejs]); + # Mapping a boolean argument to a key that tells us whether to add or not to + # add to nvim's 'embedded rc' this: + # + # let g:_host_prog=$out/bin/nvim- + # + # Or this: + # + # let g:loaded_${prog}_provider=1 + # + # While the later tells nvim that this provider is not available + # + hostprog_check_table = { + node = withNodeJs; + python = withPython; + python3 = withPython3; + ruby = withRuby; + }; + ## Here we calculate all of the arguments to the 1st call of `makeWrapper` + # We start with the executable itself NOTE we call this variable "initial" + # because if configure != {} we need to call makeWrapper twice, in order to + # avoid double wrapping, see comment near finalMakeWrapperArgs + initialMakeWrapperArgs = + let + flags = lib.concatLists (lib.mapAttrsToList ( + prog: + withProg: + [ + "--cmd" + (if withProg then + "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" + else + "let g:loaded_${prog}_provider=1" + ) + ] + ) hostprog_check_table); + in [ + "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" + "--argv0" "$0" + "--add-flags" (lib.escapeShellArgs flags) + ] ++ lib.optionals withRuby [ + "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" + ] ++ lib.optionals (binPath != "") [ + "--suffix" "PATH" ":" binPath + ]; + # If configure != {}, we can't generate the rplugin.vim file with e.g + # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in + # the wrapper. That's why only when configure != {} (tested both here and + # when postBuild is evaluated), we call makeWrapper once to generate a + # wrapper with most arguments we need, excluding those that cause problems to + # generate rplugin.vim, but still required for the final wrapper. + finalMakeWrapperArgs = initialMakeWrapperArgs + # this relies on a patched neovim, see + # https://github.com/neovim/neovim/issues/9413 + ++ lib.optionals (configure != {}) [ + "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" + "--add-flags" "-u ${vimUtils.vimrcFile configure}" + ] + ; in - stdenv.mkDerivation { + symlinkJoin { name = "neovim-${stdenv.lib.getVersion neovim}"; - buildCommand = let bin="${neovim}/bin/nvim"; in '' - if [ ! -x "${bin}" ] - then - echo "cannot find executable file \`${bin}'" - exit 1 - fi - - makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \ - "$out/bin/nvim" --add-flags " \ - --cmd \"${if withNodeJs then "let g:node_host_prog='${nodePackages.neovim}/bin/neovim-node-host'" else "let g:loaded_node_provider=1"}\" \ - --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ - --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ - --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ - --suffix PATH : ${binPath} \ - ${optionalString withRuby '' --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } - '' - + optionalString (!stdenv.isDarwin) '' - # copy icon and patch the original neovim.desktop file - mkdir -p $out/share/{applications,pixmaps} - ln -s ${neovim}/share/pixmaps/nvim.png $out/share/pixmaps/nvim.png + postBuild = '' + # Remove the symlinks created by symlinkJoin which we need to perform + # extra actions upon + rm $out/share/applications/nvim.desktop $out/bin/nvim + makeWrapper ${lib.escapeShellArgs initialMakeWrapperArgs} ${extraMakeWrapperArgs} substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython '' makeWrapper ${pythonEnv}/bin/python $out/bin/nvim-python --unset PYTHONPATH - '' + optionalString withPython3 '' + '' + + optionalString withPython3 '' makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH - '' + optionalString withRuby '' + '' + + optionalString withRuby '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' + optionalString vimAlias '' + '' + + optionalString withNodeJs '' + ln -s ${nodePackages.neovim}/bin/neovim-node $out/bin/nvim-node + '' + + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim - '' + optionalString viAlias '' + '' + + optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != {}) '' + '' + + optionalString (configure != {}) '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim # Some plugins assume that the home directory is accessible for @@ -119,22 +170,18 @@ let echo -e "\nGenerating rplugin.vim failed!" exit 1 fi - unset NVIM_RPLUGIN_MANIFEST - - # this relies on a patched neovim, see - # https://github.com/neovim/neovim/issues/9413 - wrapProgram $out/bin/nvim \ - --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \ - --add-flags "-u ${vimUtils.vimrcFile configure}" ${extraMakeWrapperArgs} + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${extraMakeWrapperArgs} ''; + paths = [ neovim ]; + preferLocalBuild = true; buildInputs = [makeWrapper]; passthru = { unwrapped = neovim; }; meta = neovim.meta // { - description = neovim.meta.description; + # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package priority = (neovim.meta.priority or 0) - 1; From 3e9bc13a082ed052f0a7e4868168875011e96d8d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Aug 2020 00:54:07 +0200 Subject: [PATCH 045/234] home-assistant: revert back to python3.8 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b69a1aa7220db..d3155f29f2270 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16035,9 +16035,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { - python3 = python37; - }; + home-assistant = callPackage ../servers/home-assistant { }; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; From e6ab98077e178e3239244e508f3dcd12ed9ebb2f Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Mon, 27 Jul 2020 20:24:32 -0400 Subject: [PATCH 046/234] gplates: 2.0.0 -> 2.2.0, unbreak --- .../science/misc/gplates/boostfix.patch | 612 ------------------ .../science/misc/gplates/default.nix | 23 +- 2 files changed, 12 insertions(+), 623 deletions(-) delete mode 100644 pkgs/applications/science/misc/gplates/boostfix.patch diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch deleted file mode 100644 index e429600b70953..0000000000000 --- a/pkgs/applications/science/misc/gplates/boostfix.patch +++ /dev/null @@ -1,612 +0,0 @@ ---- a/src/app-logic/ApplicationState.h -+++ b/src/app-logic/ApplicationState.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "FeatureCollectionFileState.h" - #include "Layer.h" - #include "LayerTaskRegistry.h" -@@ -48,6 +49,7 @@ - #include "model/ModelInterface.h" - #include "model/types.h" - #include "model/WeakReferenceCallback.h" -+#endif - - //////////////////////////////////////////////////////////////////////////////////////////////// - // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers ---- a/src/app-logic/CoRegistrationLayerTask.h -+++ b/src/app-logic/CoRegistrationLayerTask.h -@@ -32,11 +32,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "CoRegistrationLayerParams.h" - #include "CoRegistrationLayerProxy.h" - #include "LayerTask.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - namespace GPlatesAppLogic - { ---- a/src/app-logic/RasterLayerTask.h -+++ b/src/app-logic/RasterLayerTask.h -@@ -32,11 +32,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "RasterLayerParams.h" - #include "RasterLayerProxy.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructGraph.h -+++ b/src/app-logic/ReconstructGraph.h -@@ -46,6 +46,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "FeatureCollectionFileState.h" - #include "Layer.h" - #include "Reconstruction.h" -@@ -53,6 +54,7 @@ - - #include "model/FeatureCollectionHandle.h" - #include "model/WeakReferenceCallback.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructLayerTask.h -+++ b/src/app-logic/ReconstructLayerTask.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "ReconstructLayerProxy.h" - #include "ReconstructLayerParams.h" -@@ -42,6 +43,7 @@ - #include "maths/types.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructScalarCoverageLayerParams.h -+++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h -@@ -30,6 +30,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerParams.h" - #include "ReconstructScalarCoverageLayerProxy.h" - #include "ReconstructScalarCoverageParams.h" -@@ -38,6 +39,7 @@ - #include "property-values/ValueObjectType.h" - - #include "utils/SubjectObserverToken.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/ReconstructScalarCoverageLayerTask.h -+++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h -@@ -30,12 +30,14 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "ReconstructScalarCoverageLayerParams.h" - #include "ReconstructScalarCoverageLayerProxy.h" - #include "ScalarCoverageFeatureProperties.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/TopologyNetworkResolverLayerTask.h -+++ b/src/app-logic/TopologyNetworkResolverLayerTask.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerParams.h" - #include "LayerTask.h" - #include "ReconstructLayerProxy.h" -@@ -41,6 +42,7 @@ - #include "TopologyNetworkResolverLayerProxy.h" - - #include "model/FeatureCollectionHandle.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/app-logic/VelocityFieldCalculatorLayerTask.h -+++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h -@@ -32,9 +32,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "LayerTask.h" - #include "VelocityFieldCalculatorLayerParams.h" - #include "VelocityFieldCalculatorLayerProxy.h" -+#endif - - #include "model/FeatureCollectionHandle.h" - ---- a/src/data-mining/CoRegConfigurationTable.h -+++ b/src/data-mining/CoRegConfigurationTable.h -@@ -28,6 +28,7 @@ - - #include - #include -+#ifndef Q_MOC_RUN - #include - - #include "CoRegFilter.h" -@@ -44,6 +45,7 @@ - #include "scribe/Transcribe.h" - #include "scribe/TranscribeContext.h" - -+#endif - - namespace GPlatesDataMining - { ---- a/src/gui/CommandServer.h -+++ b/src/gui/CommandServer.h -@@ -38,9 +38,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - - #include "presentation/ViewState.h" -+#endif - - namespace GPlatesGui - { ---- a/src/gui/FeatureTableModel.h -+++ b/src/gui/FeatureTableModel.h -@@ -32,8 +32,10 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "app-logic/Layer.h" - #include "app-logic/ReconstructionGeometry.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/gui/TopologyTools.h -+++ b/src/gui/TopologyTools.h -@@ -35,6 +35,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "TopologySectionsContainer.h" - - #include "app-logic/Layer.h" -@@ -64,6 +65,7 @@ - #include "utils/UnicodeStringUtils.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/opengl/GLVisualLayers.h -+++ b/src/opengl/GLVisualLayers.h -@@ -35,6 +35,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "GLAgeGridMaskSource.h" - #include "GLContext.h" - #include "GLLight.h" -@@ -79,6 +80,7 @@ - - #include "view-operations/RenderedGeometry.h" - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/presentation/VisualLayer.h -+++ b/src/presentation/VisualLayer.h -@@ -32,6 +32,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayerParams.h" - #include "VisualLayerType.h" - -@@ -42,6 +43,7 @@ - #include "model/FeatureCollectionHandle.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/presentation/VisualLayers.h -+++ b/src/presentation/VisualLayers.h -@@ -34,6 +34,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayer.h" - - #include "app-logic/FeatureCollectionFileState.h" -@@ -42,6 +43,7 @@ - #include "gui/Symbol.h" - - #include "view-operations/RenderedGeometryCollection.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h -+++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h -@@ -39,6 +39,7 @@ - #include "GPlatesDialog.h" - #include "InformationDialog.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/AssignPlateIds.h" - - #include "file-io/File.h" -@@ -47,6 +48,7 @@ - #include "model/ModelInterface.h" - - #include "presentation/VisualLayer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h -+++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h -@@ -38,6 +38,7 @@ - - #include "OpenDirectoryDialog.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - #include "app-logic/Layer.h" - #include "app-logic/LayerInputChannelName.h" -@@ -45,6 +46,7 @@ - - #include "data-mining/CheckAttrTypeVisitor.h" - #include "data-mining/CoRegConfigurationTable.h" -+#endif - - #include "global/PointerTraits.h" - ---- a/src/qt-widgets/CoRegistrationOptionsWidget.h -+++ b/src/qt-widgets/CoRegistrationOptionsWidget.h -@@ -31,6 +31,7 @@ - #include "CoRegistrationLayerConfigurationDialog.h" - #include "CoRegistrationOptionsWidgetUi.h" - #include "LayerOptionsWidget.h" -+#ifndef Q_MOC_RUN - #include "CoRegistrationResultTableDialog.h" - - #include "app-logic/CoRegistrationLayerTask.h" -@@ -41,7 +42,7 @@ - #include "file-io/File.h" - - #include "presentation/VisualLayer.h" -- -+#endif - - namespace GPlatesAppLogic - { ---- a/src/qt-widgets/CoRegistrationResultTableDialog.h -+++ b/src/qt-widgets/CoRegistrationResultTableDialog.h -@@ -36,6 +36,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "CoRegistrationResultTableDialogUi.h" - #include "SaveFileDialog.h" - -@@ -43,6 +44,7 @@ - #include "data-mining/OpaqueDataToQString.h" - - #include "presentation/VisualLayer.h" -+#endif - - namespace GPlatesPresentation - { ---- a/src/qt-widgets/DrawStyleDialog.h -+++ b/src/qt-widgets/DrawStyleDialog.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "DrawStyleDialogUi.h" - #include "GPlatesDialog.h" - #include "PythonArgumentWidget.h" -@@ -41,6 +42,7 @@ - #include "gui/PythonConfiguration.h" - - #include "presentation/Application.h" -+#endif - - namespace GPlatesAppLogic - { ---- a/src/qt-widgets/EditTableActionWidget.h -+++ b/src/qt-widgets/EditTableActionWidget.h -@@ -27,8 +27,11 @@ - #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H - - #include -+ -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" - #include "EditTableActionWidgetUi.h" -+#endif - - namespace GPlatesQtWidgets - { ---- a/src/qt-widgets/GlobeCanvas.h -+++ b/src/qt-widgets/GlobeCanvas.h -@@ -41,6 +41,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - #include "gui/Globe.h" - #include "gui/ViewportZoom.h" -@@ -58,6 +59,7 @@ - #include "qt-widgets/SceneView.h" - - #include "view-operations/RenderedGeometryFactory.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/LogDialog.h -+++ b/src/qt-widgets/LogDialog.h -@@ -34,7 +34,9 @@ - #include "GPlatesDialog.h" - #include "LogDialogUi.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/ApplicationState.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MapCanvas.h -+++ b/src/qt-widgets/MapCanvas.h -@@ -39,6 +39,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - #include "gui/Map.h" - #include "gui/TextOverlay.h" -@@ -47,6 +48,7 @@ - #include "opengl/GLMatrix.h" - #include "opengl/GLOffScreenContext.h" - #include "opengl/GLVisualLayers.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MapView.h -+++ b/src/qt-widgets/MapView.h -@@ -36,6 +36,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "gui/ColourScheme.h" - - #include "maths/LatLonPoint.h" -@@ -44,6 +45,7 @@ - #include "opengl/GLVisualLayers.h" - - #include "qt-widgets/SceneView.h" -+#endif - - - namespace GPlatesGui ---- a/src/qt-widgets/MergeReconstructionLayersDialog.h -+++ b/src/qt-widgets/MergeReconstructionLayersDialog.h -@@ -33,7 +33,9 @@ - - #include "MergeReconstructionLayersDialogUi.h" - -+#ifndef Q_MOC_RUN - #include "app-logic/Layer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/RasterLayerOptionsWidget.h -+++ b/src/qt-widgets/RasterLayerOptionsWidget.h -@@ -31,6 +31,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RasterLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -40,6 +41,7 @@ - - #include "gui/BuiltinColourPaletteType.h" - #include "gui/RasterColourPalette.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h -+++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h -@@ -28,6 +28,7 @@ - - #include - -+#ifndef Q_MOC_RUN - #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -37,6 +38,7 @@ - - #include "gui/BuiltinColourPaletteType.h" - #include "gui/RasterColourPalette.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h -+++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h -@@ -30,6 +30,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "ScalarField3DLayerOptionsWidgetUi.h" - - #include "LayerOptionsWidget.h" -@@ -41,6 +42,7 @@ - #include "gui/RasterColourPalette.h" - - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/TotalReconstructionPolesDialog.h -+++ b/src/qt-widgets/TotalReconstructionPolesDialog.h -@@ -32,12 +32,14 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "TotalReconstructionPolesDialogUi.h" - - #include "GPlatesDialog.h" - #include "SaveFileDialog.h" - - #include "presentation/VisualLayer.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/qt-widgets/VisualLayersComboBox.h -+++ b/src/qt-widgets/VisualLayersComboBox.h -@@ -32,8 +32,10 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "presentation/VisualLayer.h" - #include "presentation/VisualLayerType.h" -+#endif - - - namespace GPlatesPresentation ---- a/src/qt-widgets/VisualLayerWidget.h -+++ b/src/qt-widgets/VisualLayerWidget.h -@@ -36,11 +36,13 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "VisualLayerWidgetUi.h" - - #include "app-logic/Layer.h" - - #include "gui/Colour.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/view-operations/InternalGeometryBuilder.h -+++ b/src/view-operations/InternalGeometryBuilder.h -@@ -30,9 +30,11 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "maths/GeometryOnSphere.h" - #include "maths/GeometryType.h" - #include "maths/PointOnSphere.h" -+#endif - - namespace GPlatesViewOperations - { ---- a/src/view-operations/RenderedGeometryCollection.h -+++ b/src/view-operations/RenderedGeometryCollection.h -@@ -39,7 +39,9 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometryLayer.h" -+#endif - - namespace GPlatesViewOperations - { ---- a/src/view-operations/RenderedGeometryFactory.h -+++ b/src/view-operations/RenderedGeometryFactory.h -@@ -33,6 +33,7 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometry.h" - #include "RenderedColouredEdgeSurfaceMesh.h" - #include "RenderedColouredTriangleSurfaceMesh.h" -@@ -62,6 +63,7 @@ - #include "property-values/TextContent.h" - - #include "view-operations/ScalarField3DRenderParameters.h" -+#endif - - - namespace GPlatesAppLogic ---- a/src/view-operations/RenderedGeometryLayer.h -+++ b/src/view-operations/RenderedGeometryLayer.h -@@ -35,10 +35,12 @@ - #include - #include - -+#ifndef Q_MOC_RUN - #include "RenderedGeometry.h" - - #include "maths/CubeQuadTreeLocation.h" - -+#endif - - namespace GPlatesMaths - { diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 592e36370e0f4..4bef967bc08a5 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal_1_11, cgal -, proj, boost, cmake, python2, doxygen, graphviz, gmp }: +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal, cgal +, proj, boost, cmake, python2, doxygen, graphviz, gmp, mpfr }: stdenv.mkDerivation rec { pname = "gplates"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/gplates/${pname}-${version}-unixsrc.tar.bz2"; - sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; + sha256 = "1jrcv498vpcs8xklhbsgg12yfa90f96p2mwq6x5sjnrlpf8mh50b"; }; - patches = [ - ./boostfix.patch - ]; - buildInputs = [ - qt4 qwt6_qt4 libGLU libGL glew gdal_1_11 cgal proj boost cmake python2 - doxygen graphviz gmp + qt4 qwt6_qt4 libGLU libGL glew gdal cgal proj cmake python2 + doxygen graphviz gmp mpfr + (boost.override { + enablePython = true; + python = python2; + }) ]; + NIX_CFLAGS_LINK="-ldl -lpthread -lutil"; + meta = with stdenv.lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; homepage = "https://www.gplates.org"; license = licenses.gpl2; platforms = platforms.all; - broken = true; }; } From 371bb6a2c0885f6e5db58c3e762a873fd72a4ce8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 17:31:49 -0700 Subject: [PATCH 047/234] eksctl: 0.22.0 -> 0.24.0 (#94391) --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index ab309a11a6e26..5bccc026c4324 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1l7wcx89d7nil5lbr4x2w04lwranz0z83y892v290wv2l0xnmshj"; + sha256 = "1iybsyx2la6dcz2g3rshzky15n5qs8z57zvdvpiisfa0pnjisdm5"; }; - vendorSha256 = "0fy9m72iciz5pjf2b3323brgi15w6a9fg1m1srpaiay3md87gagg"; + vendorSha256 = "033zj6jmxypj2plqpnkkzp8iffc078y9jfq01zcjnaij1v0sb8al"; subPackages = [ "cmd/eksctl" ]; From f81e78f4b42a40761dd66627dbb81025e7db45a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:36:05 +0000 Subject: [PATCH 048/234] dijo: 0.1.5 -> 0.2.2 --- pkgs/tools/misc/dijo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 5f58e80022821..383863016994c 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }: -let version = "0.1.5"; in +let version = "0.2.2"; in rustPlatform.buildRustPackage { pname = "dijo"; inherit version; @@ -8,9 +8,9 @@ rustPlatform.buildRustPackage { owner = "NerdyPepper"; repo = "dijo"; rev = "v${version}"; - sha256 = "1ch320j2d66zn9mbs7xl0bkfcm2hpak6izk0yspz1gcji1l7grsc"; + sha256 = "1al2dfrfxw39m9q636h47dnypcwkhp9bw01hvy7d9b69kskb21db"; }; - cargoSha256 = "1p6apz3wd4gqp0z24ygfw8nmpkh44d000jp6x7svqzmpphnmb0ji"; + cargoSha256 = "0a2l0ynjj9wl86aawm0l0rbdkm8j3a2n0nm6ysyxamaip0q5y1ql"; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker."; From 302167cd8ebb5a7106b10795bcbdec90886437eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 21:13:49 +0000 Subject: [PATCH 049/234] ccache: 3.7.10 -> 3.7.11 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ead30a56e274b..e0a6a8065b5a6 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,13 +2,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.10"; + version = "3.7.11"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "v${version}"; - sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7"; + sha256 = "03c6riz4vb0jipplk69c1j8arjjrjn676kglsrzqf8cidrh8j91c"; }; nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; From 02a3e7c4417381a2a44e3c51513ef14448186022 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 30 Jun 2020 07:54:00 +0800 Subject: [PATCH 050/234] edukai: Init at 4.0 Add `edukai` (MOE Standard Kai Font) version 4.0 If approved, users will be able to install the Standard Chinese Kai Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edukai/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/edukai/default.nix diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/data/fonts/edukai/default.nix new file mode 100644 index 0000000000000..d5b9e25c2eb54 --- /dev/null +++ b/pkgs/data/fonts/edukai/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edukai"; + version = "4.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-4.0.zip"; + sha256 = "10m9srvbazvg9gc43943dc89rjzcfc8mm4lx9gb5hnplrn22zrcn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Kai Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Kai Font is a kai (regular srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 13,076 Chinese characters. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=47"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3155f29f2270..565b27c019b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18313,6 +18313,8 @@ in eb-garamond = callPackage ../data/fonts/eb-garamond { }; + edukai = callPackage ../data/fonts/edukai { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From 89898b22935a4e05d6d3988ab896aeb75b4145a3 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:49:09 +0800 Subject: [PATCH 051/234] edusong: Init at 1.0 Add `edusong` (MOE Standard Song Font) If approved, users will be able to install the Standard Chinese Song Font provided by the Ministry of Education, Republic of China (Taiwan). --- pkgs/data/fonts/edusong/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/fonts/edusong/default.nix diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/data/fonts/edusong/default.nix new file mode 100644 index 0000000000000..bf7d39aa20c5f --- /dev/null +++ b/pkgs/data/fonts/edusong/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "edusong"; + version = "1.0"; # The upstream doesn't provide the version + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/eduSong_Unicode.zip"; + sha256 = "1b74wj9hdzlnrvldwlkh21sfhqxwh9qghf1k0fv66zs6n48vb0d4"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + mv *.ttf $out/share/fonts/ + ''; + + meta = { + description = + "The MOE Standard Song Font, a Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Standard Song Font is a Chinese Song font provided by + the Midistry of Education, Republic of China (Taiwan). + Song or Ming is a category of CKJ typefaces in print. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=48"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565b27c019b5a..40ae74bfdaca0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18315,6 +18315,8 @@ in edukai = callPackage ../data/fonts/edukai { }; + edusong = callPackage ../data/fonts/edusong { }; + elliptic_curves = callPackage ../data/misc/elliptic_curves { }; equilux-theme = callPackage ../data/themes/equilux-theme { }; From 7c0c3d021ae09e3872bc2023403aa162fcb6532c Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Wed, 29 Jul 2020 01:25:28 +0800 Subject: [PATCH 052/234] eduli: Init at 3.0 Add `eduli` (MOE Li Font) If approved, users will be able to install the Chinese Li (clerical) Font provided by the Ministry of Education, Republic of China (Taiwan). This is probably the first font of clerical script in nixpkgs. --- pkgs/data/fonts/eduli/default.nix | 36 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/fonts/eduli/default.nix diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/data/fonts/eduli/default.nix new file mode 100644 index 0000000000000..7ff2ad4446c53 --- /dev/null +++ b/pkgs/data/fonts/eduli/default.nix @@ -0,0 +1,36 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "eduli"; + version = "3.0"; + + src = fetchzip { + name = "${pname}-${version}"; + url = + "http://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; + sha256 = "0vpmm2qb429npng0aqkafwgs7cjibq8a3f7bbn9hysbm2lndwxwd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/ + for name in *.ttf; do + mv "$name" "$out/share/fonts/$(echo $name | sed -r 's/(.*)\(.*\)\.ttf/\1.ttf/')" + done + ''; + + meta = { + description = + "The MOE Li Font, a clerical Chinese font by the Ministry of Education, ROC (Taiwan)"; + longDescription = '' + The MOE Li Font is a li (clerical srcipt) font + provided by + the Midistry of Education, Republic of China (Taiwan). + It currently includes 4,808 Chinese characters. + The clerical script (lishu) is an archaic style of Chinese calligraphy. + ''; + homepage = + "http://language.moe.gov.tw/result.aspx?classify_sn=23&subclassify_sn=436&content_sn=49"; + license = lib.licenses.cc-by-nd-30; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40ae74bfdaca0..c90cbc9b56c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18315,6 +18315,10 @@ in edukai = callPackage ../data/fonts/edukai { }; + eduli = callPackage ../data/fonts/eduli { }; + + moeli = eduli; + edusong = callPackage ../data/fonts/edusong { }; elliptic_curves = callPackage ../data/misc/elliptic_curves { }; From 1e2bdbe732ff7fba9ea77bf010156e22e4b5cbf2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 29 Jul 2020 18:05:43 +0700 Subject: [PATCH 053/234] Add siraben to maintainer-list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e36ef49760f22..6ccbdfe751240 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7486,6 +7486,12 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + siraben = { + email = "bensiraphob@gmail.com"; + github = "siraben"; + githubId = 8219659; + name = "Siraphob Phipathananunth"; + }; siriobalmelli = { email = "sirio@b-ad.ch"; github = "siriobalmelli"; From a85b3641171ad3c55c1cd07f208baddbed5b605f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Wed, 29 Jul 2020 17:08:51 +0700 Subject: [PATCH 054/234] scas: init at 0.4.6 Suggested changes --- pkgs/development/compilers/scas/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/scas/default.nix diff --git a/pkgs/development/compilers/scas/default.nix b/pkgs/development/compilers/scas/default.nix new file mode 100644 index 0000000000000..e80724c8a4ccc --- /dev/null +++ b/pkgs/development/compilers/scas/default.nix @@ -0,0 +1,26 @@ +{ fetchFromGitHub, stdenv, cmake }: + + +stdenv.mkDerivation rec { + pname = "scas"; + + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "scas"; + rev = version; + sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; + }; + + nativeBuildInputs = [ cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Assembler and linker for the Z80."; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c90cbc9b56c77..b3aa5ccf1bc2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9450,6 +9450,8 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + scas = callPackage ../development/compilers/scas { }; + metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; From 3fd6a6083722e88f4ea801849c17b1e4a0512cfd Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Jul 2020 03:02:58 +0300 Subject: [PATCH 055/234] maintainer: add artturin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ccbdfe751240..4011b6e171592 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -833,6 +833,12 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + artturin = { + email = "artturin@artturin.com"; + github = "artturin"; + githubId = 56650223; + name = "Artturi N"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; From 469d35444833ad4ac4a51134254c284993a68870 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Jul 2020 03:03:41 +0300 Subject: [PATCH 056/234] autotiling: init at 1.1 --- pkgs/misc/autotiling/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/misc/autotiling/default.nix diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix new file mode 100644 index 0000000000000..b104f359363bf --- /dev/null +++ b/pkgs/misc/autotiling/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonApplication, fetchPypi, i3ipc, importlib-metadata }: + +buildPythonApplication rec { + pname = "autotiling"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwvy9bxwv9fakqqiyrkmpckxgm0z85c240p84ibdhja9sm086v0"; + }; + + propagatedBuildInputs = [ i3ipc importlib-metadata ]; + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/autotiling"; + description = "Script for sway and i3 to automatically switch the horizontal / vertical window split orientation"; + license = licenses.gpl3Plus; + platforms= platforms.linux; + maintainers = with maintainers; [ artturin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3aa5ccf1bc2f..a6506525f0638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25908,6 +25908,8 @@ in attract-mode = callPackage ../misc/emulators/attract-mode { }; + autotiling = python3Packages.callPackage ../misc/autotiling { }; + beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; From 3772404e2cb3ad6065f4103d4cb9e6549537f071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 30 Jul 2020 10:26:41 +0200 Subject: [PATCH 057/234] oneDNN: disable tests to avoid illegal instructions oneDNN tests fail on some Hydra builders because they do not support SSE 4.2. Unfortunately, oneDNN does not seem to work without SSE 4.2, see issues #93692 and #93747. --- pkgs/development/libraries/oneDNN/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 80daf83de83d1..865a0ab772443 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -18,21 +18,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; - - cmakeFlags = [ - # oneDNN compiles with -msse4.1 by default, but not all x86_64 - # CPUs support SSE 4.1. - "-DDNNL_ARCH_OPT_FLAGS=" - ]; + # Tests fail on some Hydra builders, because they do not support SSE4.2. + doCheck = false; # The test driver doesn't add an RPath to the build libdir preCheck = '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src - '' + lib.optionalString stdenv.isx86_64 '' - # Use baseline SIMD in case CPU features get misdetected. - export DNNL_MAX_CPU_ISA=SSE41 ''; # The cmake install gets tripped up and installs a nix tree into $out, in From d27cc91045623eec8526ab4f27c64af41abe65f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:04:35 +0000 Subject: [PATCH 058/234] git-quick-stats: 2.1.2 -> 2.1.3 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 587a23f6599d6..bd5e699b4a977 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1q0iy732smad1v25da9vmlk8r5iscjrk678pq6mda9sbmiq693r3"; + sha256 = "0j7yd5fcqdbsad6xzi2k0j4p06w9187hhpal1gqcrh3kj13sjyi3"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { From 4cced213731c3f93181352e5011b9556c63b93b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 08:21:05 +0200 Subject: [PATCH 059/234] lzfse: enable Darwin build - Enable Darwin build, since Darwin is supported. - Replace the revision by the corresponding Git tag. --- pkgs/tools/compression/lzfse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 72560c1d9ae2d..0a335b3602fa2 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lzfse"; - version = "2017-03-08"; + version = "1.0"; src = fetchFromGitHub { owner = "lzfse"; repo = "lzfse"; - rev = "88e2d27"; + rev = "lzfse-${version}"; sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { LZFSE is a Lempel-Ziv style data compression algorithm using Finite State Entropy coding. It targets similar compression rates at higher compression and decompression speed compared to deflate using zlib. ''; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; From 41850f3bee2541543e4fec09a046ae6c821d1b11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:43:32 +0000 Subject: [PATCH 060/234] intel-gmmlib: 20.2.2 -> 20.2.3 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 7b3cb0a2528a8..c1e2fa5a6f636 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.2"; + version = "20.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1gr4xfw8a99jwir7dxqwbfs42lrap3gimwkd7mrhi8vgacvkkvhf"; + sha256 = "1gsjcsad70pxafhw0jhxdrnfqwv8ffp5sawbgylvc009jlzxh5l8"; }; nativeBuildInputs = [ cmake ]; From 502093189a54ea65c2915eb01cbcaacf17109334 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 04:55:27 +0000 Subject: [PATCH 061/234] fping: 4.3 -> 4.4 --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 137bead064a4f..f7e1f7ce0d35b 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.3"; + name = "fping-4.4"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "0b9ppwibc0dx2ns95m0z1b28939af1c8yvgjbhnr9f7p8bl0l14j"; + sha256 = "049dnyr6d869kwrnfhkj3afifs3219fy6hv7kmsb3irdlmjlp1cz"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; From 293031f107f29f0c851f5397f2ca82f89c152f56 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 31 Jul 2020 23:44:51 -0700 Subject: [PATCH 062/234] humioctl: 0.25.0 -> 0.26.0 (#94411) --- pkgs/applications/logging/humioctl/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 28bda827204f2..5210e10f814b0 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ { buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: let - humioCtlVersion = "0.25.0"; - sha256 = "1x8354m410nf9g167v0i1c77s5w2by7smdlyjwl89ixgdjw04ay3"; - vendorSha256 = "14bysjgvahr56hvd8walym11hh721i1q2g503n8m68wdzrrym4qy"; + humioCtlVersion = "0.26.0"; + sha256 = "1j33hmvhkb546dbi2qd5hmpcv715yg9rnpxicc1mayr9f1i2aj2i"; + vendorSha256 = "1l2wa4w43srfrkb4qrgiyzdb6bnaqvp9g3fnrln6bhrcw6jsgj4z"; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; @@ -23,7 +23,6 @@ in buildGoModule { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - mv $out/bin/cli $out/bin/humioctl $out/bin/humioctl completion bash > humioctl.bash $out/bin/humioctl completion zsh > humioctl.zsh installShellCompletion humioctl.{bash,zsh} From f6adaef6067d8ce59cd9fafa87d91404df8ce6bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:06:04 +0000 Subject: [PATCH 063/234] broot: 0.18.1 -> 0.19.3 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 354c4b4ddf432..0ee7c93bb9825 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.18.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww"; + sha256 = "0w03dqm9m2d41ldmjv529azpbp28jjmv21apwf6rlxh59wqgicgb"; }; - cargoSha256 = "1bgrm6a7p7xl95ljk87g4bxv1insl14yxc895yszr0my3ksmpzqh"; + cargoSha256 = "1rmhlqq5a7rfsk4m0yzl9smq33xhb5ixw11knz96ih23a53yafsc"; nativeBuildInputs = [ installShellFiles ]; From 0563c91789a193880618863918dd7504161a1d3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:02:30 -0700 Subject: [PATCH 064/234] dolt: 0.18.0 -> 0.18.1 (#94393) --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 18c9a767cdff4..1002ab9e1564d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "12kvjq3z9bggfmgci3wql4v8sh491dwp6qr768k8kwncqmp3jjvx"; + sha256 = "106n4zlrs64vx09cm365jsymaa0949k0wjb845p2lp4794r9zkf7"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1lscjp4ih5kxrbqch9164bqrp7lbsir6vg4zcczhvhh0phbcbqjs"; + vendorSha256 = "1pvf63cxwq4jj5gi2xalrsk2z1f7i53f0z6qc2p7aibwx9i1k9cz"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; From 7c2a7372a075f65cb3307a95d3bbde6ee295d4b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 09:28:41 +0000 Subject: [PATCH 065/234] shattered-pixel-dungeon: 0.8.1 -> 0.8.1a --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 4f11665c9a078..2861c9effd9a5 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -9,13 +9,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.1"; + version = "0.8.1a"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1n459xdvqf974hs91xfq5fdj29s4w5w83dg3m2vp7gqmrmm2jykf"; + sha256 = "0cfrcjvnn2j4p7zbz252qbn2jacgwhzaja8lqvif0x1vszyl41v7"; }; postPatch = '' From 35bb929bbeca8e8969b52e34acaeda0e094cd1dd Mon Sep 17 00:00:00 2001 From: Dominic Delabruere Date: Tue, 28 Jul 2020 16:21:44 -0400 Subject: [PATCH 066/234] inform6: init at 6.34-6.12.2 nixpkgs already has Inform 7, which is a lovely design system for creating interactive fiction (text adventures) using a natural language compiler and a rich IDE. However, underlying Inform 7 is a C-like language, Inform 6, which has a much simpler toolchain and its own compiler and standard libraries, which I have packaged for nix here. --- maintainers/maintainer-list.nix | 6 ++++ .../development/compilers/inform6/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/inform6/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4011b6e171592..b2c8ff1f49544 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1936,6 +1936,12 @@ githubId = 14032; name = "Daniel Brockman"; }; + ddelabru = { + email = "ddelabru@redhat.com"; + github = "ddelabru"; + githubId = 39909293; + name = "Dominic Delabruere"; + }; dduan = { email = "daniel@duan.ca"; github = "dduan"; diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix new file mode 100644 index 0000000000000..1d339a2b14bf4 --- /dev/null +++ b/pkgs/development/compilers/inform6/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "inform6"; + version = "6.34-6.12.2"; + + src = fetchurl { + url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; + sha256 = "c149f143f2c29a4cb071e578afef8097647cc9e823f7fcfab518ac321d9d259f"; + }; + + buildInputs = [ perl ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Interactive fiction compiler and libraries"; + longDescription = '' + Inform 6 is a C-like programming language for writing interactive fiction + (text adventure) games. + ''; + homepage = "https://gitlab.com/DavidGriffith/inform6unix"; + changelog = "https://gitlab.com/DavidGriffith/inform6unix/-/raw/${version}/NEWS"; + license = licenses.artistic2; + maintainers = with stdenv.lib.maintainers; [ ddelabru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6506525f0638..e6ef11ffaba1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4380,6 +4380,8 @@ in inetutils = callPackage ../tools/networking/inetutils { }; + inform6 = callPackage ../development/compilers/inform6 { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; From 01075fffeec5f1be06205d8c11eb7491c0431e93 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:47:51 +0900 Subject: [PATCH 067/234] thunderbird-bin: copy thunderbird-bin -> thunderbird-bin-68 --- .../mailreaders/thunderbird-bin/68.nix | 183 ++++++ .../thunderbird-bin/68_sources.nix | 615 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 800 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix new file mode 100644 index 0000000000000..e643954fea0da --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -0,0 +1,183 @@ +# This pakcage is keeped until Thunderbird 78 supports OpenPGP. +# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/ +{ stdenv, fetchurl, config, makeWrapper +, alsaLib +, at-spi2-atk +, atk +, cairo +, cups +, curl +, dbus-glib +, dbus +, fontconfig +, freetype +, gdk-pixbuf +, glib +, glibc +, gtk2 +, gtk3 +, kerberos +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXinerama +, libXrender +, libXt +, libxcb +, libcanberra +, gnome3 +, libGLU, libGL +, nspr +, nss +, pango +, writeScript +, xidel +, coreutils +, gnused +, gnugrep +, gnupg +, runtimeShell +}: + +# imports `version` and `sources` +with (import ./68_sources.nix); + +let + arch = if stdenv.hostPlatform.system == "i686-linux" + then "linux-i686" + else "linux-x86_64"; + + isPrefixOf = prefix: string: + builtins.substring 0 (builtins.stringLength prefix) string == prefix; + + sourceMatches = locale: source: + (isPrefixOf source.locale locale) && source.arch == arch; + + systemLocale = config.i18n.defaultLocale or "en-US"; + + defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + + source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + + name = "thunderbird-bin-${version}"; +in + +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + inherit (source) sha512; + }; + + phases = "unpackPhase installPhase"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.cc.cc + alsaLib + at-spi2-atk + atk + cairo + cups + curl + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk2 + gtk3 + kerberos + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libxcb + libcanberra + libGLU libGL + nspr + nss + pango + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + stdenv.cc.cc + ]; + + buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = + '' + mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" + cp -r * "$prefix/usr/lib/thunderbird-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" + + for executable in \ + thunderbird crashreporter thunderbird-bin plugin-container updater + do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/thunderbird-bin-${version}/$executable" + done + + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/thunderbird-bin-${version}/{}" \; + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/thunderbird.desktop < Date: Wed, 15 Jul 2020 15:12:22 +0900 Subject: [PATCH 068/234] thunderbird-bin: 68.9.0 -> 78.0 --- .../mailreaders/thunderbird-bin/default.nix | 2 +- .../thunderbird-bin/release_sources.nix | 540 ++++++++++-------- 2 files changed, 296 insertions(+), 246 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ba13d666ad976..8cdd27653e235 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; - inherit (source) sha512; + inherit (source) sha256; }; phases = "unpackPhase installPhase"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3a8f6f4b80934..4da6a221b3e40 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,665 @@ { - version = "68.10.0"; + version = "78.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ar/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/af/thunderbird-78.0.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha256 = "6ff0f696c6caef049d0489085e7b9c3f7240e242c23aef9a36905c67bcbdef33"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ar/thunderbird-78.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2f49abd71f7542042ef2823cd420e225bb1015684dc258fd7e8eb1104ac9865957b0e6c975043e3611d4d884c085ad670ce21af8c8cab1da80f08aa302078059"; + sha256 = "54b09003901703c2820b20534d403cfbe0b59d7dfb5962cd370049795552e88e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ast/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ast/thunderbird-78.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "91043afae8c2f31f6d2aa5b7f6c7f874150c7f8ef0ef7401132b12822bbdde8c7d7f24022f3f5d0cec262100a2b8791f440a55f0ed00c30acb9429290aa290f5"; + sha256 = "98c159c6ece97f113614107a1ba351901cc4f816d165f6fb2b3ceee7c5fbed6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/be/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/be/thunderbird-78.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6167bd7fe2d980af40a0d5594e67dfc262bb7ab5fb76ea07c919136d967505e84b4d27448d883a31323db7aafd33b4222cff63d27d10ec914354ba4264736459"; + sha256 = "abc376f1525e53aa734d00a8a52d30ba2c95fe0f2d053c54e019eecd35191f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/bg/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/bg/thunderbird-78.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "885c5ee186933eac265ed530f9b8b3cabc934e1ff4efc50b10381f8e53ddc39fe385e21e22041d93ef987e031ec41c2b98e898bcceacec004542bcaa35d0ccca"; + sha256 = "a53deb5c4d83719e380b69a41f3a80e634c8d251a1724e1d49e5ad8ac5da1aca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/br/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/br/thunderbird-78.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e5c31ab8b32f9f0bd72a03207d4c9a2ca75d0c5f28e497456850bf92f75020784258725942079e52f6b38c0740e7d2ec80ef24bd88aca9fe35e9386f65cf7c1a"; + sha256 = "8424ab87bfb1c1622d244961896bf4109fac2a38bccfbc6facfc7ce723a6ef06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ca/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ca/thunderbird-78.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2d727f09dd202291cbb908c2e7805ecc7ec29302bb2481b63a5df1f43c29c39d1ae26bcf3b5dea550619391a96982d3d2bb831548a9a2331e986345c64b4b6b4"; + sha256 = "8283ed7294338be053900ea85e4d9e26ed5ef5a53d419298ddb4d4b0cfd3a8fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cak/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cak/thunderbird-78.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1e74db72b4bc0ca3db90b9ae678dea551293dd54eb5cc5e5c124c51e61ef0d4cb074769bf807ba2d680db10f6086bb3bbcf5d082e815bff10fb8c6ae14c5a72a"; + sha256 = "10cca56df7a22ea31fcc3f2fdcc4cea8344727183ca4d7cc1f6d78cd881879d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cs/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cs/thunderbird-78.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9c89e7328879f82cec0e2c5f7efb2711242cb3f36a4ccf6a014c6ed589f0e02748c997ea98909d546ca33478022bc9143987710945eed1e191517d1348f8a064"; + sha256 = "fa476dde45d9f3796e71ed26126ef99569f92344d9c5754dd154df2b79513312"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cy/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cy/thunderbird-78.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "46e234560ac4a9e7c5b54816bde0f22f2677b6ea117ce5c528260222e940b5e47b12d8b08b24d2ee9bcfc4dd72168faa036207c88f5bc573051fd7eea2281fd0"; + sha256 = "319919e66b178aaa86f74717aaf7a7dc54c53c4d400fc0f54d3ff0a4bcb5ea3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/da/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/da/thunderbird-78.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8ef4fb0210a21df0be22e1866859ac316890cc90e6b157e0cad2725d59360b06db068aa000627ffa750c05cdc8314cb564c32476dcea3975bb63f66b20873059"; + sha256 = "9a3eb38c50fb9c1a1fe58899c304884c2a3e295a278feb40296a48f845f4a8e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/de/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/de/thunderbird-78.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b3c7673728c8af318c0c8e0c3af8e1b7ba457bfd2c5a67bf3df4df6c3c990970d45e1a0884c03aa0a3d973efb12983afea40de55c8831d2b254acfb742c71478"; + sha256 = "260dd2a5227225168327dca79f44ddba7bef4a1a0411a731a192163b36a217a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/dsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/dsb/thunderbird-78.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "adeba633f288fff864e7247e36b4d7f49046a3901de0e4f93f12ada6fef275578b494441d01e820400045d5f7d64048684554934be678d1b7259910a162a4ed8"; + sha256 = "559bdb00b7741897c245d367c5147503e580d446b2a6b90e83af2ac9b64ecdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/el/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/el/thunderbird-78.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6ed60a3cb194de3e2bcffbdf1d0c89460b2c2416878f348c913aaaff911f43e9a624a8de87d46df366c8bd608c47f6a6de8b90fec9c0c82e38afe860ca760f65"; + sha256 = "2f8fdf4aa2347cafa43c1b7e7c7cb6a358878e8470b45d04634566efc089e1a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-GB/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-CA/thunderbird-78.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha256 = "e3921e80a168544f41c39d0281ea32a4660fee8146a7a0b85292f360186ad876"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-GB/thunderbird-78.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a09f578de9b8f23c9b24123092abecedc70e5b48c9c15089505ca049258621f14d8a4f02c8154f7d2c729ed002814af17e08bf211708fc59e5345c92cb259fa2"; + sha256 = "a1c2c9f9e7a14ad0abf83d7b268c47e0ef13d4bd3966adedd0ad46bcd4c7f8c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-US/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-US/thunderbird-78.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3f7d4c844185b0be0ee3354130112ecc034f06cc2335681998e210b79537df7365f251b005387f319b0a2d2dd6a6337fd6287a007fd54ac03c39315c42893dfe"; + sha256 = "57384c634f511c249c3618adcbbd9d2c0fa2a711c2af145d3a390d0950b94209"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-AR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-AR/thunderbird-78.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a028429230c625b0dcb9e200b2e21c6d4db8e96a93313881701b5965dc25db31a0992d4d6da6072a6ed73eb5891d15ac71f19f343172796db82d6e98355baa75"; + sha256 = "e727f4a725f5e389d99d929fa6792863c74e57e23452e3be1a88a3852c83f7ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-ES/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-ES/thunderbird-78.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "58afe4eb60993bae1271fa03a45ce13611a1d83e4defc1f237ed47b243785881c8309f5fa8a5257fa5b343e2dec7595c8ba6143faa63f49749453ad229ee8102"; + sha256 = "2fac6c47b544fa7b663126f137e4850f5bbe1da115a845b99353454ae0c175a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/et/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/et/thunderbird-78.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "402c33c3fd7194a3f5c0d6afb81f639fd4a0cfebdaa61043858938fb5b2690844ec2fabfe9f73d41f45c26d56adcb121234fb1baa76b2455c87863dd79cf065d"; + sha256 = "e3bf4000c8e5d04ddd9bf0a86dfd8aff02304b5d86c55f649fa43deb3ab9809b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/eu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/eu/thunderbird-78.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ace87496370c17b663971365da8c1f88000b76247aba2a6fd5d29a31b5d4b02bf9b56e101c477d48553ca56416e73209aff7f729ea2b8c044e33b9307009321f"; + sha256 = "3c6249fc0d2707b9472ef5b3876fefc3cbafca617ca27037ad8e98706d509eb5"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fa/thunderbird-78.0.tar.bz2"; + locale = "fa"; + arch = "linux-x86_64"; + sha256 = "7e2edcf08b456f53d8274d17e1bcbd9efb997f74b164224d3e153d64ac7fe60e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fi/thunderbird-78.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "775c937de9d9ed49ec70850a1d8ccbe22c964e12a932c52d3dc360425643f2be5487857caa811556e341d94bc62ed9b8dba5e94039c2cff6de50bdf16e364c89"; + sha256 = "1f6cc927ec2e21a67e61c7d09d93f846d5c1bb1ef54644b618ed806a4541170e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fr/thunderbird-78.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1ac4d3e23f71bedf77a8d2dd4fe8d02fbd1083977a8892d2c6db394a9d345bcff73a916f34a078ddd0850e8ac1bb0486aec06d6e36875eafcac0dab08bdedde1"; + sha256 = "f471719cecaca31e5a940bb82908648703a37b74f647d7c1c434f8db339ef974"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fy-NL/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fy-NL/thunderbird-78.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b62676e5302cc265a6ee65de7a31585bade7bfd51395bd56257f733fc9a6f4c391e5318aad3b48441464e5d8bcbe3606cca1edcd6fca6517b205814b9e39b635"; + sha256 = "405daca824b721680f77e3ad8936246825d132c11da4ec2277a022f899ee2ce7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ga-IE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ga-IE/thunderbird-78.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "81ba90087282fdfcd15a534e9065fdd94a859dedd6a85dc9da94de4af698eef6b31a19d3a007eaa27e08944682c9f6108a0d0991f1e394451da881018e5cc70c"; + sha256 = "899127ff4f98f922e405844df1162e66d484443e5a84bb6c575cc28658b52649"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gd/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gd/thunderbird-78.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "1db39cc3ea8990ec8d9ff214d554bf95a6f2699e3f1bf625180b7f84ebc3284e1eec8e2cfdcf87b3a31b466ef2f84dd0a56d771078f4cb06962a28531ee085d8"; + sha256 = "183f757b4d70b999064f8a8e495bbe9a6a9783d939811bd93181c9cbf61dc880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gl/thunderbird-78.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dbaa3cd2341d8ad4834b9db4982b731fbcb1125398cc4a7ce6a9cbc44db7218a165392781e144b68618781ed8d26216f11e1bf172ce4ba9b18515cce0feb9bf4"; + sha256 = "58130045fbcdbcd10541ea6c2d13b95455af8e5fb9893a80d999b79d814eaf17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/he/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/he/thunderbird-78.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "547795f844b60b347a10abc8e609f7d311b63ae4cf76b2b0cb0b0605f597ec0e1c7ec3347042161a4b15201f816f99c391851004de9a957754aca6f50a055d7d"; + sha256 = "719ce3b7d4e3841a7092e658f43a8960d68d82ebad6b6dc43d12708a07054a8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hr/thunderbird-78.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6c72a46406396578c329b1ba1c47a46c124f22fb5c47eb1f16af7672e4269bb84f62ac4c1d9b61a5e8e46eaa4c91e5169b59e9908ad61606b243ed21ce31d859"; + sha256 = "49f9f0c18ad45a73361520a055f02b6b8da22419c37c8423dab64ab13f253834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hsb/thunderbird-78.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e06eeaceffa7b39810faf42640f22b8edef8ad501530f1602a7b13265f5a9b34a1d9304a19a514e3beff2b3c7e8ba92c72aaae6b34cede15e6fa59125344c026"; + sha256 = "7abc5362bc14853c7a9d93c84f1d04dd5d4f0ebdd7c71c782b83e8f56d716516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hu/thunderbird-78.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9ab3e1b47a3120b74adb1f0f0ec657443578203f4c7f7e00804ef61bfeb2c7cd36721256943e8c86e0a62f90c1576e16a9051b33dc9a0006cb7fcf55bc90fc0c"; + sha256 = "5bb475dc366e9cae5e9e1422bb4f7e1eb1b605dd5e5193ccc253dffc11c4a0aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hy-AM/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hy-AM/thunderbird-78.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "614da904a59666d5e67852296eb22ea0ee0d137764ba9fc4f60edee2f547b91659147d14849ca83927671e94b32847f748f97df4bcd93569d46f3cfb0f8f372d"; + sha256 = "c42d6cc12203ac812b5794234ccbd38ea83114844234868cb02004a82e8307ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/id/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/id/thunderbird-78.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "13e01f8fe23f10d24b4399da8540c2afdeb762b1068f10984945c0920882b67bdef48f0f26180786a8d944ca1ea601e3c51bbf6f0cb64697fca0c0b0acb08b84"; + sha256 = "13e4bf8bb6356966d44e4049e2e90f96b097e6a2ec2c54fd39cbf74e45dc4d3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/is/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/is/thunderbird-78.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "176492bbf4ac3b2bb4367848f1283c7dbb805b5bfe6c71cab6c8893578f1d0ca1b9edcbc1e736748d04f2d0ca78f4d6edb21671b78379e26d41d9c43e8727075"; + sha256 = "bdf740e2545ad41de9920a213afd6a476f261a15746ffb201461b3d2e0dcf06f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/it/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/it/thunderbird-78.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "41d10acbb84fde6556530253ecb5926ba4b5d81a38349a00281a7273669cf37245640f789dae7363c4e1a0224127885fae3dac701926dab6e4512df723d39548"; + sha256 = "cd66931d6cff87b16d637340d82d459cac1878fbefdbdb201cf7ed561dc0f6dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ja/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ja/thunderbird-78.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8124ccd221818d37d6d22f204baaf34bd87e7907c50ab380a3a1bf252432b41caa71dc3ba2b575903bfd255f16b702cc89d91903f494437547a7b8fa16469cbf"; + sha256 = "10da3af84f726a9aad3dc5c8ca24136831c136cc2e52f6573b27695f33f48a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ka/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ka/thunderbird-78.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "464a9e0aebda0fa6412665e4cf2d6f590d44636bc395f8a03f96ffa7e8f5423e51499bd801f9ffb65c0c931960b761d00df3ac8f391b2157ab411ad49c7054b2"; + sha256 = "575f382c4f155f93a6cbd5a81fdb988196e2a95d0b8896af454a3cc5e3048d3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kab/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kab/thunderbird-78.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d99305c424e0475ed2c1890e2c5cc96d1e4925d329948c33ac0183e3affadd960266e76e380c4fbc017e24538428439888d96f49d73468f9f6162dcb51a358f1"; + sha256 = "bffa3681eb858a55c18b5f396bd08464eeeeda1328ec65a7c67fe4d7c7805757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kk/thunderbird-78.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9398172a5d2f902256b2b36df5f936a39e5f2d253ee4ee566109f67a49f2e2bd4239b92802475b459d79acb5af7e4839f6f5f0a5db1c7da10fa35873c470003d"; + sha256 = "866191e1d87c0b00f4bb5f2eaa0e1f66719a7ca68a175d1b30ed9a5735005705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ko/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ko/thunderbird-78.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "80e7f9929a197ea4b431376f168fcfaf42718b1744bbf0bddf8672346ff08e65c35af5816a21effaac6794d9e55009885037007e87a05571e1d7eaaf7c86f30c"; + sha256 = "f66f91f0e0b04344db0e5cbe8d48721448c775ba8f4ac69ceb1d848b7e07cda0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/lt/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/lt/thunderbird-78.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "74ca7346f87b078cb9f598e79278ee39498b09370be5517a3893dc4bc2d5efe81f9b9076b27891be0c8d170802a02ac67dabeffa022fe222e95b73455b40ff34"; + sha256 = "2294425187c5e5404af6cbca9b495902fb9bc05354eb6e3866b1e8366ea64e2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ms/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ms/thunderbird-78.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "90c71d0b3f598c21026441dd5b34efca7276f34153ffacd327f09d2c78296c9dbc2ae9eb8e1f7635b8e3cafed15f07cc3c19254405de2e6c9e1fd4300b844876"; + sha256 = "f21e85113e0f63d57f91c61e2830f1a9e721138cc00269d2fcc521d1c74666ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nb-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nb-NO/thunderbird-78.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "08da0c8a887c820d246559bb7c1394282a68f2971ba2f2943084ebf3cafdd2580477ef5a9ca06c1e5aac353287276aa88aab8346beb95addfa95d5014cd4974a"; + sha256 = "5b7982cf136c4d6120ffc7e40c65ddbb3495392181e38141ed80e3a67aeb1038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nl/thunderbird-78.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f846e221c2bf3cebd93961e6af10c24215b698cb8318c6446224f5de5b533e887e76818b6b902adc839a3f7c5ec24e9b13aae63b5d601d6716643f64aa29b7da"; + sha256 = "d9619e1ca19ef4c75eae31de3dcb6cc23146c4d1b98046473a3ebcfb3a610c52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nn-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nn-NO/thunderbird-78.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c33a600e2d64c94cdda74f2a94fc54f05133cc543c795dee70909b00b92eb5a48b183600f328f45fc8c9bdabb59f455a4875e68e6e62ce4f6309cfc0aed24fc0"; + sha256 = "e9d2a6955fb98c0dc492a5cb16977a1fc7cad778650dd601934bbc9f543b112e"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pa-IN/thunderbird-78.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha256 = "a3279bd605960f37ddc071b0f3d91726a9d911a311c13e9418013c5a1f7a5089"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pl/thunderbird-78.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "555b0fb0c4117521f020f7d9846b19dd18ccbec585cd89282384e0a311dd5bbedab84101bd55064c7ae20ecd811c70f31948da26befcb12abe0937ed2736b9b1"; + sha256 = "b22737a3a5b7c5ff3d8d22fd338490b0aff9016049bd7bf6cf6b25f15a027935"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-BR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-BR/thunderbird-78.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a51b74e5d9394ee2ebc26149e1e01766b9c4cde5815fcd915bbc5307095a851e6242fb007c8e93027ea0a77b3074679041c65a1996528435f30f7f17b06959a6"; + sha256 = "a6a18c8988db47d8163c79c465995aa0d3cd42da97bf2347b5be4d26e09e4628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-PT/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-PT/thunderbird-78.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "4912989c47a3c021a28ed56629e308d2326a07ec99dc00b624889a10013f36445fbfe11a8cdde7ff4f69c965b0d2221c61c246933cc313df9f63ae3ec65db891"; + sha256 = "8717f41a166cf8e271086987196be9b88f585a70c30119ec15199291bea1819f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/rm/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/rm/thunderbird-78.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70298a29589b928748d32adcf83b12c006d23cd3a171af1eb790eaa34eae4b1a8e97056fc71f9a795a9b9e07f5d8e2a9f4ffc475eaa4b06b9390976fd6359668"; + sha256 = "02b1131751a82c66341e58b757c1f4e438e5ef8fa44a58b904790c0a5ec66b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ro/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ro/thunderbird-78.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7c36cefeec21820b90a8acc09856aaedf4cf94215cae71daa8142a1d166de79dd0114495b92d954f978d1be88c06ad5fa269fb33ae0b307ca05f3d7ae90844d5"; + sha256 = "b7d82398f43112b5b9ab1907643cd8c39012246a1e9b74b3c4e37487df7d5bb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ru/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ru/thunderbird-78.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b7dbd077b0271818ba33d8651fc60e371f9a89771020113ce2a0785c2d228b90d219fcf944e6ee2645fd683fbc1d597529382c4b808ee4cf81f7123e1de9d583"; + sha256 = "155c7f4e678f6f3b91c07f2aa1313c08305a2c3166c199a9d8575d58c7448ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/si/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/si/thunderbird-78.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b9217a815c7f042bb33e0ea2ef9129e8ef1c825af315d0cddb6c0760bc87f1b8932b6f7cca747d50a29a55ac66a21d8113febc360e5f963566399a38e3b5a2a2"; + sha256 = "1af756f61e5c57c0d6018b3efc0072e55d7344c3a9fd343686bfb16773551503"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sk/thunderbird-78.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "494ffad5906f35f9b3141fb06f6900e0d82553c16c8f3d99b50d6718643cac21fbd6a205af146df54125c009f190285281b09bb42996505a2fc120dd85bde882"; + sha256 = "b06bc92b4ffdfe25a5003f3662ae168600a6ae8855b60353ad68de6a24067d4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sl/thunderbird-78.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d34836dbf915e4d5157a1f8760dae8d8659ceda2ceb594d737da7384139f245915f01a0b025585c117762f2d3261dffdf1c7efa5c2e1f920fe5a350d85406015"; + sha256 = "19cc8710f257c229c4700b0a9deab471b1114a21f6cde0838f6a23e29faad6b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sq/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sq/thunderbird-78.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "909aa9e820cb984459deae17b80488db09718eb428e32a35ecb1723fa3c8d7ed974f6cb17a07db8e642cdb51b885291a3fca518542372fe2c2b3360553b3527b"; + sha256 = "13c8c4893947a8178066ce7a767eea21e78b1989c94be4d573f03f98e7f43011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sr/thunderbird-78.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aa39d12ff81a371722609a4ec401021512f651c4f592159f8ef9bcfcb641b55a8f6ccea970b4d8375cb326e0cfd5fa18097ee3131e7546c53b1e29d14058622f"; + sha256 = "68939bdf7b57320dfb608d6487b877baf0d801ef3aaf0da48becd87beb41aa89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sv-SE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sv-SE/thunderbird-78.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3f373131df39c343579ddd851e8c5eef3147650a5c75a5fc3ce84c2e1a694494cd6e3ab12b3cf86018880384f02ca38a54fcca8cc04f3074699fb89c4ded78e0"; + sha256 = "36689c205cd7a6f212a5971fcc226631937232173f84cd0a2c40a87f95de001c"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/th/thunderbird-78.0.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha256 = "392267ae08739866f14d2ddf0a853a47d18b2c99856bad369b567e7360d2aff9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/tr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/tr/thunderbird-78.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2c91ad17ddad9db19ff2eb47ff7a10253febd30faee710301dcb96ed0472f81153de5d7d906b3dc706d39ff058eefcdb9210ac274469fcc02a39cdbb99a126f0"; + sha256 = "15f45f9794ab34f79951a3b9ef990f25788c45eccd65dd1aab565d2908965c66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uk/thunderbird-78.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d98a132e14a5921b6a75a8fe7cf3c1aaf22e83c4c8252dcbd5aa0434b98a7d9d88711b68cc470e6007027e6e588cf9ea00dd78a2d97b48b975adef1cd059e79d"; + sha256 = "e9b1765f80620ca7ac534c91656345ecc3218ef8a606b2a8f48f3fc1c170cbc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uz/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uz/thunderbird-78.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dac94504203e7862608333f1f84134d7afe0e1f534eec9b91ec48a850e0143b625f4be311c2e6e716a16c941d3c2f5dd2101abfae205c802749ca95428b7e754"; + sha256 = "ed2258512e980e3c72b9130b2f5f839dbbff1df05aa5cb948f4519681491ca34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/vi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/vi/thunderbird-78.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "684626eb432e89e85b9d3270198ee20470e675ea7294222755b5b588db7e318c20fd8d2fc9a0c95374e8ed53e792ab0e24e826709aa619fbab059a77e6341213"; + sha256 = "fa23f6d7c4b64776df71b5015743e8dd475cfa2a329370a92d36210711e0fd41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-CN/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-CN/thunderbird-78.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8a25fd27a555b18bc41ae31f024e80adc1b06de064bf2391c1db5510869af8c145780a01a26f6cb465d2c6b53f4ceeb924657eefeb95f7ae2ac584ddfc4a56d2"; + sha256 = "741bfc0c297a8dc9b5b4348f26886a12c75a81af11b0a6090094e6e21348e6f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-TW/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-TW/thunderbird-78.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8f202b1a79ae831bf5a28356a06213586bb2c0f4410516a8121c73a8902d0ce7e54f8e6fd7d2c74b300c9692eb3ad4a9b9290cc93ce3205f73842d93a46cb77c"; + sha256 = "cd4296eacde34b302c794beeaff0eb46bdf0f12c67aba98172133529506897af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ar/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/af/thunderbird-78.0.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha256 = "300da8f92fff4e596e5d5604002fbb5732bda61d6f54c7f79a20e2fc268a7ce2"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ar/thunderbird-78.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "868f092cc144611611133f50be9317161cb34ba2d0012d238789f2d1124b547c52d2aa02d4daa090322e327a4652808cc882835195f02bbea8e67818d22ca8da"; + sha256 = "e382faafeff426536f355e2a711dbfad7d86de3619a4d3a60868ecd8e9593b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ast/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ast/thunderbird-78.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bb077167ec58446aaaaaa7439e04332946d62cc6a35ff00bdda20a03eccf80b09bce70524c3b3351fe0b821dda0762cd666c66b00314751301a67d635c2d37e5"; + sha256 = "45c3c612f072277e9dd83fbe22bd4cf9018d481a35ea25334d12f6826c879915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/be/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/be/thunderbird-78.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a8ec19464c57509ccea6f83305d441aa9c61ddf0bfe2af172df24f67d7abaf2e568eeabfdfea9e0a843d42ff9c6d2610b1e1e5c060ccb50bce4045b47586f204"; + sha256 = "6e9fc38265fb9185915c9447ffb2d38e4e024446039704c8d45b91e152a38f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/bg/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/bg/thunderbird-78.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9c8ef811f0bf04066f3c55e4b02107450d88a1774417ee503027423917bdf16ab9b102eb0f7f4c777ee60039998f8391164f1719bb8abc4d79774664041fa6c1"; + sha256 = "cc041a49ac017568b815a5e03a37031a6a17c25110b77d37bdb96c4d53d869d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/br/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/br/thunderbird-78.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e94fa2e49fca5bd6e6f1139adb86604482deeb1160cc8fe348a1cfab2bb19c8ba694ca5743ed6e5da81c9789521e8b6018db4ecc68ec91c8a277916c6a553521"; + sha256 = "3cd798a70f493ac5a75895be3db025bb3793836e21550c3ddea6b27f7dcf6d7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ca/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ca/thunderbird-78.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4dc73850268e885b9791b29573f35704d730e9a9ac833265f47413eadb2e3d359b8b56405ebfa58816b8b2ba390077c14f17a769fec94870652147d2a2915243"; + sha256 = "553ea37490cf180bbb1f0ebcd23d87e82456797ab9f5604ee862227b0854ef12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cak/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cak/thunderbird-78.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "569d8b373efc412180cf01ad9333a1b2f05687f3b8cfc4286c81c9309681d390d9ccc2767248e36db7931e2b941dce6ca209a00e7ba5dbebea6d40c710dc2cdd"; + sha256 = "307e3234abbcee8a4aeeb46d1b8bb02c8642f1a2140dae9a2d6295bb32548742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cs/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cs/thunderbird-78.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e87eebe5c3486b02f46784209019b5f5dbfbeb36be8914604416c194bfebda2827861172019ca33bf754bc86ad91327ce5e29ecabcc77390d84be80c2f682e29"; + sha256 = "a08537b88425e2b813aed80b94d763d3c31ed9aeecf5b3b8e358c08233997ce5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cy/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cy/thunderbird-78.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e97bde29c976e200f418b2ec150969459e4e17872184dfef548b08e16286f948259d2fc84d0d07965a5dedae8d5e3268c3a6ac0794cb0c3a739ffc86b2a6f748"; + sha256 = "36b75de4d73075026f256c6502caeebd35a89ca567cbc9fd6db461608b922be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/da/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/da/thunderbird-78.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7bfbeb6e8bb427e7e3aee31e897d025e338a4c4da59eb2700b52dd08cd53efaf6dfe1d33e456572c0203fe6927bc069ff297288cc47dec2ef9835e047a5d2938"; + sha256 = "7b81b6b22888c298cba1dba3c9786249ccb0aeba8b93d998a268e33ca249c7cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/de/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/de/thunderbird-78.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "15da351e919e0b931dfe48f77b9eeeaec40e94c973de507560c62a86e2b106f7d4afa7602186829fad2984f9964ad23792ca88bd5b94976972bc103f0560ee4d"; + sha256 = "e5fa962eb83d4cc7dc2de5a2080a0d06fff4bb3b6e30c53dc979d7bfad8542f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/dsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/dsb/thunderbird-78.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1b8c1b12b8d7979a0ce45db282bc2a3b933bda3711c07097533a8a04b38edae3f0bd00298cbd485954ab09fa57b10aca5238e8a7bf4e23ea80ebed2dba1d73e2"; + sha256 = "3745a7966cb96c79b49e0f8431d8b1e90cd5f01d7ce57eeb4ab3e5f80ddea26b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/el/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/el/thunderbird-78.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "67c5dad2a95ff1b8b3ab2ebcb0c1c4af87c5325e22d43c24f4f1c0df9ac328b43b0b25247408c8c95cb5f98b9396a1714b0cb39cd2e43ecd04b28f8bd1dc43ab"; + sha256 = "037a51d7e44360a9748420ff584790abca6285d4bab8ee84414cfa602ec4c6aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-GB/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-CA/thunderbird-78.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha256 = "a12288cf187b5e3075a23e420bc58ae90370c224b0c73b8706ef52c34705d6d3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-GB/thunderbird-78.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c9feebac54a357470523029377699fc9c0bca08e4705374dd1b8756cc8461237426cded2d9ee994b7ee529c60d50a555e4e1c2d9ec71ceccb7fccc651e35058c"; + sha256 = "dc3637519c9b40260217e5302dcf4174a66298f98b478d1a6caebe154b9b549f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-US/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-US/thunderbird-78.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9280a58b42f93b38f4c9ab26b8b6c2956ccb135ae959c61799cd3ce3b3419c9642f86418ac53e9c4f69e0430508c0619db4cf856a28d233a8d319e262755f4a4"; + sha256 = "8e425ac9e0ac12d6142ef7a397dee969c87aa27fe21010a88d76a91f034328e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-AR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-AR/thunderbird-78.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "9c17d648a2ed9c2b6dc7d403436dc9aad91e10e63579e26e4dafe3d5b3a15633167c87b67924026882a03f1aab05673566a0c5f0d84efb656b6b3d7d4b812e5e"; + sha256 = "4da82ae1bed1ac257b878e5f8de6be6490131f15ee9db44de4aa10202a790e5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-ES/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-ES/thunderbird-78.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d22ba4fbd7e8d22f70950b61354b99ffa6bb1c298504f8f05297cbc20f0c89a9d657c74ab367480906cbc4b699df6c603d6f6b936ccdb4213e178f3eb153a314"; + sha256 = "706ae91e5d36cc85f35833d5508ab7f3d0b8505491b5a86ca4447139b532b929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/et/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/et/thunderbird-78.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "107fa0cd997edeba0a88d365c52fe48ea0d355ca8bf8723f5bf2ad4a930711e8fcdad27b457d309a5d4dfc0f29f6988f2b04f153b83384484ed397261c07db7d"; + sha256 = "f74858d4b770245f3fa1d4f9ceebd274524dee73320fd4bdeb0e251a5d11c253"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/eu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/eu/thunderbird-78.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ba50b4fed2d682f1c46699f72d86b219a1bb398b1b2180cdfd246bf4eaffd61e34e24222bcd82ebcc68b9cfa9f98f56fe859cc6d5bd744a7223e7264d6d4f261"; + sha256 = "aa02f9fb911a61da3183df79dc4d3760a5d6a259305da72932ff962cfe390d48"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fa/thunderbird-78.0.tar.bz2"; + locale = "fa"; + arch = "linux-i686"; + sha256 = "6b41612ea00a38e8bd4d1a796cbf5e3bb6d413cebcb473bcf9c5bde0d074cbfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fi/thunderbird-78.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "6f4fde19af18845d50f591940786402233bb77f518f1f8f9cda727bd458e21669f692681cc691617a0ce05f8516383ce38b7b51445e3937ff8c1868e84a92ae0"; + sha256 = "f64e3e2e266478c36c50cc19a161dd9496db6f668f2078bc182c1ddeedf3410c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fr/thunderbird-78.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7e9dc42478dae325a51f44781048a55fea3e2bedcbf663c534510404e59dfa10216dfc0df4efd40e0bf1f4fea3abdc9867b6c6b33f199e406ab07d68b68acfe5"; + sha256 = "eae396eae122ba4bc965fd8036264bf8bf88f52944558c7c1c0891a4254d04ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fy-NL/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fy-NL/thunderbird-78.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1b665dce92e8c1de000063f1a12192a2fa5aff2c65db9aa6769ca16604e7e97a602baad9761110124c65dc479fdbce7640020701fb280b3c62e5c78368fb496f"; + sha256 = "3163461706339a7bc34b8d7b83005b2ca962f6b6830b9da32c58aa7613c4efc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ga-IE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ga-IE/thunderbird-78.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "42faafcbe85ab995b549bf072942dcc2e87780099b3bcb2974ca3eff6acade40be7bd8ded5cb0db6a02bfdc255c60e252061a767543b2215719a1fc2600fdd81"; + sha256 = "e2d1d31528e7b2773e898202adc2fefc3fac38843792d6ad57e093d3de6ee4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gd/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gd/thunderbird-78.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1455ef926d71ecfdad24ebcf4b3de59d04611bf641ba381534bd1b94c2f7b730687cf2e8412e6910d37e402b58f32588482089f4d12308a7b9cf6af82b66e97"; + sha256 = "429160e98e24545f7890372eae1f2ef732b3a7ecd6529fde4ca247fbe251475a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gl/thunderbird-78.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "344d619a5437d0efe2e522680849dd809b07c3aa9cf2831610aaf7ce28e81f16782a4a8174c01cc339914e02a23cb3ce603d04dd0dca8eb4f547e0d0e780d8f6"; + sha256 = "215c0f6f3409200db5c25cf26c2f305917cc7b9b10b734d22be2bea7d4b34443"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/he/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/he/thunderbird-78.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "c081d81f3c1a61d2922bdad144a97c8568326e97fe29909d4319ca9019d9bd466dccabc6f2069eadafaa6bf6bb5bd50e8cf0c070dd992cc095411dd909b43f06"; + sha256 = "9b13364552d3afdc4fbdd2683d70b32b3f3c91633528c8b3684c7d9060431818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hr/thunderbird-78.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "2c142b9bed17fc1fef3e4339f0477d3f469923083a37ec3b2dc3d4690a44ee34d5a23faa37876cec2f3bcd02c1048ec343f16bd02a1771296e77cf3f63ca787e"; + sha256 = "92a043ec615e0f92ff301df498023a31e5a32fdbcb01be0e95ee91917ad88112"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hsb/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hsb/thunderbird-78.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fcbcc78b1d5620c27b7cfb7ee88463dc81664f5eba679a81920ac6923b0e3f05bc70b99ba7268017b59219872921e76860a113fbba757cebf942641ba0591517"; + sha256 = "a73b9619b2da033be6913c4342fe23886a9ba6710a65496878490e3f6c016901"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hu/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hu/thunderbird-78.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d59024db516156a89cbcc0148a5bf85059ac2393f41709e224f109abca6fea693b822d7c4a3ce5e360435c8700010aaeb4b26ef9e163827bcc8b6cf1761d3781"; + sha256 = "b1e938c785946d91e5759cc5f34d75fbbbf421b4f8b5dbe1eee9158fc277198d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hy-AM/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hy-AM/thunderbird-78.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "17876cefb335375b7884080315690fef116983b7559421f86ad0ef787bdfdf5aed283d84114cc1c1d3cb3119d735f50e975f94ead6fcab6046c207d4c1a8fc8b"; + sha256 = "7ad07de9dc366057b004893f3d77900dcd4cb6532127a60b07b343752b96ef96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/id/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/id/thunderbird-78.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0c74ca260ffee635cd556c0710a13ed091a1f2eb63a1b1ac2a745ea0e86d42b52b08b00f648c406356e1e170c77242d43d9a4d2b2f0bb1fb26d4dc83b4179a8c"; + sha256 = "51b239fc75b2b0769faab37ba8c03973dc9a275eb8730193100f5d3cfd5b1621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/is/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/is/thunderbird-78.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "97fdf5fa7dd6fade8ec7efc179f6a65bda90cfb285341e3e98b9b2ab70ba91ebc8c47bf8948189d4c181566c9ed950fbd0fb6b4d4cd96b2e3329c0085e32771c"; + sha256 = "69299e2873cd042e64146faa329f72039c079645014270acf08a2a0357a7025e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/it/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/it/thunderbird-78.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3d42b5a8c55519accb3246c5a7f50def9d854ccaffa0e34b20e6e2f51cc07a787a9ab0c0b205e28b40d9ec4f55f1176f391ff9156076327f8a4416a9ff6ea8ae"; + sha256 = "dfc2f83084ea80483a258e2ef879bcdd31256c55920f2d86fa170dd0ba432091"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ja/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ja/thunderbird-78.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "bf90c9c27abac84ef91a2fe3ceea142ac7041c10d41a0e5a2ee31742f9f64b2b24a331af769e8ae93c7b09bf8645dc4d274524281fbfe69a908fd22aaac7c2d8"; + sha256 = "7b1cbca9399856b3c413e7277617c808b3f670c6470e3c243c6fde9aa035d563"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ka/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ka/thunderbird-78.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8e2fb192c6776ad702ea7aaa9bc9dd31b20c1c66e2ce4dd91aa10eda5528172680740e28f8a7bab52a7c6eae92578822669d6ad068bbc85a04d97c91a4b7e08b"; + sha256 = "2ab93932f7e567b3e9ebae4fd4c1d032917c656408b5b74cfd51f0e35bf14af6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kab/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kab/thunderbird-78.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "10b9418db83b328353afb73b7630add081309cc0b55fac8aec38f6e09036968082d3d12386efb6b4347b33977998bbd906501adc45a8c8d27dfd0f8d98288bde"; + sha256 = "c6bf87d821095326487e4822e6c373b4c5ec9ebd9dfcee511c4b85031ae7caa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kk/thunderbird-78.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7dcfb10ce402c90452815523d5672a1cd60201b33b997c5b769341e904f4840ff57685eab61dc3073f789bf042453f3d144e54bec32afae2dd65367a0f1768a1"; + sha256 = "06cd2284afca05ebfb16ebabd128d66f8a45751fc7a5c1f4ef39a2753dc8e88c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ko/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ko/thunderbird-78.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "fddcd08f00cc4f3de59993c8c917e20e77918d87e2c23e989e8e8aaf78c6130f42e546acc17eb6f8c9a24550c596ad201d63f325e7ba078a6c791fc94589e0a5"; + sha256 = "bbbb6e7c1c444168ab9b7c3797ca1bffa3c885980e2f215c914780a1ae5d1871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/lt/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/lt/thunderbird-78.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ab221093a0df2876f558ff2e0df090b95872281e1cae8ac23c9753dadd6305608c6e7ec5104d491ca3a3f1c1ebd830b8094080ce99bba49b19b46e617238cc87"; + sha256 = "b64e1a057623a85841137b7aae1832d4757766ac1d37452453a0130582043474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ms/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ms/thunderbird-78.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ce6b0e1ba8a1a1bbfd4d2e265a45430c2d931530d13eff67fea4179c4a8e2a204ff35103c921073bc33c3e2a8f8f3f55fb91b3218cab9718df76da696ed09750"; + sha256 = "eaeb81daf522f0282d57c5b77f54b736c9a723c3a2ad0ddbc2501683cd3dff63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nb-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nb-NO/thunderbird-78.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "07e73fd67e0c1974c5e5b90d74e555b75820b66ae9bca0470b6d291e848e5f28fea680cf09c2167dd56b0765ae0e3682b5f2ab7f33cc5b059e60252236dc24cd"; + sha256 = "5db8562f43efcfff4f950c1e2f6837d8ceb9e73543e7c7dd75e695709defbc61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nl/thunderbird-78.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a24ed7d30e53058653c0de6b96867fa9621118fa43e109940502eea798a5c7b8688c65bf08d765f3c6dc6e8ab0dabfef98ae005e00c465f847454b384953276f"; + sha256 = "77ea8f460f82d05369ff110b85c4b995623caa7b62e38ebb5d8e0f7ecbfeabd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nn-NO/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nn-NO/thunderbird-78.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4bddbdd0a2353f8c43e65cbce5974911809cf28c3d7ce521d662d782f8858b469575857688a5c674f6d028acd55869c062edf9f55dfa3d387fab8fb60f6f2fad"; + sha256 = "83d2439498fca42c3b4095515c9359f89500bd11029fa58ba19e6058d3b696dc"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pa-IN/thunderbird-78.0.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha256 = "805947c3014c660ec66d5382dce6a733efe196b45b445a7d2467e209ce889727"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pl/thunderbird-78.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "953d9e547eb343a0d7f96f501bb87ece71e2f860f8517fb13b76301c7b3e77d7f572a8106fdd43c2b390654457e43703b22566bd3159ace962af2eb1f8bc6ca8"; + sha256 = "a7eade7fc0b68361e0a8d6a1cde62d7253f938dc0e93fda56d0ed296304b162f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-BR/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-BR/thunderbird-78.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b3807897100857c33768478c9dec57024f968a83188b51bd2708b7caf7c53edb39b15cc8dfb5f73ca937c298fa83551edf82d7f43c065bc2fc25467a02343d20"; + sha256 = "7e5a89cc9460ef65f1b5141d7bbbfd39f2d38aac599b50c8f57b39ff2218f7db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-PT/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-PT/thunderbird-78.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "e50bf636697714fc4dfd04e1a8d6d7d87239553f01064bb566e218395a2e5d9b16ef22c01509f18f9f562b75eb19a2616d8c7f8a4d212a9a445b1eece17527f7"; + sha256 = "809945bd2390457d2ffc1f232e120aa68c0e8232a69d14b6cd1207ed4fc62bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/rm/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/rm/thunderbird-78.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "1480eb4c77d88fc461000f423179e5bc693b2f25abe5c6384f4c98494f698c620fdd53e65d75ebd17ce9546c5fb00ef8f40bfffd9b31114417cd10262569a54d"; + sha256 = "82849eb2a8db39d99cc1fb514d0a4a78c1380fa5ad75434d0969860b5fa0c5f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ro/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ro/thunderbird-78.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d9cfc8f03d75f3a58fe103c34eb0fdcb3530f0ebc68c0acae7fe1b783bf11c0585e266556d16fa3db174aaafcc319cef9cfa363361cad7b1053a504101b13880"; + sha256 = "c9abc67c0612e3da4d9519d93cd87718898e6465f8275cae9edd7127f3e9c964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ru/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ru/thunderbird-78.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d67f550615eb195b80f7338708b7ecf7455203f86aff1682f2e8e654d019fb49c6468eb1c099f7fc78797b97d41c9f42aff5498f27b6cb458f049fd8b6aa3d4e"; + sha256 = "77c7e1f174c5540bc683ae71653392e24dd70737f6a6f9298c746cdbbb1f2e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/si/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/si/thunderbird-78.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6dd9d78a9f2ef4ed28a95e83e76e9779d02c950ba906ca14d8fac0bf7300ad2d7d5ad9cfa3973cc8c861011dc8f1c58a6ea5909206443cd2f24bf5bcfe8c5673"; + sha256 = "d45b2a6492fd732652ac4d160b74f612261c33dee7f8f7c21bb1a8e0d45d72a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sk/thunderbird-78.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ba40286898a7722533f8a65e1e9bb494bc28212d2fe21c820f64b1a8bcaad6d0ca1d7a870d5289792a79a6c4851931236b13c1ba07b812b591b3d4c6004ff78d"; + sha256 = "cb4e2492618d70b67b2deb803ed5d02a2851dbdad26098c305c804017d27290e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sl/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sl/thunderbird-78.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bc8e926583e92f4cfe3081a1bb618d7c5fbe9e1f93af378040a72820b820a38915ff1c74deb6069bbaf2957adc536b78faf1df853e8ff6390a9396d909ee040e"; + sha256 = "b731685c0de6ba0350259f84a2b4c597849459bbe5cd632796a09370d2697ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sq/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sq/thunderbird-78.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "084bce04b0d83ab24682d04f4c788d61a2a6bfe0777f44f4c9a07d8fd7fef4251464e9a0e523f4e111bd5323ceb398fa09ae3391295047beac3157ce9d2e8905"; + sha256 = "4c2013d3b64cceec11bbf58cfd3dd306653410ffde95ffdc649c3ffd2390e542"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sr/thunderbird-78.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "544ed1f0cb8beeac3ac1b2ed02078c3acc5961d6fe4c3f0722b1a36208740226053236453a215e564371453cc5acb541a6f307d594524081a5f4c96aa077c21f"; + sha256 = "ad0fbf13c2e0aea8b5ba97516d0ec53bf2fd4868155e66df5297cc95a27246db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sv-SE/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sv-SE/thunderbird-78.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "806ea4d93a8cb3e5dba8cbc59dd25adbb19e048306124ffebbf1b2a56d49f236d9a79d0e14b5fc0c15537c266a85408ce1a5568e8e6e4417dd94f1b98d9bf36e"; + sha256 = "4af730894f076b9a48afd5a202f7e78a11f050a11e5e2011726370e1b14ce70f"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/th/thunderbird-78.0.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha256 = "901c62b2adabd67d98314a18782638c8f7e9f55d8ebcb0686b2c7355696f71f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/tr/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/tr/thunderbird-78.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "cf30e9ebaf5770437415377c9a13d66b44a7de7c85bec9b980d9e2e059db7f3756f2c3a888ebf9185c59451e2473440fe2c1ff28a979e066225719effecb1c38"; + sha256 = "ac7794552303525a4b72dac166624c06b7392fbdb063144a793a39d4ad6fbac0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uk/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uk/thunderbird-78.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a7f5f6b0f1bc849a3a48a30edc8e408eec0c5e544bb4444a8ade969b1fe7ef1fb9d26a0fea3d4d31bf88eb67570e895fb5d916b9ac88c2a8455abcec60d56ca0"; + sha256 = "890373ce0813c7cd4cf8eec39af6a362d1e88c4bf967ccb3482b7dbb806dd228"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uz/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uz/thunderbird-78.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "716e1c0a7b9b0ea33d1464930b68f3f817ce3310bee9000199f9e6bdc4d0d68dc6098665423ada94d7ede600cb0c965adcbb413068adf1415cbc048a7f847ebf"; + sha256 = "0153af7da918e0b3a9d50e2970f946dcc3ca2ba0b92782f82917153a2fb850b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/vi/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/vi/thunderbird-78.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1667ab35ed705e739c5192246444eda912ec86a153dd1fc3ed83a5ed61d47d5849270492015198cca82827720bc019fa561e710df5fa77a758864e6cfb09d4aa"; + sha256 = "55ba1938bc0b894f92bb17435b0bbf19e15da8163dfcfb377b87db02aff8e564"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-CN/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-CN/thunderbird-78.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4ef6c9933ce8671442aa86f804085b4ce9a73aa4f8cd598b7d41a844be37d54cbd8a2dc39d6ab97f160856435475093f3240f960a206e53d327a4b2e47fac45d"; + sha256 = "921619f82d094b35d74dd54071191ce00487aeb90190e2d2b6f229610e016878"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-TW/thunderbird-68.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-TW/thunderbird-78.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ab19d7c1114835a380e035dafc2e30849e8084cdac9175eb5eb3a9fde81d49cb710d9dce21652780a35011d139e070c0f61840275aa8d0e99252bfa5a8aa1735"; + sha256 = "28a03fc23a2961bdb1ea3cf1fa08be57302627071f4dc096eb9aca58124e5058"; } ]; } From 1a5592a060bad721ab6db99e742a4d5a2c0c6836 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:39:25 +0900 Subject: [PATCH 069/234] thunderbird: copy thunderbird -> thunderbird-68 --- .../networking/mailreaders/thunderbird/68.nix | 343 ++++++++++++++++++ .../thunderbird/no-buildconfig-68.patch | 35 ++ pkgs/top-level/all-packages.nix | 7 + 3 files changed, 385 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/68.nix create mode 100644 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix new file mode 100644 index 0000000000000..28632e9d17333 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -0,0 +1,343 @@ +# This pakcage is keeped until Thunderbird 78 supports OpenPGP. +# https://www.thunderbird.net/en-US/thunderbird/78.0.1/releasenotes/ +{ autoconf213 +, bzip2 +, cargo +, common-updater-scripts +, coreutils +, curl +, dbus +, dbus-glib +, fetchurl +, file +, fontconfig +, freetype +, glib +, gnugrep +, gnused +, icu +, jemalloc +, lib +, libGL +, libGLU +, libevent +, libjpeg +, libnotify +, libpng +, libstartup_notification +, libvpx +, libwebp +, llvmPackages +, m4 +, makeDesktopItem +, nasm +, nodejs +, nspr +, nss +, pango +, perl +, pkgconfig +, python2 +, python3 +, runtimeShell +, rust-cbindgen +, rustc +, sqlite +, stdenv +, systemd +, unzip +, which +, writeScript +, xidel +, xorg +, yasm +, zip +, zlib + +, debugBuild ? false + +, alsaSupport ? stdenv.isLinux, alsaLib +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook +, waylandSupport ? true +, libxkbcommon, calendarSupport ? true + +, # If you want the resulting program to call itself "Thunderbird" instead +# of "Earlybird" or whatever, enable this option. However, those +# binaries may not be distributed without permission from the +# Mozilla Foundation, see +# http://www.mozilla.org/foundation/trademarks/. +enableOfficialBranding ? false +}: + +assert waylandSupport -> gtk3Support == true; + +stdenv.mkDerivation rec { + pname = "thunderbird"; + version = "68.10.0"; + + src = fetchurl { + url = + "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = + "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; + }; + + nativeBuildInputs = [ + autoconf213 + cargo + gnused + llvmPackages.llvm + m4 + nasm + nodejs + perl + pkgconfig + python2 + python3 + rust-cbindgen + rustc + which + yasm + ] ++ lib.optional gtk3Support wrapGAppsHook; + + buildInputs = [ + bzip2 + dbus + dbus-glib + file + fontconfig + freetype + glib + gtk2 + icu + jemalloc + libGL + libGLU + libevent + libjpeg + libnotify + libpng + libstartup_notification + libvpx + libwebp + nspr + nss + pango + perl + sqlite + unzip + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcursor + xorg.libXext + xorg.libXft + xorg.libXi + xorg.libXrender + xorg.libXt + xorg.pixman + xorg.xorgproto + zip + zlib + ] ++ lib.optional alsaSupport alsaLib + ++ lib.optional gtk3Support gtk3 + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional waylandSupport libxkbcommon; + + NIX_CFLAGS_COMPILE =[ + "-I${glib.dev}/include/gio-unix-2.0" + "-I${nss.dev}/include/nss" + ]; + + patches = [ + ./no-buildconfig-68.patch + ]; + + postPatch = '' + rm -rf obj-x86_64-pc-linux-gnu + ''; + + hardeningDisable = [ "format" ]; + + preConfigure = '' + # remove distributed configuration files + rm -f configure + rm -f js/src/configure + rm -f .mozconfig* + + configureScript="$(realpath ./mach) configure" + # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + unset AS + + export MOZCONFIG=$(pwd)/mozconfig + + # Set C flags for Rust's bindgen program. Unlike ordinary C + # compilation, bindgen does not invoke $CC directly. Instead it + # uses LLVM's libclang. To make sure all necessary flags are + # included we need to look in a few places. + # TODO: generalize this process for other use-cases. + + BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ + $(< ${stdenv.cc}/nix-support/cc-cflags) \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ + ${ + lib.optionalString stdenv.cc.isClang + "-idirafter ${stdenv.cc.cc}/lib/clang/${ + lib.getVersion stdenv.cc.cc + }/include" + } \ + ${ + lib.optionalString stdenv.cc.isGNU + "-isystem ${stdenv.cc.cc}/include/c++/${ + lib.getVersion stdenv.cc.cc + } -isystem ${stdenv.cc.cc}/include/c++/${ + lib.getVersion stdenv.cc.cc + }/${stdenv.hostPlatform.config}" + } \ + $NIX_CFLAGS_COMPILE" + + echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG + ''; + + configureFlags = let + toolkitSlug = if gtk3Support then + "3${lib.optionalString waylandSupport "-wayland"}" + else + "2"; + toolkitValue = "cairo-gtk${toolkitSlug}"; + in [ + "--enable-application=comm/mail" + + "--with-system-bz2" + "--with-system-icu" + "--with-system-jpeg" + "--with-system-libevent" + "--with-system-nspr" + "--with-system-nss" + "--with-system-png" # needs APNG support + "--with-system-icu" + "--with-system-zlib" + "--with-system-webp" + "--with-system-libvpx" + + "--enable-rust-simd" + "--enable-crashreporter" + "--enable-default-toolkit=${toolkitValue}" + "--enable-js-shell" + "--enable-necko-wifi" + "--enable-startup-notification" + "--enable-system-ffi" + "--enable-system-pixman" + "--enable-system-sqlite" + + "--disable-gconf" + "--disable-tests" + "--disable-updater" + "--enable-jemalloc" + ] ++ (if debugBuild then [ + "--enable-debug" + "--enable-profiling" + ] else [ + "--disable-debug" + "--enable-release" + "--disable-debug-symbols" + "--enable-optimize" + "--enable-strip" + ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ] ++ lib.optional alsaSupport "--enable-alsa" + ++ lib.optional calendarSupport "--enable-calendar" + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optional pulseaudioSupport "--enable-pulseaudio"; + + enableParallelBuilding = true; + + postConfigure = '' + cd obj-* + ''; + + makeFlags = lib.optionals enableOfficialBranding [ + "MOZILLA_OFFICIAL=1" + "BUILD_OFFICIAL=1" + ]; + + doCheck = false; + + postInstall = let + desktopItem = makeDesktopItem { + categories = lib.concatStringsSep ";" [ "Application" "Network" ]; + desktopName = "Thunderbird"; + genericName = "Mail Reader"; + name = "thunderbird"; + exec = "thunderbird %U"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; + mimeType = lib.concatStringsSep ";" [ + # Email + "x-scheme-handler/mailto" + "message/rfc822" + # Feeds + "x-scheme-handler/feed" + "application/rss+xml" + "application/x-extension-rss" + # Newsgroups + "x-scheme-handler/news" + "x-scheme-handler/snews" + "x-scheme-handler/nntp" + ]; + }; + in '' + # TODO: Move to a dev output? + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + + ${desktopItem.buildCommand} + ''; + + preFixup = '' + # Needed to find Mozilla runtime + gappsWrapperArgs+=( + --argv0 "$out/bin/thunderbird" + --set MOZ_APP_LAUNCHER thunderbird + # https://github.com/NixOS/nixpkgs/pull/61980 + --set SNAP_NAME "thunderbird" + --set MOZ_LEGACY_PROFILES 1 + --set MOZ_ALLOW_DOWNGRADE 1 + ) + ''; + + # FIXME: The XUL portion of this can probably be removed as soon as we + # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? + postFixup = '' + local xul="$out/lib/thunderbird/libxul.so" + patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + ''; + + doInstallCheck = true; + installCheckPhase = '' + "$out/bin/thunderbird" --version + ''; + + disallowedRequisites = [ + stdenv.cc + ]; + + passthru.updateScript = import ./../../browsers/firefox/update.nix { + attrPath = "thunderbird"; + baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused + gnugrep curl runtimeShell; + }; + + meta = with stdenv.lib; { + description = "A full-featured e-mail client"; + homepage = "https://www.thunderbird.net"; + maintainers = with maintainers; [ + eelco + lovesegfault + pierron + ]; + platforms = platforms.linux; + license = licenses.mpl20; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch new file mode 100644 index 0000000000000..fe3a93ebda7be --- /dev/null +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch @@ -0,0 +1,35 @@ +diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 ++++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 +@@ -32,8 +32,6 @@ + {"about", "chrome://global/content/aboutAbout.xhtml", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xul", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn +--- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 ++++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 +@@ -39,7 +39,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml +--- a/comm/mail/base/jar.mn ++++ b/comm/mail/base/jar.mn +@@ -117,9 +117,7 @@ + % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js + % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul + +-* content/messenger/buildconfig.html (content/buildconfig.html) + content/messenger/buildconfig.css (content/buildconfig.css) +-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html + % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css + + # L10n resources and overrides. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df94097f9872..8d9d137bc6dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22824,6 +22824,13 @@ in nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68) }; + thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + inherit (rustPackages_1_44) cargo rustc; + libpng = libpng_apng; + nss = nss_3_44; + gtk3Support = true; + }; + thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; From 13bf99708c782e0b04baf6a513c455fa7f045403 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 15 Jul 2020 15:12:54 +0900 Subject: [PATCH 070/234] thunderbird: 68.9.0 -> 78.0 - Updated the version and the source hash. - Removed unsupported options. - Updated the patch. - Tweaked dependencies; 78 requires newer versions. --- .../mailreaders/thunderbird/default.nix | 9 ++----- .../thunderbird/no-buildconfig.patch | 25 ++++++++++--------- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6cb27055ddbc5..e161b5bf5b021 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.10.0"; + version = "78.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; + "0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr"; }; nativeBuildInputs = [ @@ -206,14 +206,12 @@ stdenv.mkDerivation rec { in [ "--enable-application=comm/mail" - "--with-system-bz2" "--with-system-icu" "--with-system-jpeg" "--with-system-libevent" "--with-system-nspr" "--with-system-nss" "--with-system-png" # needs APNG support - "--with-system-icu" "--with-system-zlib" "--with-system-webp" "--with-system-libvpx" @@ -223,12 +221,9 @@ stdenv.mkDerivation rec { "--enable-default-toolkit=${toolkitValue}" "--enable-js-shell" "--enable-necko-wifi" - "--enable-startup-notification" "--enable-system-ffi" "--enable-system-pixman" - "--enable-system-sqlite" - "--disable-gconf" "--disable-tests" "--disable-updater" "--enable-jemalloc" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index fe3a93ebda7be..efbddd3fba81b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,31 +1,32 @@ diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp ---- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200 -+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200 -@@ -32,8 +32,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -63,8 +63,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", nsIAboutModule::ALLOW_SCRIPT}, - {"buildconfig", "chrome://global/content/buildconfig.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn ---- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200 -+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200 -@@ -39,7 +39,6 @@ - content/global/plugins.css +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -35,7 +35,6 @@ + content/global/plugins.js content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html content/global/buildconfig.css content/global/contentAreaUtils.js content/global/datepicker.xhtml +diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -117,9 +117,7 @@ +@@ -119,9 +119,7 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul + % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml -* content/messenger/buildconfig.html (content/buildconfig.html) content/messenger/buildconfig.css (content/buildconfig.css) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d9d137bc6dde..5d8c0591e956e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22820,8 +22820,9 @@ in thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; + icu = icu67; + libvpx = libvpx_1_8; gtk3Support = true; - nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68) }; thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { From 762a159753b8144022908a3884a76ac1cd7c7c1a Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 24 Jul 2020 12:13:24 +0900 Subject: [PATCH 071/234] thunderbird-bin: 78.0 -> 78.0.1 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 4da6a221b3e40..6eee907db1756 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.0"; + version = "78.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/af/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/af/thunderbird-78.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6ff0f696c6caef049d0489085e7b9c3f7240e242c23aef9a36905c67bcbdef33"; + sha256 = "2050aae67c7058ea8991adbfc8c0533c2df2baccf4b5f9d42c794a914c8b893a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ar/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ar/thunderbird-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "54b09003901703c2820b20534d403cfbe0b59d7dfb5962cd370049795552e88e"; + sha256 = "1fc387ed18cae62280795729ce61a04942e319fb1162d54740ed6b3b73198987"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ast/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ast/thunderbird-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "98c159c6ece97f113614107a1ba351901cc4f816d165f6fb2b3ceee7c5fbed6c"; + sha256 = "cfedbfe2c96814fef42c8e2e4b5aba9f9add0e3c70a2c01ff7528d878a6ab659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/be/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/be/thunderbird-78.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "abc376f1525e53aa734d00a8a52d30ba2c95fe0f2d053c54e019eecd35191f47"; + sha256 = "e1d6ec9ca197d2fe5312b9b0e403e3ee2ee32be05b2d329ff0b21d9c42ba77a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/bg/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/bg/thunderbird-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a53deb5c4d83719e380b69a41f3a80e634c8d251a1724e1d49e5ad8ac5da1aca"; + sha256 = "9b8b5322b6808185fcaa9614b7def311ccaf14b0939447a538b8b13fdd7ffcec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/br/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/br/thunderbird-78.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8424ab87bfb1c1622d244961896bf4109fac2a38bccfbc6facfc7ce723a6ef06"; + sha256 = "1f8429ba0563ab22cb1c30e15ee80d42864f01b0713e37448059335b8f1cdee9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ca/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ca/thunderbird-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8283ed7294338be053900ea85e4d9e26ed5ef5a53d419298ddb4d4b0cfd3a8fd"; + sha256 = "bdee4855e082b473f0434f5a16aa704eadc3ed4b0c186b42aaf5aa600f29d066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cak/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cak/thunderbird-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "10cca56df7a22ea31fcc3f2fdcc4cea8344727183ca4d7cc1f6d78cd881879d4"; + sha256 = "9d6188ecacf4b76a91c2f4a8cbabf194eba05ffca54b79b3e0ee44919540e353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cs/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cs/thunderbird-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "fa476dde45d9f3796e71ed26126ef99569f92344d9c5754dd154df2b79513312"; + sha256 = "edc391204cfc8c1eb1c93fca5f2ec67708c76fa4a1b972defd55f1645ccb3c56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/cy/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cy/thunderbird-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "319919e66b178aaa86f74717aaf7a7dc54c53c4d400fc0f54d3ff0a4bcb5ea3f"; + sha256 = "e179d9c7252b2915e84d2cb0e1c0c1b9568374bbe65348456e4dedf2f883023e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/da/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/da/thunderbird-78.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9a3eb38c50fb9c1a1fe58899c304884c2a3e295a278feb40296a48f845f4a8e9"; + sha256 = "53b9e2107a1bc89132e7a3e1d08d4acebff872c19a639100ef1c0ebb4c3d0b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/de/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/de/thunderbird-78.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "260dd2a5227225168327dca79f44ddba7bef4a1a0411a731a192163b36a217a6"; + sha256 = "03bed4f7360142dcaa1824ce5deae519a9ba00f43427fbef78246036de159466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/dsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/dsb/thunderbird-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "559bdb00b7741897c245d367c5147503e580d446b2a6b90e83af2ac9b64ecdd0"; + sha256 = "50217d664170eaf71da7a5111337583aad4a181dfd32eb3686f7a31ec6fdf4be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/el/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/el/thunderbird-78.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2f8fdf4aa2347cafa43c1b7e7c7cb6a358878e8470b45d04634566efc089e1a8"; + sha256 = "b6d1f45955cdd99d097b955e6c2fd017afbfdaa8d0b505d231548acea5d31e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-CA/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-CA/thunderbird-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e3921e80a168544f41c39d0281ea32a4660fee8146a7a0b85292f360186ad876"; + sha256 = "f1f9c597816f4a3b30561c186c0944e6fc0fd47616292002d858341a0c6ef5a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-GB/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-GB/thunderbird-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a1c2c9f9e7a14ad0abf83d7b268c47e0ef13d4bd3966adedd0ad46bcd4c7f8c6"; + sha256 = "a771190706f3bb163a7962bf4767b9177c324cc3bdc28470375a4ea26022881b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/en-US/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-US/thunderbird-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "57384c634f511c249c3618adcbbd9d2c0fa2a711c2af145d3a390d0950b94209"; + sha256 = "428af66882e1abd047491c6a4a317eda6095191bd0ab81308d162c4a3c8d227e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-AR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-AR/thunderbird-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e727f4a725f5e389d99d929fa6792863c74e57e23452e3be1a88a3852c83f7ed"; + sha256 = "b1fae29c0caa3f2c5cfdea0ee169fa4f080027fd4e0347db6546f335bd7b6759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/es-ES/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-ES/thunderbird-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2fac6c47b544fa7b663126f137e4850f5bbe1da115a845b99353454ae0c175a0"; + sha256 = "58c1a11820860e2efe3f38b889962f794e56de4e2d1d94855e10bab1fc4d21af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/et/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/et/thunderbird-78.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e3bf4000c8e5d04ddd9bf0a86dfd8aff02304b5d86c55f649fa43deb3ab9809b"; + sha256 = "71fac7d3c3e74bff029b5432f8caaa76abdd19d38a64ba6192d371c97a09e353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/eu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/eu/thunderbird-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3c6249fc0d2707b9472ef5b3876fefc3cbafca617ca27037ad8e98706d509eb5"; + sha256 = "60492decef4b40d8a24e6c04ae0494b178a47a4782388eca7c3e2c2b7b0823ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fa/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fa/thunderbird-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7e2edcf08b456f53d8274d17e1bcbd9efb997f74b164224d3e153d64ac7fe60e"; + sha256 = "d3bf790906b9b3c016cce51aeb1671c9d80f28d3c959073bfab0c14dc952d85b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fi/thunderbird-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1f6cc927ec2e21a67e61c7d09d93f846d5c1bb1ef54644b618ed806a4541170e"; + sha256 = "7e6c77c994027e8e941a498d8dcc6e82911cd4b6e3a61c78206fe7bc114ae006"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fr/thunderbird-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f471719cecaca31e5a940bb82908648703a37b74f647d7c1c434f8db339ef974"; + sha256 = "d4e073368df92a81eae6b3480f3d06d461aab18841a0ed64d7f8d1c5b4623168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/fy-NL/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fy-NL/thunderbird-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "405daca824b721680f77e3ad8936246825d132c11da4ec2277a022f899ee2ce7"; + sha256 = "41e161d7447b64438652210d9091517b42edcf9b011f01c8c1ceb87539acd295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ga-IE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ga-IE/thunderbird-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "899127ff4f98f922e405844df1162e66d484443e5a84bb6c575cc28658b52649"; + sha256 = "a3f1b487d585ed66089b051a01b8b4da6edea684d2bdca94570dcb7cb283c8ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gd/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gd/thunderbird-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "183f757b4d70b999064f8a8e495bbe9a6a9783d939811bd93181c9cbf61dc880"; + sha256 = "ebcedbf87577cffae7ba8ed83e9b9f981fd205e178701084cd2f813e30a8adee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/gl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gl/thunderbird-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "58130045fbcdbcd10541ea6c2d13b95455af8e5fb9893a80d999b79d814eaf17"; + sha256 = "ffdfe4c9c22ac161e801d44599fe507c1ab9d7a8f46181cf1cdce023bccc4161"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/he/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/he/thunderbird-78.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "719ce3b7d4e3841a7092e658f43a8960d68d82ebad6b6dc43d12708a07054a8f"; + sha256 = "cad855f0c469056e1830d2f08be9c42ee348a5ccf74015585451161a0d7fb432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hr/thunderbird-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "49f9f0c18ad45a73361520a055f02b6b8da22419c37c8423dab64ab13f253834"; + sha256 = "86b80d641ac0e5f7ffbfca3a5539cc1422d67a6b36cefaef9d92d03284955648"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hsb/thunderbird-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7abc5362bc14853c7a9d93c84f1d04dd5d4f0ebdd7c71c782b83e8f56d716516"; + sha256 = "062f55ebb24178c604527173511277115cdb49a7bc416f9824359cc700686a7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hu/thunderbird-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5bb475dc366e9cae5e9e1422bb4f7e1eb1b605dd5e5193ccc253dffc11c4a0aa"; + sha256 = "281479c1f791cea5c5b64ec103ade785844470d0d803d6298d1f1ec505d7eba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/hy-AM/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hy-AM/thunderbird-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c42d6cc12203ac812b5794234ccbd38ea83114844234868cb02004a82e8307ec"; + sha256 = "cb436991d7bb7705c29fa8b51a6d4c2910689b58210002a3370820917955dd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/id/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/id/thunderbird-78.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "13e4bf8bb6356966d44e4049e2e90f96b097e6a2ec2c54fd39cbf74e45dc4d3e"; + sha256 = "325319f3d1791c9aa91522c1c6f90aa72d511ad774a190d60a0dfcaf85cce934"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/is/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/is/thunderbird-78.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "bdf740e2545ad41de9920a213afd6a476f261a15746ffb201461b3d2e0dcf06f"; + sha256 = "e61096339f49ef5c1ba457e448f80a306c7f9058f280acaade9945d57209af1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/it/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/it/thunderbird-78.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cd66931d6cff87b16d637340d82d459cac1878fbefdbdb201cf7ed561dc0f6dc"; + sha256 = "daad0be2b8e9419d47a6ae2fd3b30002d206451f9f8f8a0dfa04199175024647"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ja/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ja/thunderbird-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "10da3af84f726a9aad3dc5c8ca24136831c136cc2e52f6573b27695f33f48a1b"; + sha256 = "ae8093def67bdde2086d568a2837f427e62f41e0d6ed80d9a64919467e7442e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ka/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ka/thunderbird-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "575f382c4f155f93a6cbd5a81fdb988196e2a95d0b8896af454a3cc5e3048d3d"; + sha256 = "57a1406e4e4d70b5fc23f356aa21a55abddaa3401127f279f58f3f73e6756987"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kab/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kab/thunderbird-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "bffa3681eb858a55c18b5f396bd08464eeeeda1328ec65a7c67fe4d7c7805757"; + sha256 = "86041ae0c0bd55923256ed64c0ed23f5c3913ed4892dba58d2c064049deecb4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/kk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kk/thunderbird-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "866191e1d87c0b00f4bb5f2eaa0e1f66719a7ca68a175d1b30ed9a5735005705"; + sha256 = "715626b9f4ffdd68ac9b689dbc48cf47d37d93f128e61d999c5dd14219d1bda8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ko/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ko/thunderbird-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f66f91f0e0b04344db0e5cbe8d48721448c775ba8f4ac69ceb1d848b7e07cda0"; + sha256 = "d470fd22fe9e185db70090cf5124697dc9b7015768181748d8976a04cde09239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/lt/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/lt/thunderbird-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2294425187c5e5404af6cbca9b495902fb9bc05354eb6e3866b1e8366ea64e2d"; + sha256 = "ebd83f3fdf84aea2021fb318671bda5a08a8480b61eff689544566d7c3b4dc5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ms/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ms/thunderbird-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f21e85113e0f63d57f91c61e2830f1a9e721138cc00269d2fcc521d1c74666ff"; + sha256 = "0a1c461603c60e16ca911fc3bcca0d5d1b6ac29a1a5a63524decb360a960e047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nb-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nb-NO/thunderbird-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5b7982cf136c4d6120ffc7e40c65ddbb3495392181e38141ed80e3a67aeb1038"; + sha256 = "89ef517fe3d97a95306b34212c96e83a3afbd5fa5d9c3c3ca3b019c8b742d422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nl/thunderbird-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d9619e1ca19ef4c75eae31de3dcb6cc23146c4d1b98046473a3ebcfb3a610c52"; + sha256 = "1c0632de4a2a13fcebd6bf3dadcc6a19125f37b8b54d16a9b8fe57fcde6d84ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/nn-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nn-NO/thunderbird-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e9d2a6955fb98c0dc492a5cb16977a1fc7cad778650dd601934bbc9f543b112e"; + sha256 = "684cfbc77db1f16ed8f271ce1f2700e6d6e486da47cb961bc09b53bda79e773d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pa-IN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pa-IN/thunderbird-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a3279bd605960f37ddc071b0f3d91726a9d911a311c13e9418013c5a1f7a5089"; + sha256 = "140010e3f1db608d1978f02fd28c0d9305dd4cfc2666b1689eca5e8b7aa64bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pl/thunderbird-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b22737a3a5b7c5ff3d8d22fd338490b0aff9016049bd7bf6cf6b25f15a027935"; + sha256 = "1bcb8a7d3936f22286fc6c1a5b0ed492cb345a22406eafedbe439c6737c7c422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-BR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-BR/thunderbird-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a6a18c8988db47d8163c79c465995aa0d3cd42da97bf2347b5be4d26e09e4628"; + sha256 = "41b8f99c1f73f16bd4ce4dbd76dea58209487c033a42b02412b237f98bf32903"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/pt-PT/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-PT/thunderbird-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8717f41a166cf8e271086987196be9b88f585a70c30119ec15199291bea1819f"; + sha256 = "864524017e892942d31212acabd4b4b6425153b53cc622df728540d9b65237bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/rm/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/rm/thunderbird-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "02b1131751a82c66341e58b757c1f4e438e5ef8fa44a58b904790c0a5ec66b44"; + sha256 = "7933777df1f87786842e9615528e3aef3ae0a78ed4089dc5b8472f2d7b7d7b53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ro/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ro/thunderbird-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b7d82398f43112b5b9ab1907643cd8c39012246a1e9b74b3c4e37487df7d5bb1"; + sha256 = "59a2f5b81c777cfb705ec93c395d78b7d73a98cc632efcd980490817ddde06ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/ru/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ru/thunderbird-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "155c7f4e678f6f3b91c07f2aa1313c08305a2c3166c199a9d8575d58c7448ffe"; + sha256 = "0954dd904e87505aa849db172351684c477f80395baf46b7ada5bcc6e0614c2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/si/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/si/thunderbird-78.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1af756f61e5c57c0d6018b3efc0072e55d7344c3a9fd343686bfb16773551503"; + sha256 = "c8d9c1384f98e8664e73e3b3790dc99aff51c9188116d6dfe8b88a238f09e524"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sk/thunderbird-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b06bc92b4ffdfe25a5003f3662ae168600a6ae8855b60353ad68de6a24067d4d"; + sha256 = "651932961b463312ed8757a26714383d34b5296620e0f957417c0d853e591d9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sl/thunderbird-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "19cc8710f257c229c4700b0a9deab471b1114a21f6cde0838f6a23e29faad6b1"; + sha256 = "073fc40fbdb1d45b0df5e8984216422e1b79f5740537d9deb11b05b11e9a6622"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sq/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sq/thunderbird-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "13c8c4893947a8178066ce7a767eea21e78b1989c94be4d573f03f98e7f43011"; + sha256 = "05cab7f922d15f839c73b8405bb1e2785e7f327a0f155595a40936b792852ad4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sr/thunderbird-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "68939bdf7b57320dfb608d6487b877baf0d801ef3aaf0da48becd87beb41aa89"; + sha256 = "26fd9a66bcc583acecaaaec732cefdc4909923fd5ca478f1c9705bf7ad787eff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/sv-SE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sv-SE/thunderbird-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "36689c205cd7a6f212a5971fcc226631937232173f84cd0a2c40a87f95de001c"; + sha256 = "610a21baa667f8dce1e9cbd18dbf582af6a9a0c61e574dd509a2121536407e8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/th/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/th/thunderbird-78.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "392267ae08739866f14d2ddf0a853a47d18b2c99856bad369b567e7360d2aff9"; + sha256 = "520745d3bf636919963a014baa565efbc14a4d5e6d77ba8e1d0cd6b5a8b370cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/tr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/tr/thunderbird-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "15f45f9794ab34f79951a3b9ef990f25788c45eccd65dd1aab565d2908965c66"; + sha256 = "91ede7f8e4520586e35b0fefe616477dd9773c047b03c2c92b8264bcdf1131c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uk/thunderbird-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e9b1765f80620ca7ac534c91656345ecc3218ef8a606b2a8f48f3fc1c170cbc2"; + sha256 = "46bda6c807fb26e1ba698590912c9f427648e37f26b791697562d912249c519f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/uz/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uz/thunderbird-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ed2258512e980e3c72b9130b2f5f839dbbff1df05aa5cb948f4519681491ca34"; + sha256 = "2029d7023605baf17c138031977bb2f36ddbacac605d00e93967b366c22df4ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/vi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/vi/thunderbird-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fa23f6d7c4b64776df71b5015743e8dd475cfa2a329370a92d36210711e0fd41"; + sha256 = "d345f774c89b276a5393b17522d5c7d60f8c661594334e0e6bb8ee06fa134a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-CN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-CN/thunderbird-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "741bfc0c297a8dc9b5b4348f26886a12c75a81af11b0a6090094e6e21348e6f2"; + sha256 = "931d29a118de6eb1a73da6d36f919b2b98112b15e15ede6171b39c2b1f85b8b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-x86_64/zh-TW/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-TW/thunderbird-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cd4296eacde34b302c794beeaff0eb46bdf0f12c67aba98172133529506897af"; + sha256 = "59b7484654101e016819b998c903ac43bf43427a16d288f90cb1ec47efc2c61f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/af/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/af/thunderbird-78.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "300da8f92fff4e596e5d5604002fbb5732bda61d6f54c7f79a20e2fc268a7ce2"; + sha256 = "5fa7d8defeececcbf3794845695b3c4ff84e4269a26f3eaf709fb67e8549f164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ar/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ar/thunderbird-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e382faafeff426536f355e2a711dbfad7d86de3619a4d3a60868ecd8e9593b40"; + sha256 = "946887ca372e60fbe401c60d5a2758e49b3e771837d1c4e77073e6f7c569aa8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ast/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ast/thunderbird-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "45c3c612f072277e9dd83fbe22bd4cf9018d481a35ea25334d12f6826c879915"; + sha256 = "596e5665341f5c2d4551f216e8935bfc4c390666d01464b8c289386a2fd7c168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/be/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/be/thunderbird-78.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e9fc38265fb9185915c9447ffb2d38e4e024446039704c8d45b91e152a38f86"; + sha256 = "e95af9c6be7a8e30b1589a9fe9b7568876dfa920f2d01d3e6c0f0e2ff4f34ea1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/bg/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/bg/thunderbird-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cc041a49ac017568b815a5e03a37031a6a17c25110b77d37bdb96c4d53d869d0"; + sha256 = "3c509d3861074c2a5d2da2f0d7f2d3d19a132745dae3ccbbb259e60419b70895"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/br/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/br/thunderbird-78.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3cd798a70f493ac5a75895be3db025bb3793836e21550c3ddea6b27f7dcf6d7e"; + sha256 = "9dd7e920583f0a3bd0eda01d569142f81f91061ee64703d43685ad277651f13f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ca/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ca/thunderbird-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "553ea37490cf180bbb1f0ebcd23d87e82456797ab9f5604ee862227b0854ef12"; + sha256 = "34026e985a3ee383104e4882d2e9b3025f84b7b36bb9c13233cd56c20b86d2ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cak/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cak/thunderbird-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "307e3234abbcee8a4aeeb46d1b8bb02c8642f1a2140dae9a2d6295bb32548742"; + sha256 = "c513f2bca776ac47ad40a656ad40eed682c1e1f37d3f8a41686868b10301d700"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cs/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cs/thunderbird-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a08537b88425e2b813aed80b94d763d3c31ed9aeecf5b3b8e358c08233997ce5"; + sha256 = "499148f0871bab7ed8012cde000942815529cfe59d6dfe4a861a937f5bc861d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/cy/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cy/thunderbird-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "36b75de4d73075026f256c6502caeebd35a89ca567cbc9fd6db461608b922be1"; + sha256 = "12e468d45538b0bf2f699bfdc7cc8f294852394175c57a7720ee217dcdd662ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/da/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/da/thunderbird-78.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7b81b6b22888c298cba1dba3c9786249ccb0aeba8b93d998a268e33ca249c7cb"; + sha256 = "e49296cbddfc1a5d27f0b85c9ae16c6fae12aea3fa386c458dc436964214944f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/de/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/de/thunderbird-78.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e5fa962eb83d4cc7dc2de5a2080a0d06fff4bb3b6e30c53dc979d7bfad8542f5"; + sha256 = "548c2d3dec0270e859a56e7d85ae08840ba6e1b858f1651e484f197d08840c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/dsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/dsb/thunderbird-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3745a7966cb96c79b49e0f8431d8b1e90cd5f01d7ce57eeb4ab3e5f80ddea26b"; + sha256 = "c130c0adc523580cf771c3a16cc0805563bd4a7f3b0990109972698b4d77f1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/el/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/el/thunderbird-78.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "037a51d7e44360a9748420ff584790abca6285d4bab8ee84414cfa602ec4c6aa"; + sha256 = "9c2b18946cde4e962191442587a7935658217bea530caa89f25f35c9f6c95034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-CA/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-CA/thunderbird-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a12288cf187b5e3075a23e420bc58ae90370c224b0c73b8706ef52c34705d6d3"; + sha256 = "3b1a6e1bcc6619221ba29df1af414d2ffe8fa935ec098e95210ba59b5c518239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-GB/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-GB/thunderbird-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "dc3637519c9b40260217e5302dcf4174a66298f98b478d1a6caebe154b9b549f"; + sha256 = "7fc649ebd174fa6b534b075758ab6895c4c9a78b9bbbc06f135c26f7db24c282"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/en-US/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-US/thunderbird-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8e425ac9e0ac12d6142ef7a397dee969c87aa27fe21010a88d76a91f034328e8"; + sha256 = "b2a3bab7cde73523f8a516541170cf701db45e15bd46fbd3c200dfa056d0252e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-AR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-AR/thunderbird-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4da82ae1bed1ac257b878e5f8de6be6490131f15ee9db44de4aa10202a790e5d"; + sha256 = "af7d15f1776476ef7ea421bb91af9ab1dbffb0369fa12b9054478197b0d902b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/es-ES/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-ES/thunderbird-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "706ae91e5d36cc85f35833d5508ab7f3d0b8505491b5a86ca4447139b532b929"; + sha256 = "4ef89f9997094ff1c57ca7c630ee15fe443e214fb3c8b40253cebf8a83e9e5e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/et/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/et/thunderbird-78.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f74858d4b770245f3fa1d4f9ceebd274524dee73320fd4bdeb0e251a5d11c253"; + sha256 = "f70280ce83fcb31a73a5e7230a3e6ab7abaa776c969cc4d98953bee4529dfac1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/eu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/eu/thunderbird-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "aa02f9fb911a61da3183df79dc4d3760a5d6a259305da72932ff962cfe390d48"; + sha256 = "f34516a026d2adbab2cd3730d034abf326113f96f90bbee3889fb0e7cb1b41ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fa/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fa/thunderbird-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6b41612ea00a38e8bd4d1a796cbf5e3bb6d413cebcb473bcf9c5bde0d074cbfd"; + sha256 = "d004a5e3c3dcd5d2fcb204e9fafa943d1bf6ad1e6cf11aee88796a4f0149e44e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fi/thunderbird-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f64e3e2e266478c36c50cc19a161dd9496db6f668f2078bc182c1ddeedf3410c"; + sha256 = "b740e866a690e6a6ecd0e910f63822f546389d297f9c923f38983b5f78be255c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fr/thunderbird-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "eae396eae122ba4bc965fd8036264bf8bf88f52944558c7c1c0891a4254d04ee"; + sha256 = "eab1bdf57527a2fbe4f7de0a3314eba9966df5a2bb9a998c32a73fa372a7f85e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/fy-NL/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fy-NL/thunderbird-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3163461706339a7bc34b8d7b83005b2ca962f6b6830b9da32c58aa7613c4efc4"; + sha256 = "bdd5b279a134e305002b87fb6b708e54132158d111b99bb100efbf2dcbcaa606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ga-IE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ga-IE/thunderbird-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e2d1d31528e7b2773e898202adc2fefc3fac38843792d6ad57e093d3de6ee4c7"; + sha256 = "f76ad9888686fb09c33d2fc1f92849adf9102c265b302640d50f4b63803ab416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gd/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gd/thunderbird-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "429160e98e24545f7890372eae1f2ef732b3a7ecd6529fde4ca247fbe251475a"; + sha256 = "54abde7a6b6f6864bd260b1d31dddf1d578b9f9c2b9f928c2bdcbaa141d14163"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/gl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gl/thunderbird-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "215c0f6f3409200db5c25cf26c2f305917cc7b9b10b734d22be2bea7d4b34443"; + sha256 = "6d10c320adb9880ce31404034a501f3d349227d851120c2ada5c4edd6b7f4fe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/he/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/he/thunderbird-78.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9b13364552d3afdc4fbdd2683d70b32b3f3c91633528c8b3684c7d9060431818"; + sha256 = "d635c4b9203d03b9bd78b81e507074ba5e6b8c4b066ea996f32d353b557250a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hr/thunderbird-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "92a043ec615e0f92ff301df498023a31e5a32fdbcb01be0e95ee91917ad88112"; + sha256 = "0a50d18b9c53ac5d325aa343cf7114307e90d98e2392f0474ea469508c329cb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hsb/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hsb/thunderbird-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a73b9619b2da033be6913c4342fe23886a9ba6710a65496878490e3f6c016901"; + sha256 = "34b1f83011ea6297e11d55a126f8fc8c87fd560e2144a4e64f4b377177ddd0c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hu/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hu/thunderbird-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b1e938c785946d91e5759cc5f34d75fbbbf421b4f8b5dbe1eee9158fc277198d"; + sha256 = "6a4f2e4f026efabe45f45bdf691c84e1c393ab223aee045ec8e21092158cc4f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/hy-AM/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hy-AM/thunderbird-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7ad07de9dc366057b004893f3d77900dcd4cb6532127a60b07b343752b96ef96"; + sha256 = "dd8762372b789ee7bb6d11994f8216cfb9fcf493d6dd27c3b292f29675e9559a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/id/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/id/thunderbird-78.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "51b239fc75b2b0769faab37ba8c03973dc9a275eb8730193100f5d3cfd5b1621"; + sha256 = "cb811617137d3b57160e64af7b901329b0b6df46f0525ceed04de9a5aaab8bf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/is/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/is/thunderbird-78.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "69299e2873cd042e64146faa329f72039c079645014270acf08a2a0357a7025e"; + sha256 = "e0d7e51f390aa0af3dbbb2505fdc6eb5a3560c97b031fb67e14bd4af57868bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/it/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/it/thunderbird-78.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "dfc2f83084ea80483a258e2ef879bcdd31256c55920f2d86fa170dd0ba432091"; + sha256 = "9c88972bd6ee1ab726e16a6eaba32aa78e3d8475506d3394254337eedc47a9fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ja/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ja/thunderbird-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7b1cbca9399856b3c413e7277617c808b3f670c6470e3c243c6fde9aa035d563"; + sha256 = "0fad6c18b92fcec16684bd9905dd0a3b6bcbdf8c2bfd6d271baea48849a0fa8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ka/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ka/thunderbird-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2ab93932f7e567b3e9ebae4fd4c1d032917c656408b5b74cfd51f0e35bf14af6"; + sha256 = "75c454ca20ea0667caab5223c55a210f68165fc72b1493fc8afc76881cfa823c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kab/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kab/thunderbird-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6bf87d821095326487e4822e6c373b4c5ec9ebd9dfcee511c4b85031ae7caa2"; + sha256 = "8a928f4b5fa7d0374e361a47857c85a34d271d2cbbc760332a6e588e3361fa62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/kk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kk/thunderbird-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "06cd2284afca05ebfb16ebabd128d66f8a45751fc7a5c1f4ef39a2753dc8e88c"; + sha256 = "18b851bc36799910965c3eb14a8c9a57f29dde91c570e25a8f7f172a8bea7771"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ko/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ko/thunderbird-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bbbb6e7c1c444168ab9b7c3797ca1bffa3c885980e2f215c914780a1ae5d1871"; + sha256 = "108142a8cbd48dfe07626f4672178a35c5f253c84efcb924c7bd4c1531f6ab38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/lt/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/lt/thunderbird-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b64e1a057623a85841137b7aae1832d4757766ac1d37452453a0130582043474"; + sha256 = "5c65eb6b01e8fe82db99390ae889870cad107d4307e02b04d5f9390eee81f098"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ms/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ms/thunderbird-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "eaeb81daf522f0282d57c5b77f54b736c9a723c3a2ad0ddbc2501683cd3dff63"; + sha256 = "78ce19d598b2fa59ecea9d6fd4e67e93b2ba00b2e9569579f687700486e80c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nb-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nb-NO/thunderbird-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5db8562f43efcfff4f950c1e2f6837d8ceb9e73543e7c7dd75e695709defbc61"; + sha256 = "e8a1f9f4666a3ee423c5541c61fccfe448989d0d7d4840dd36bbc0826cb96537"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nl/thunderbird-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "77ea8f460f82d05369ff110b85c4b995623caa7b62e38ebb5d8e0f7ecbfeabd6"; + sha256 = "f9292bdc80157d2e2076b7be81af66813aeabc722356c3e514ae18638720192b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/nn-NO/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nn-NO/thunderbird-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "83d2439498fca42c3b4095515c9359f89500bd11029fa58ba19e6058d3b696dc"; + sha256 = "956b0c99d47845c9b0a1c7d101f576e5b4a7a514893da938d36616db9f5bfce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pa-IN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pa-IN/thunderbird-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "805947c3014c660ec66d5382dce6a733efe196b45b445a7d2467e209ce889727"; + sha256 = "50cdbca944f98eef40479a9070b58729f7f743bda55925c74b6410c163ac784f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pl/thunderbird-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a7eade7fc0b68361e0a8d6a1cde62d7253f938dc0e93fda56d0ed296304b162f"; + sha256 = "fe2de7bba7b057022e02f040bb65ddfababb39999fcc573e65cd2bc0c848cf41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-BR/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-BR/thunderbird-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7e5a89cc9460ef65f1b5141d7bbbfd39f2d38aac599b50c8f57b39ff2218f7db"; + sha256 = "6b219f0cb715f2d5a3fa72f34b079b401d850f571a9b2ad21c97871a5b83b9af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/pt-PT/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-PT/thunderbird-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "809945bd2390457d2ffc1f232e120aa68c0e8232a69d14b6cd1207ed4fc62bae"; + sha256 = "deca0d48ba8bb002444c3649514a2d7e39a698c75382ab53df080ff2c484eee4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/rm/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/rm/thunderbird-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "82849eb2a8db39d99cc1fb514d0a4a78c1380fa5ad75434d0969860b5fa0c5f3"; + sha256 = "3799e8dbdf5edd6be276ce4634418c1bbc52862a5366d43460e1bf727f11c27d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ro/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ro/thunderbird-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c9abc67c0612e3da4d9519d93cd87718898e6465f8275cae9edd7127f3e9c964"; + sha256 = "a599d873eeb1ecff1c7df37ff89b9e71527192d65c3b0e593d87b0c68bc28062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/ru/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ru/thunderbird-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "77c7e1f174c5540bc683ae71653392e24dd70737f6a6f9298c746cdbbb1f2e3d"; + sha256 = "b488c44be9c1acd9715f9b872e61f1c8f4a0cedcdda6d291f8ad165013b5f06b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/si/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/si/thunderbird-78.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d45b2a6492fd732652ac4d160b74f612261c33dee7f8f7c21bb1a8e0d45d72a1"; + sha256 = "b60c002886df2ab941fb5c445d6b33d31de8a2d9feb15523c2af561da7ab09d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sk/thunderbird-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cb4e2492618d70b67b2deb803ed5d02a2851dbdad26098c305c804017d27290e"; + sha256 = "0c59cc63c01ddf7564331a6a9f2ba89c5ab263c227f517c9fa066a3c7f8e8a55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sl/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sl/thunderbird-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b731685c0de6ba0350259f84a2b4c597849459bbe5cd632796a09370d2697ab0"; + sha256 = "2039f31a243f43553c893232d79a27cbc249bf73f083ed05b2914333dea6c5bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sq/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sq/thunderbird-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "4c2013d3b64cceec11bbf58cfd3dd306653410ffde95ffdc649c3ffd2390e542"; + sha256 = "f46914a1a18d989c385f29cd34f95f409f5d56d601b279d8106aa8f224a61c26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sr/thunderbird-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "ad0fbf13c2e0aea8b5ba97516d0ec53bf2fd4868155e66df5297cc95a27246db"; + sha256 = "a72776da8c85de9f970f1a55ef2f56d2e9fd3fd73b7e6d39761ab6bca7066980"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/sv-SE/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sv-SE/thunderbird-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4af730894f076b9a48afd5a202f7e78a11f050a11e5e2011726370e1b14ce70f"; + sha256 = "466378b9542c4a8550fc6e7143fe56e04e5ae15a20bc6ddec5da4eea231fb928"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/th/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/th/thunderbird-78.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "901c62b2adabd67d98314a18782638c8f7e9f55d8ebcb0686b2c7355696f71f8"; + sha256 = "7943c3257f4ef6a842008b0fd6171f87e99043263ccaf4666850ccebec28725f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/tr/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/tr/thunderbird-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ac7794552303525a4b72dac166624c06b7392fbdb063144a793a39d4ad6fbac0"; + sha256 = "a5120107b8fc5418c49d70cf61730ea2b8e833d21d8e6b797d64d2637803709b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uk/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uk/thunderbird-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "890373ce0813c7cd4cf8eec39af6a362d1e88c4bf967ccb3482b7dbb806dd228"; + sha256 = "a85b53cd72b313e49ab439f9b1900c4e8f7610be085d757bda4123f5e9293cd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/uz/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uz/thunderbird-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0153af7da918e0b3a9d50e2970f946dcc3ca2ba0b92782f82917153a2fb850b5"; + sha256 = "7dcce5d00f6e83b756f3b83067fcf78d00240cb540815e3e63d40302272d5e4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/vi/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/vi/thunderbird-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "55ba1938bc0b894f92bb17435b0bbf19e15da8163dfcfb377b87db02aff8e564"; + sha256 = "4b94684748f81444d8a8beeac54053673bb4705b6284f8b5d86a5f03fb9a2ce8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-CN/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-CN/thunderbird-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "921619f82d094b35d74dd54071191ce00487aeb90190e2d2b6f229610e016878"; + sha256 = "346222badaa7b34a7e21f28045c68be815d187a5d34432446b7ffb8b959fea0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0/linux-i686/zh-TW/thunderbird-78.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-TW/thunderbird-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "28a03fc23a2961bdb1ea3cf1fa08be57302627071f4dc096eb9aca58124e5058"; + sha256 = "deecd348a6c260bc50b1e112966d736ee4bc211a1f42f791f37b10a69f7c1c2a"; } ]; } From b7c1e005c7307af2b3f59b34c641dd5ae1533cf0 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 24 Jul 2020 12:14:00 +0900 Subject: [PATCH 072/234] thunderbird: 78.0 -> 78.0.1 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e161b5bf5b021..eb55976e2e931 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.0"; + version = "78.0.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr"; + "1lh0rsibkd3m6fk4mp07payn5srambslqqlsqkg6mc11rbaim0b4m5256iq670r614nb8w61yc8d0khhpyqgrvlxd4zgdv6s3n17d7w"; }; nativeBuildInputs = [ From 2c9b4a6bea17de463e6e42282d7d6d12df1fbcdd Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 23:55:51 +0900 Subject: [PATCH 073/234] thunderbird: make 68 as the default --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d8c0591e956e..403d9c4b158d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22817,7 +22817,7 @@ in thonny = callPackage ../applications/editors/thonny { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { + thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; icu = icu67; @@ -22825,7 +22825,7 @@ in gtk3Support = true; }; - thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/68.nix { inherit (rustPackages_1_44) cargo rustc; libpng = libpng_apng; nss = nss_3_44; @@ -22834,9 +22834,9 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; + thunderbird-bin-78 = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; - thunderbird-bin-68 = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin/68.nix { }; ticpp = callPackage ../development/libraries/ticpp { }; From fde34f502ca776fe4cf7d72b2148a55dd047bcaf Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:27:58 +0900 Subject: [PATCH 074/234] thunderbird-bin: 78.0.1 -> 78.1.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 6eee907db1756..6302e7239f9ee 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.0.1"; + version = "78.1.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/af/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/af/thunderbird-78.1.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2050aae67c7058ea8991adbfc8c0533c2df2baccf4b5f9d42c794a914c8b893a"; + sha256 = "6e98afba5a93cd7ce496838974022d7c61c0188f32ab0504d9cecd6ee3e20360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ar/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ar/thunderbird-78.1.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fc387ed18cae62280795729ce61a04942e319fb1162d54740ed6b3b73198987"; + sha256 = "129ce719947a59c647ab28ceddad28a2ce1e06c63839bcd5b43b084b80c2bdca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ast/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ast/thunderbird-78.1.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cfedbfe2c96814fef42c8e2e4b5aba9f9add0e3c70a2c01ff7528d878a6ab659"; + sha256 = "0baf79a7d38c5a3728cba78510efbd4735e1c4e4d23ab574533d590a7d523ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/be/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/be/thunderbird-78.1.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1d6ec9ca197d2fe5312b9b0e403e3ee2ee32be05b2d329ff0b21d9c42ba77a6"; + sha256 = "870ca1c07897b8df1e2985165cb0802a5cf1fe87886e0aca5f46d0d8b1e6acf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/bg/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/bg/thunderbird-78.1.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9b8b5322b6808185fcaa9614b7def311ccaf14b0939447a538b8b13fdd7ffcec"; + sha256 = "bd2bb102a09132afa0a4110522fa7dd98ae3b0ddf9b28a97d21070880212f391"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/br/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/br/thunderbird-78.1.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1f8429ba0563ab22cb1c30e15ee80d42864f01b0713e37448059335b8f1cdee9"; + sha256 = "cee91b71a6735e9c71a705e0c7a8a97d5acb733efac1d8bf8ddcd31a62fa439f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ca/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ca/thunderbird-78.1.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bdee4855e082b473f0434f5a16aa704eadc3ed4b0c186b42aaf5aa600f29d066"; + sha256 = "257d027850fc31fa5e5f4b0fc4dd2205db2b9fe04dd5b8c0f34453df11eacd4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cak/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cak/thunderbird-78.1.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9d6188ecacf4b76a91c2f4a8cbabf194eba05ffca54b79b3e0ee44919540e353"; + sha256 = "405d409fad9a42a8c58196ac390dcccae100da950d9225f03b5755842642af47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cs/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cs/thunderbird-78.1.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "edc391204cfc8c1eb1c93fca5f2ec67708c76fa4a1b972defd55f1645ccb3c56"; + sha256 = "fb554ed67ea40a31a296b37f95428f4fa9f81532c8048ec3b4563b91fbb989af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/cy/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/cy/thunderbird-78.1.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e179d9c7252b2915e84d2cb0e1c0c1b9568374bbe65348456e4dedf2f883023e"; + sha256 = "f74999b180cf8f32e634afd68340cdb8fb40c064fb1b78d4c4b2666a9bfe7121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/da/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/da/thunderbird-78.1.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "53b9e2107a1bc89132e7a3e1d08d4acebff872c19a639100ef1c0ebb4c3d0b2c"; + sha256 = "feea7e8ba58473d9f0159152aad4748827c88d3b575ebd5bfab18f3c08e1add3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/de/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/de/thunderbird-78.1.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "03bed4f7360142dcaa1824ce5deae519a9ba00f43427fbef78246036de159466"; + sha256 = "4b067335dee19144898485c711eec865b4d0fd0be0ff95d6532f6a7c62b2651d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/dsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/dsb/thunderbird-78.1.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "50217d664170eaf71da7a5111337583aad4a181dfd32eb3686f7a31ec6fdf4be"; + sha256 = "349db67666bbda6c269c7b55e376cb3740e3b3eb7a4e6f0fcf44037dc7fe822b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/el/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/el/thunderbird-78.1.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b6d1f45955cdd99d097b955e6c2fd017afbfdaa8d0b505d231548acea5d31e74"; + sha256 = "40bd9509793e81a2601ea0746f6e27a65a364d95d7772eeb71c5eab24f31fbae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-CA/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-CA/thunderbird-78.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f1f9c597816f4a3b30561c186c0944e6fc0fd47616292002d858341a0c6ef5a0"; + sha256 = "55acc02d61ed7a2b0ef2262346ff27afbcf836b03cb14dc67fb8cbc26bb5d6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-GB/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-GB/thunderbird-78.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a771190706f3bb163a7962bf4767b9177c324cc3bdc28470375a4ea26022881b"; + sha256 = "f18cba25a9ab2b10f1f464163c904f7b1ec1afa5b79728c9b1fc1497971edca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/en-US/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/en-US/thunderbird-78.1.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "428af66882e1abd047491c6a4a317eda6095191bd0ab81308d162c4a3c8d227e"; + sha256 = "0768e00b6a7737bd4ce5dac4d3afc331e8d1dd5307bccd130d9581347c6ea35c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-AR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/es-AR/thunderbird-78.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b1fae29c0caa3f2c5cfdea0ee169fa4f080027fd4e0347db6546f335bd7b6759"; + sha256 = "106b8a385e8f4bbd4fcbae08620fc621f69a3920b04300305ebc000b7007b512"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/es-ES/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/es-ES/thunderbird-78.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "58c1a11820860e2efe3f38b889962f794e56de4e2d1d94855e10bab1fc4d21af"; + sha256 = "02a67358ed38587bdb67c5faa67d989cafda448441dfa60bcb56587d10a052b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/et/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/et/thunderbird-78.1.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "71fac7d3c3e74bff029b5432f8caaa76abdd19d38a64ba6192d371c97a09e353"; + sha256 = "649bbbc89da5fb44f118be6c8f8a142e00aac26e50d7aa5217937d8356a8745b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/eu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/eu/thunderbird-78.1.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "60492decef4b40d8a24e6c04ae0494b178a47a4782388eca7c3e2c2b7b0823ec"; + sha256 = "4884b806aa36ef0d1f11cd876594d94614cd9a95a1dc8b072dea57f9b1664106"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fa/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fa/thunderbird-78.1.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d3bf790906b9b3c016cce51aeb1671c9d80f28d3c959073bfab0c14dc952d85b"; + sha256 = "a8e8de1f187a103a9bea2d0bc4ad8359f80d2eb0f5148d0c93f3351e1e8efff6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fi/thunderbird-78.1.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "7e6c77c994027e8e941a498d8dcc6e82911cd4b6e3a61c78206fe7bc114ae006"; + sha256 = "4c7fd4083382830646486390efec548a6875f41fa373d1c35b83f1e7b1890352"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fr/thunderbird-78.1.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d4e073368df92a81eae6b3480f3d06d461aab18841a0ed64d7f8d1c5b4623168"; + sha256 = "3574bafabec4266fee05552a1be248af63531d6ca1993d8c8d61e0dc472a0786"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/fy-NL/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/fy-NL/thunderbird-78.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "41e161d7447b64438652210d9091517b42edcf9b011f01c8c1ceb87539acd295"; + sha256 = "688346105eac2d51505f147c2baa74ac5a16915f2440e0e08d666eb77c702c3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ga-IE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ga-IE/thunderbird-78.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "a3f1b487d585ed66089b051a01b8b4da6edea684d2bdca94570dcb7cb283c8ba"; + sha256 = "aa75c3c00bded7ea7a8fb9043b24e264aed02598152e60a3a2d6644433e3f6b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gd/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/gd/thunderbird-78.1.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ebcedbf87577cffae7ba8ed83e9b9f981fd205e178701084cd2f813e30a8adee"; + sha256 = "7eae8fc579878437ee25f988189c49a7d7121f66230d1f60e496d575f518497c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/gl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/gl/thunderbird-78.1.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ffdfe4c9c22ac161e801d44599fe507c1ab9d7a8f46181cf1cdce023bccc4161"; + sha256 = "c2ccf567d2c4ac7598204a2a129678730ef2dc1d84ed3c547b569de3455723b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/he/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/he/thunderbird-78.1.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cad855f0c469056e1830d2f08be9c42ee348a5ccf74015585451161a0d7fb432"; + sha256 = "aec6e559b34d539161a3367e434773f6016978f3e837431d27737a935d156fe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hr/thunderbird-78.1.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "86b80d641ac0e5f7ffbfca3a5539cc1422d67a6b36cefaef9d92d03284955648"; + sha256 = "37b478337cc9918cb386471000c5cc90d2f5de3023a67431b418781cac1d4cac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hsb/thunderbird-78.1.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "062f55ebb24178c604527173511277115cdb49a7bc416f9824359cc700686a7d"; + sha256 = "6d08be19b9aaa9a0f11bf23aab8cf42c1e04288882d860ad45a625a9ad2d8ea5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hu/thunderbird-78.1.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "281479c1f791cea5c5b64ec103ade785844470d0d803d6298d1f1ec505d7eba8"; + sha256 = "ff2b7d098e466cd6a9508f3d85e599de544eb8e3cf0cda15d5278fc61efab22d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/hy-AM/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/hy-AM/thunderbird-78.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cb436991d7bb7705c29fa8b51a6d4c2910689b58210002a3370820917955dd93"; + sha256 = "2d53c3979a54981dc38c0db892b00b042cc6316972c42cffa6ff9409ad7753d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/id/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/id/thunderbird-78.1.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "325319f3d1791c9aa91522c1c6f90aa72d511ad774a190d60a0dfcaf85cce934"; + sha256 = "d599ca640aadf1d6441e16f47c39553cc58d3676a5638f613ffadc0b26983831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/is/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/is/thunderbird-78.1.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e61096339f49ef5c1ba457e448f80a306c7f9058f280acaade9945d57209af1a"; + sha256 = "004c1b4b00f3ab32e8e39fdbe8c8900cc4d36d716e81eb92cb49c7e0c105954b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/it/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/it/thunderbird-78.1.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "daad0be2b8e9419d47a6ae2fd3b30002d206451f9f8f8a0dfa04199175024647"; + sha256 = "8818951a98306959571060a673093397e6f337c5edb08d91c7202b2dd46a96ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ja/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ja/thunderbird-78.1.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ae8093def67bdde2086d568a2837f427e62f41e0d6ed80d9a64919467e7442e2"; + sha256 = "f30ab0ece47a1bb9220f414f12158ae264261456728c2debb2acfd9860dcceaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ka/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ka/thunderbird-78.1.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "57a1406e4e4d70b5fc23f356aa21a55abddaa3401127f279f58f3f73e6756987"; + sha256 = "ef3bfc1a4afb1f7cab9188848d789778e36ad2c376daaf5245611fade7c758f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kab/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/kab/thunderbird-78.1.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "86041ae0c0bd55923256ed64c0ed23f5c3913ed4892dba58d2c064049deecb4c"; + sha256 = "a1240d9ff2ef510cc039f3e29c571eaac738caea1a737d872931923fe1f9adc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/kk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/kk/thunderbird-78.1.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "715626b9f4ffdd68ac9b689dbc48cf47d37d93f128e61d999c5dd14219d1bda8"; + sha256 = "ed991b239aeac8c0b8e92ae59acb1cb949357514326e7377c2b028a0c9bf8be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ko/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ko/thunderbird-78.1.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d470fd22fe9e185db70090cf5124697dc9b7015768181748d8976a04cde09239"; + sha256 = "dbbd6291a1253c125cd6b1757c1f8a0a7bdbd8e611032db0d5d2efb5f6efd232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/lt/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/lt/thunderbird-78.1.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ebd83f3fdf84aea2021fb318671bda5a08a8480b61eff689544566d7c3b4dc5f"; + sha256 = "86b3a09435b20c398572a9d261d2b64c7f25346ac1977fcdddd78340a36a7774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ms/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ms/thunderbird-78.1.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0a1c461603c60e16ca911fc3bcca0d5d1b6ac29a1a5a63524decb360a960e047"; + sha256 = "4cead9cf204b460230eb35174898741fabefcec7d6a08bda13f67484400a61dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nb-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nb-NO/thunderbird-78.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "89ef517fe3d97a95306b34212c96e83a3afbd5fa5d9c3c3ca3b019c8b742d422"; + sha256 = "2f955e1436e78a2abf8395aeab59917001ea3affe763f12412247e48809867a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nl/thunderbird-78.1.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1c0632de4a2a13fcebd6bf3dadcc6a19125f37b8b54d16a9b8fe57fcde6d84ee"; + sha256 = "246b0dc99ae05a9fc559c3d587f4ebf501a6bc264494960cb6295f7b8ee5d12c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/nn-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/nn-NO/thunderbird-78.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "684cfbc77db1f16ed8f271ce1f2700e6d6e486da47cb961bc09b53bda79e773d"; + sha256 = "9d6b8c48bf483860cbba470fdf221fae906fdf1b1b3762055ee2dad841d266b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pa-IN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pa-IN/thunderbird-78.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "140010e3f1db608d1978f02fd28c0d9305dd4cfc2666b1689eca5e8b7aa64bae"; + sha256 = "3a62c8d1909353efdf67c758e49a5e938508fa8d433d887fd47faa768fbc4015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pl/thunderbird-78.1.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1bcb8a7d3936f22286fc6c1a5b0ed492cb345a22406eafedbe439c6737c7c422"; + sha256 = "d20f0e0c1b60efc5b549a347ea6055b5ab659e47ef0b28ceda91b03066c89606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-BR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pt-BR/thunderbird-78.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "41b8f99c1f73f16bd4ce4dbd76dea58209487c033a42b02412b237f98bf32903"; + sha256 = "ad633496d5183a99251128321810842623de0c4aa4f8895e23df756cbca6a4bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/pt-PT/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/pt-PT/thunderbird-78.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "864524017e892942d31212acabd4b4b6425153b53cc622df728540d9b65237bf"; + sha256 = "e1ed2749803c255e16f7c5bc8e264adbe53381b33c15d7ec7995cf048a86260c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/rm/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/rm/thunderbird-78.1.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7933777df1f87786842e9615528e3aef3ae0a78ed4089dc5b8472f2d7b7d7b53"; + sha256 = "e07c2f7600965d46a6db1bbc5082897f0a9d3b1d66555c388c9dca9b02bcc057"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ro/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ro/thunderbird-78.1.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "59a2f5b81c777cfb705ec93c395d78b7d73a98cc632efcd980490817ddde06ae"; + sha256 = "2b34d996f2130b3738bc2b2cc8f784ad9e62b207722c7038e1469929c174aaeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/ru/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/ru/thunderbird-78.1.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0954dd904e87505aa849db172351684c477f80395baf46b7ada5bcc6e0614c2a"; + sha256 = "3cdb2afc48e70a6f27022fb672eed016ab5aede684d2791b4771e764f64befaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/si/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/si/thunderbird-78.1.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c8d9c1384f98e8664e73e3b3790dc99aff51c9188116d6dfe8b88a238f09e524"; + sha256 = "6207418917124e654283592fcbf8c05bdb47369486ac3f4cfa63376ce5c4f780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sk/thunderbird-78.1.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "651932961b463312ed8757a26714383d34b5296620e0f957417c0d853e591d9a"; + sha256 = "e5551cda807e0c490fc3c6fb8c0ca3c2b75f2093984537f862d1cd3b9cf1f080"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sl/thunderbird-78.1.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "073fc40fbdb1d45b0df5e8984216422e1b79f5740537d9deb11b05b11e9a6622"; + sha256 = "d43ff3688f641d07dc6bc4b9b6a5045ee64f76b94c8a90fabab76ccb3682990a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sq/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sq/thunderbird-78.1.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "05cab7f922d15f839c73b8405bb1e2785e7f327a0f155595a40936b792852ad4"; + sha256 = "08ea55f8bb49ad16d0ef16b1a95c9cb5657690e811608f147c93f79171dc6b9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sr/thunderbird-78.1.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "26fd9a66bcc583acecaaaec732cefdc4909923fd5ca478f1c9705bf7ad787eff"; + sha256 = "a9a1a33b195ef2c18da5a18ecbe09cd5dfc9c48aaf445937642a9df1cc2694c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/sv-SE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/sv-SE/thunderbird-78.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "610a21baa667f8dce1e9cbd18dbf582af6a9a0c61e574dd509a2121536407e8d"; + sha256 = "9f7994ec48a0b70ce6ce33092b4d5252c2cf180f2589a46fc85009503671fb56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/th/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/th/thunderbird-78.1.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "520745d3bf636919963a014baa565efbc14a4d5e6d77ba8e1d0cd6b5a8b370cc"; + sha256 = "d1ffeae4472df5483c8f55beab128456f3176b07e11444ca48f651a582b8d80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/tr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/tr/thunderbird-78.1.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "91ede7f8e4520586e35b0fefe616477dd9773c047b03c2c92b8264bcdf1131c3"; + sha256 = "79fa59071ceb5f643759cd4e9161325f3717a099607407844ed58e854c680eb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/uk/thunderbird-78.1.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "46bda6c807fb26e1ba698590912c9f427648e37f26b791697562d912249c519f"; + sha256 = "f41e9756c31a5d2047d7beb8f8f4d3a3f09d6b72d8ef8b375c8f0ce16ff25409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/uz/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/uz/thunderbird-78.1.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2029d7023605baf17c138031977bb2f36ddbacac605d00e93967b366c22df4ed"; + sha256 = "9748985b628e76b75f15814b6d48641319716bdff8c3947c346b01be27e16854"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/vi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/vi/thunderbird-78.1.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d345f774c89b276a5393b17522d5c7d60f8c661594334e0e6bb8ee06fa134a11"; + sha256 = "cba83119c8e36f76d4697acd689e1f94effdb980e7738853cf27f6633a48c187"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-CN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/zh-CN/thunderbird-78.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "931d29a118de6eb1a73da6d36f919b2b98112b15e15ede6171b39c2b1f85b8b3"; + sha256 = "f06c5cbefd99d2da20b1bb64518c29907f746740d30f79d4b7d59ee286690194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-x86_64/zh-TW/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-x86_64/zh-TW/thunderbird-78.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "59b7484654101e016819b998c903ac43bf43427a16d288f90cb1ec47efc2c61f"; + sha256 = "82cfbf08584867e6d36d357e67ea6abe2ab3e2747de014bd747ed169065b0f07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/af/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/af/thunderbird-78.1.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5fa7d8defeececcbf3794845695b3c4ff84e4269a26f3eaf709fb67e8549f164"; + sha256 = "ecd85c75ce2935f776dabfd42402342526cc9f7050c6f444219618cdfd12930b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ar/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ar/thunderbird-78.1.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "946887ca372e60fbe401c60d5a2758e49b3e771837d1c4e77073e6f7c569aa8f"; + sha256 = "1ad1466a524f505abe1a80fd6dc4ddeb4441a26ce6f63c07b9bd8c0cd27f75d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ast/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ast/thunderbird-78.1.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "596e5665341f5c2d4551f216e8935bfc4c390666d01464b8c289386a2fd7c168"; + sha256 = "5683300f0c423c5ea2c62cea619d0f894d7ef5d4e46f952f67ba56863350c829"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/be/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/be/thunderbird-78.1.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e95af9c6be7a8e30b1589a9fe9b7568876dfa920f2d01d3e6c0f0e2ff4f34ea1"; + sha256 = "882463c8e120438c418a540da6d7ad324eb071f400d1abfea43c04d7a8e978d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/bg/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/bg/thunderbird-78.1.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3c509d3861074c2a5d2da2f0d7f2d3d19a132745dae3ccbbb259e60419b70895"; + sha256 = "1ead6033fc9a7bfd504890a453ccbcad34a5421f6a33e2a382cdbd0ccd15c60c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/br/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/br/thunderbird-78.1.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9dd7e920583f0a3bd0eda01d569142f81f91061ee64703d43685ad277651f13f"; + sha256 = "4aaa832ef4a2cba04d03c2ce8f956bd38bbd88c0c5732db02b73ac6d1097c55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ca/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ca/thunderbird-78.1.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "34026e985a3ee383104e4882d2e9b3025f84b7b36bb9c13233cd56c20b86d2ac"; + sha256 = "a237f035c3b7c6281096accb036f35d6c2b421ca9bc4144240ccbe44f30092af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cak/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cak/thunderbird-78.1.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c513f2bca776ac47ad40a656ad40eed682c1e1f37d3f8a41686868b10301d700"; + sha256 = "c92a7700e7ff6184ecfb1f36615d1a6f68a5b534eacc3417233602d290ec3c2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cs/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cs/thunderbird-78.1.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "499148f0871bab7ed8012cde000942815529cfe59d6dfe4a861a937f5bc861d4"; + sha256 = "7417c763b5a4c680d136c2f0f2e62276b4c616a1442282ee9e979bbd56748886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/cy/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/cy/thunderbird-78.1.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "12e468d45538b0bf2f699bfdc7cc8f294852394175c57a7720ee217dcdd662ca"; + sha256 = "0099ae95225562e2376a9ae7b5416b82b43d62e5e3c1672ac9a404c4fd4afc3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/da/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/da/thunderbird-78.1.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e49296cbddfc1a5d27f0b85c9ae16c6fae12aea3fa386c458dc436964214944f"; + sha256 = "f58de0e53576831b345e38c30fbd0809f8fbf06aaeb8072ff24c6bc3254844ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/de/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/de/thunderbird-78.1.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "548c2d3dec0270e859a56e7d85ae08840ba6e1b858f1651e484f197d08840c98"; + sha256 = "4ec7d297c251a6af2bc94f69b1416819173e5a067e751dbb44b2b4d78a8866a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/dsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/dsb/thunderbird-78.1.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c130c0adc523580cf771c3a16cc0805563bd4a7f3b0990109972698b4d77f1fe"; + sha256 = "642a8a455fd5baee6443c5db7e971d41c9576e5c930913f1ab04d5c611a85e2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/el/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/el/thunderbird-78.1.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9c2b18946cde4e962191442587a7935658217bea530caa89f25f35c9f6c95034"; + sha256 = "e0040116779db8e0a48ceadbadc78f29ba6f7a30b287f631606e8e710605af62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-CA/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-CA/thunderbird-78.1.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3b1a6e1bcc6619221ba29df1af414d2ffe8fa935ec098e95210ba59b5c518239"; + sha256 = "d020ee801bee8a6384e3da9dfcff135d62dc523f2d0e183417508214fbcf8384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-GB/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-GB/thunderbird-78.1.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7fc649ebd174fa6b534b075758ab6895c4c9a78b9bbbc06f135c26f7db24c282"; + sha256 = "31124523570c294f1615af0f3fcedb91f2509d7446c93760c063383b70faac11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/en-US/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/en-US/thunderbird-78.1.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b2a3bab7cde73523f8a516541170cf701db45e15bd46fbd3c200dfa056d0252e"; + sha256 = "242bf4bacb3d99fc79845f3c5a27e317f1ce9878b124c41b2d9fcbec54460fd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-AR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/es-AR/thunderbird-78.1.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "af7d15f1776476ef7ea421bb91af9ab1dbffb0369fa12b9054478197b0d902b7"; + sha256 = "178819d715fe526a086d6abf392e2b2ea5d7b8a803199b02cb0005561219f886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/es-ES/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/es-ES/thunderbird-78.1.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4ef89f9997094ff1c57ca7c630ee15fe443e214fb3c8b40253cebf8a83e9e5e0"; + sha256 = "88fd17b25de55a567c0e6eecce7edd5657d8f4bf6fa1c8e5c6221b53b6dd21ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/et/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/et/thunderbird-78.1.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f70280ce83fcb31a73a5e7230a3e6ab7abaa776c969cc4d98953bee4529dfac1"; + sha256 = "eaec9c4c0b80d69ba8215e44f64d3bcfc392b5fce47f1a154a8d973ac60991f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/eu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/eu/thunderbird-78.1.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f34516a026d2adbab2cd3730d034abf326113f96f90bbee3889fb0e7cb1b41ba"; + sha256 = "cea1fe6066c348d27b1de6645f7250e03c9beb22a545a4dac3e50dc1af983013"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fa/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fa/thunderbird-78.1.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d004a5e3c3dcd5d2fcb204e9fafa943d1bf6ad1e6cf11aee88796a4f0149e44e"; + sha256 = "01976fc28112097ff160c6adeaffed75b6f998eeba8cbb14328127738972144d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fi/thunderbird-78.1.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b740e866a690e6a6ecd0e910f63822f546389d297f9c923f38983b5f78be255c"; + sha256 = "9f7406c2cd4f11c93d3515691c228940c7b1514df56ec2c8630a7a2e94e2ecaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fr/thunderbird-78.1.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "eab1bdf57527a2fbe4f7de0a3314eba9966df5a2bb9a998c32a73fa372a7f85e"; + sha256 = "46fa514a8a041d9ad6a84333bd6f815cea1ee2c69ef37b17e68f944d93400e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/fy-NL/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/fy-NL/thunderbird-78.1.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bdd5b279a134e305002b87fb6b708e54132158d111b99bb100efbf2dcbcaa606"; + sha256 = "33a5b2f524666b3e5add090ac552d72c3c20f81b97982bcaf2e7939fb3ad5c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ga-IE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ga-IE/thunderbird-78.1.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f76ad9888686fb09c33d2fc1f92849adf9102c265b302640d50f4b63803ab416"; + sha256 = "331d44093ef699538b72aa2abc12ac0aa5eed8a2c0ddcb48b2550820b418fffb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gd/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/gd/thunderbird-78.1.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "54abde7a6b6f6864bd260b1d31dddf1d578b9f9c2b9f928c2bdcbaa141d14163"; + sha256 = "0d31fb4fc586e4e0f307335144f4e52b6bd8e1f2cef1707143715d4ba5d7143a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/gl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/gl/thunderbird-78.1.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6d10c320adb9880ce31404034a501f3d349227d851120c2ada5c4edd6b7f4fe9"; + sha256 = "66c9159758d4639e2334e0ed37145a9b3fb51a53ae15919c956f6ab59ac431a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/he/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/he/thunderbird-78.1.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d635c4b9203d03b9bd78b81e507074ba5e6b8c4b066ea996f32d353b557250a6"; + sha256 = "927b657eea49b18a5bae6e23c0614178a33a90db1e6a4bb8e62978be2e5b165e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hr/thunderbird-78.1.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0a50d18b9c53ac5d325aa343cf7114307e90d98e2392f0474ea469508c329cb9"; + sha256 = "7c76abbc7fe94d910002a0786d18973a1fce553a36bbc26123fffdf8bb63b1c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hsb/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hsb/thunderbird-78.1.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "34b1f83011ea6297e11d55a126f8fc8c87fd560e2144a4e64f4b377177ddd0c7"; + sha256 = "a34c51c6059effdc861bf1892b9ae2f7f88f7b06344dc73d1c0d02da919c2883"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hu/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hu/thunderbird-78.1.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6a4f2e4f026efabe45f45bdf691c84e1c393ab223aee045ec8e21092158cc4f7"; + sha256 = "acdc7d7423570b707bba3941bef2c1654d51c9e1e23d263561e1d9393b2e3e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/hy-AM/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/hy-AM/thunderbird-78.1.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "dd8762372b789ee7bb6d11994f8216cfb9fcf493d6dd27c3b292f29675e9559a"; + sha256 = "c3bb6b743016d39c6ee5e7e3776e7617bb1d6d3a32c0ce04fc7e0a962cf4fc30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/id/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/id/thunderbird-78.1.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cb811617137d3b57160e64af7b901329b0b6df46f0525ceed04de9a5aaab8bf1"; + sha256 = "125562d267d38c3f4a5cfb9d747dc3c16634ab82cdeecfe18352c5cc85bd37ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/is/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/is/thunderbird-78.1.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e0d7e51f390aa0af3dbbb2505fdc6eb5a3560c97b031fb67e14bd4af57868bbf"; + sha256 = "f2028467188c85d34108a5a72ab01921cb51cd65bd821780cf264351e72f78ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/it/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/it/thunderbird-78.1.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9c88972bd6ee1ab726e16a6eaba32aa78e3d8475506d3394254337eedc47a9fb"; + sha256 = "06663b6d3800c4175ff8c16309174a323cc1a000b140e944d73e74ebeac2c08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ja/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ja/thunderbird-78.1.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0fad6c18b92fcec16684bd9905dd0a3b6bcbdf8c2bfd6d271baea48849a0fa8e"; + sha256 = "90e9dd8d19552e286f0b88252f64de5de9b9798b1122c48470de4795ae833b9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ka/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ka/thunderbird-78.1.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "75c454ca20ea0667caab5223c55a210f68165fc72b1493fc8afc76881cfa823c"; + sha256 = "0998d6b871bdde86830d061bef1e6aa93ad7840ea5c705db05b6d6475246c324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kab/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/kab/thunderbird-78.1.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "8a928f4b5fa7d0374e361a47857c85a34d271d2cbbc760332a6e588e3361fa62"; + sha256 = "88bd997d123541041594f16496baced969c06335079fb7d08473a09cb001a8fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/kk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/kk/thunderbird-78.1.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "18b851bc36799910965c3eb14a8c9a57f29dde91c570e25a8f7f172a8bea7771"; + sha256 = "56bc7376e0a7dcc1e6ca45b41de2769f887ed647320531895f6b3aee99b05592"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ko/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ko/thunderbird-78.1.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "108142a8cbd48dfe07626f4672178a35c5f253c84efcb924c7bd4c1531f6ab38"; + sha256 = "6bbc9f93dcc3c78d17806933020b45a6145e6df3ea0a155492500bcb500f0a31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/lt/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/lt/thunderbird-78.1.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5c65eb6b01e8fe82db99390ae889870cad107d4307e02b04d5f9390eee81f098"; + sha256 = "49e2cbd0d86578f74623ab0c72f551a48d3835a583a5b7269303ab920f14b9c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ms/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ms/thunderbird-78.1.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "78ce19d598b2fa59ecea9d6fd4e67e93b2ba00b2e9569579f687700486e80c24"; + sha256 = "53306a0a9a149fbc7d1e24c24c8ca3ea154ad766be23dc70aeb3bf90ef1bc5b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nb-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nb-NO/thunderbird-78.1.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e8a1f9f4666a3ee423c5541c61fccfe448989d0d7d4840dd36bbc0826cb96537"; + sha256 = "fa2b3f9de332a40df46b32f4ab5451fb16fa400454b2269543c08f8ee156b52e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nl/thunderbird-78.1.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f9292bdc80157d2e2076b7be81af66813aeabc722356c3e514ae18638720192b"; + sha256 = "4439bfa046cea7d823e12f837625fda5ce1953ded9f0af9dec252d9d58dae04e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/nn-NO/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/nn-NO/thunderbird-78.1.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "956b0c99d47845c9b0a1c7d101f576e5b4a7a514893da938d36616db9f5bfce9"; + sha256 = "3a9fc65618790837bb6d998c5ef6ec01019db8240b01c904a61c463bf17b848d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pa-IN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pa-IN/thunderbird-78.1.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "50cdbca944f98eef40479a9070b58729f7f743bda55925c74b6410c163ac784f"; + sha256 = "b433e58bb809a2f47cfc82848db5145cd92280725ce3b5d1bfafdc0e5f616076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pl/thunderbird-78.1.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fe2de7bba7b057022e02f040bb65ddfababb39999fcc573e65cd2bc0c848cf41"; + sha256 = "9ec00ac58795a5e7947a9effa2646081d4fdeed801f7e91ed651d2b457317774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-BR/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pt-BR/thunderbird-78.1.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6b219f0cb715f2d5a3fa72f34b079b401d850f571a9b2ad21c97871a5b83b9af"; + sha256 = "fe187123f5c9b472de5154e126a1d736e1eae0d88fe11f5ca1c771006f37202f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/pt-PT/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/pt-PT/thunderbird-78.1.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "deca0d48ba8bb002444c3649514a2d7e39a698c75382ab53df080ff2c484eee4"; + sha256 = "6a09eab3e662f093ec5428c3d5b0dabd5ef8ca8a734f92bb52088a545dd5707c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/rm/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/rm/thunderbird-78.1.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3799e8dbdf5edd6be276ce4634418c1bbc52862a5366d43460e1bf727f11c27d"; + sha256 = "87f96161f0d415ed24abd2bf7d88ffcadf327910b23c285a4fa7126612011cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ro/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ro/thunderbird-78.1.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a599d873eeb1ecff1c7df37ff89b9e71527192d65c3b0e593d87b0c68bc28062"; + sha256 = "6b6f0125a4354320abf34333353cf52a30ebaa764d1ae17b1fa48e7d1ad53b52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/ru/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/ru/thunderbird-78.1.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b488c44be9c1acd9715f9b872e61f1c8f4a0cedcdda6d291f8ad165013b5f06b"; + sha256 = "3d3c72390d333abd6710b0653f8c95e0283b50580cc6aad3e7c38a90c369cb9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/si/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/si/thunderbird-78.1.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b60c002886df2ab941fb5c445d6b33d31de8a2d9feb15523c2af561da7ab09d9"; + sha256 = "f436f26b6baa8cbcbd407133c099669c45bea518202a34d7538260bd76fc7b19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sk/thunderbird-78.1.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0c59cc63c01ddf7564331a6a9f2ba89c5ab263c227f517c9fa066a3c7f8e8a55"; + sha256 = "ab89336f29fdda1525e827f4f4419b2eb0137279717511ca3de32f221d5335fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sl/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sl/thunderbird-78.1.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2039f31a243f43553c893232d79a27cbc249bf73f083ed05b2914333dea6c5bb"; + sha256 = "fb43a4f2b360774a1c7e337a38bf9388cc1e453b987b7d8ac38e2dde255ae3f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sq/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sq/thunderbird-78.1.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f46914a1a18d989c385f29cd34f95f409f5d56d601b279d8106aa8f224a61c26"; + sha256 = "1029c843c2ff06842dca2af05054d60b87927674b36f6c6890118143f5aeadec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sr/thunderbird-78.1.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a72776da8c85de9f970f1a55ef2f56d2e9fd3fd73b7e6d39761ab6bca7066980"; + sha256 = "e20f00961f70dec27c306c9442315a4e5061840604650ec62123d1cc74a3006b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/sv-SE/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/sv-SE/thunderbird-78.1.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "466378b9542c4a8550fc6e7143fe56e04e5ae15a20bc6ddec5da4eea231fb928"; + sha256 = "1e2d290254f610e1dd8c4d8037e9aaad3abee6d7b7373471e53ff698b736af83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/th/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/th/thunderbird-78.1.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7943c3257f4ef6a842008b0fd6171f87e99043263ccaf4666850ccebec28725f"; + sha256 = "1a80c2986f7f69228c1ae6f2829d3502154ccc9e92ea8bdb2530b82b3a933349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/tr/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/tr/thunderbird-78.1.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a5120107b8fc5418c49d70cf61730ea2b8e833d21d8e6b797d64d2637803709b"; + sha256 = "136a7cd134f8782537a8063da75fca86340597da5832dc87468b9a353aba0b89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uk/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/uk/thunderbird-78.1.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a85b53cd72b313e49ab439f9b1900c4e8f7610be085d757bda4123f5e9293cd8"; + sha256 = "ad0ebfd63617b7807fcb658744650a95c5a8a03328d152f64c48f8ed46a5825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/uz/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/uz/thunderbird-78.1.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "7dcce5d00f6e83b756f3b83067fcf78d00240cb540815e3e63d40302272d5e4c"; + sha256 = "4af26e15a2e1afb84ce9ff0024286b31b6f77b6810897906d7139ffa884ca623"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/vi/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/vi/thunderbird-78.1.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4b94684748f81444d8a8beeac54053673bb4705b6284f8b5d86a5f03fb9a2ce8"; + sha256 = "4695f995cbf7e62eab32aa17a8c9b5cd01c7ccc16e50911436e940b0ff1a28bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-CN/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/zh-CN/thunderbird-78.1.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "346222badaa7b34a7e21f28045c68be815d187a5d34432446b7ffb8b959fea0e"; + sha256 = "d70c7e9667240f2fc9f705a66be84c2decb691af581e73bf2637f97b08f3f14d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.0.1/linux-i686/zh-TW/thunderbird-78.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.0/linux-i686/zh-TW/thunderbird-78.1.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "deecd348a6c260bc50b1e112966d736ee4bc211a1f42f791f37b10a69f7c1c2a"; + sha256 = "1359fc351ef156bbc00a134de4f7dc878fa1bfa77a461ac289f90dc7f870ecd4"; } ]; } From ee69bbd2db721dc36cbc1dd76e5a41012704d10e Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:33:18 +0900 Subject: [PATCH 075/234] thunderbird: fix update script --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index eb55976e2e931..09faec5feb208 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -316,7 +316,7 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = import ./../../browsers/firefox/update.nix { - attrPath = "thunderbird"; + attrPath = "thunderbird-78"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell; From 2ad4c4b183297459a5c25d89c3bb5d6e957571ea Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 31 Jul 2020 08:33:33 +0900 Subject: [PATCH 076/234] thunderbird: 78.0.1 -> 78.1.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 09faec5feb208..c68a403639129 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.0.1"; + version = "78.1.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lh0rsibkd3m6fk4mp07payn5srambslqqlsqkg6mc11rbaim0b4m5256iq670r614nb8w61yc8d0khhpyqgrvlxd4zgdv6s3n17d7w"; + "2m1gqq11k5cql5f49mwrfjk06rm2r24lf9l0hrvj569gqxckyh8wdch3dn339x3yn5fhxqlw0l770p2ssr2kkllv3yy20qqzjqgfpgh"; }; nativeBuildInputs = [ From 40c69060cd2624f04c8b8e99ec8e9982c3aea88a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:12:20 +0000 Subject: [PATCH 077/234] gitAndTools.gitui: 0.8.1 -> 0.9.1 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index ca3dcc08b332b..25985ef0a2352 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "0nch2p4isdv746p9pczqwram0c5f0f9l2r3fy5r12x9br0kak136"; + sha256 = "0lxpdwpxizc4bczh5cl2x2xbbdam3fakvgcbbrdh43czgjwb4ds1"; }; - cargoSha256 = "1d54afg45lw8zyanr49fklzhczadyja2fjmid22d81s2ari84slz"; + cargoSha256 = "14x0m3pq4gapgqaljxdwmr5pk9h209ls95an9xgrq0dj6apyimgx"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; From f7abadf19a05434b762f36325f6dc586b7b1c06e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 00:28:50 +0000 Subject: [PATCH 078/234] emplace: 0.3.5 -> 0.3.6 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 92407e63994bb..5d3d8e15e3ee8 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0l68pcln18hgvqayhdnjv70fcs2y7j3fpiyfm3kl0gpykj7l969r"; + sha256 = "15d21qv8cbzwpz2gsq1cgvxdbqm45zq2wfphhjqq77z1kay43m3f"; }; - cargoSha256 = "0j953c2h5asvr6fvklbdkk7vkdzdbp9zbzxxiic1gjv953gmw0qq"; + cargoSha256 = "0xd1b0rfrf3a6j0xkyfqz2pd0lkb6dpqyyghli9a8kh0kdfxvndj"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 0b8f136c5948d2461bf2927126eb165a2adda4f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jul 2020 13:46:06 +0000 Subject: [PATCH 079/234] termius: 5.10.1 -> 6.1.1 --- pkgs/applications/networking/termius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index a890aefe8cd6f..2019e1c2b818a 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "5.10.1"; + version = "6.1.1"; src = fetchurl { url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; - sha256 = "04zh0zzyp906lf6mz3xzxybn2a55rv3vvrj0m12gnrb8kjb3pk5s"; + sha256 = "1z3ry9jjiyqn41h38hyrx27c2cz8j39qa6i6f0f79p6pqfv93p70"; }; desktopItem = makeDesktopItem { From fea35239226123565e29aa786e7de89ffc709130 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 29 May 2020 23:54:09 +0200 Subject: [PATCH 080/234] gem: init at 2020-03-26 --- .../audio/pd-plugins/gem/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/audio/pd-plugins/gem/default.nix diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix new file mode 100644 index 0000000000000..2c0d0a24c5730 --- /dev/null +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, puredata +, libGL +, libGLU +, glew +, freeglut +, libv4l +, libX11 +, file + }: + +stdenv.mkDerivation rec { + pname = "gem-unstable"; + # The patch below applies to the latest release (v0.94), but then the build + # fails. I didn't track down what changed between that version and the + # current master that fixes the build on Nix + version = "2020-03-26"; + + src = fetchFromGitHub { + owner = "umlaeute"; + repo = "Gem"; + rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599"; + sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy"; + }; + + patches = [ + # Update autoconf OpenGL/GLU/GLUT detection scripts + # https://github.com/umlaeute/Gem/pull/251 + (fetchpatch { + url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff"; + sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj"; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + file + pkg-config + ]; + + buildInputs = [ + puredata + libGL + libGLU + glew + freeglut + libv4l + libX11 + ]; + + meta = { + description = "Graphics Environment for Multimedia"; + homepage = "http://puredata.info/downloads/gem"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.raboof ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 403d9c4b158d0..6666377f7674d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1000,6 +1000,8 @@ in gams = callPackage ../tools/misc/gams (config.gams or {}); + gem = callPackage ../applications/audio/pd-plugins/gem { }; + git-fire = callPackage ../tools/misc/git-fire { }; git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; From 25ab2a33c12ccb9beba1e6a0d456ed379a338557 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 23:35:12 +0000 Subject: [PATCH 081/234] eprover: 2.4 -> 2.5 --- pkgs/applications/science/logic/eprover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index f19d7e35c3e35..a3844dc3700b2 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "1xn5yypy6w36amsb3kvj1srlbv6v5dl51k64cd264asz2n469dxw"; + sha256 = "0jj0zkiqpcx9xp16spkskrv3jycprz7jg1g97i67j43c4yvxylwa"; }; buildInputs = [ which ]; From dfae88d804042d2194b7c5102e40867dc72aceda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Jul 2020 15:28:29 +0100 Subject: [PATCH 082/234] tlp: use structured config to fix cpu governor Previously this module just disabled them. Now tlp merges system defaults in --- nixos/modules/services/hardware/tlp.nix | 59 ++++++++++++++++++------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 3962d7b159894..4230f2edd2793 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -8,12 +8,8 @@ let mkTlpConfig = tlpConfig: generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault { mkValueString = val: - if isInt val then toString val - else if isString val then val - else if true == val then "1" - else if false == val then "0" - else if isList val then "\"" + (concatStringsSep " " val) + "\"" - else err "invalid value provided to mkTlpConfig:" (toString val); + if isList val then "\"" + (toString val) + "\"" + else toString val; } "="; } tlpConfig; in @@ -27,10 +23,24 @@ in description = "Whether to enable the TLP power management daemon."; }; + settings = mkOption {type = with types; attrsOf (oneOf [bool int float str (listOf str)]); + default = {}; + example = { + SATA_LINKPWR_ON_BAT = "med_power_with_dipm"; + USB_BLACKLIST_PHONE = 1; + }; + description = '' + Options passed to TLP. See https://linrunner.de/tlp for all supported options.. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional configuration variables for TLP"; + description = '' + Verbatim additional configuration variables for TLP. + DEPRECATED: use services.tlp.config instead. + ''; }; }; }; @@ -39,8 +49,20 @@ in config = mkIf cfg.enable { boot.kernelModules = [ "msr" ]; + warnings = optional (cfg.extraConfig != "") '' + Using config.services.tlp.extraConfig is deprecated and will become unsupported in a future release. Use config.services.tlp.settings instead. + ''; + + assertions = [{ + assertion = cfg.enable -> config.powerManagement.scsiLinkPolicy == null; + message = '' + `services.tlp.enable` and `config.powerManagement.scsiLinkPolicy` cannot be set both. + Set `services.tlp.settings.SATA_LINKPWR_ON_AC` and `services.tlp.settings.SATA_LINKPWR_ON_BAT` instead. + ''; + }]; + environment.etc = { - "tlp.conf".text = cfg.extraConfig; + "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig; } // optionalAttrs enableRDW { "NetworkManager/dispatcher.d/99tlp-rdw-nm".source = "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm"; @@ -48,18 +70,25 @@ in environment.systemPackages = [ tlp ]; - # FIXME: When the config is parametrized we need to move these into a - # conditional on the relevant options being enabled. - powerManagement = { - scsiLinkPolicy = null; - cpuFreqGovernor = null; - cpufreq.max = null; - cpufreq.min = null; + + services.tlp.settings = let + cfg = config.powerManagement; + maybeDefault = val: lib.mkIf (val != null) (lib.mkDefault val); + in { + CPU_SCALING_GOVERNOR_ON_AC = maybeDefault cfg.cpuFreqGovernor; + CPU_SCALING_GOVERNOR_ON_BAT = maybeDefault cfg.cpuFreqGovernor; + CPU_SCALING_MIN_FREQ_ON_AC = maybeDefault cfg.cpufreq.min; + CPU_SCALING_MAX_FREQ_ON_AC = maybeDefault cfg.cpufreq.max; + CPU_SCALING_MIN_FREQ_ON_BAT = maybeDefault cfg.cpufreq.min; + CPU_SCALING_MAX_FREQ_ON_BAT = maybeDefault cfg.cpufreq.max; }; services.udev.packages = [ tlp ]; systemd = { + # use native tlp instead because it can also differentiate between AC/BAT + services.cpufreq.enable = false; + packages = [ tlp ]; # XXX: These must always be disabled/masked according to [1]. # From a973f1f87c7312b4d330f5042f53020a226bf327 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Sat, 1 Aug 2020 12:09:05 +0200 Subject: [PATCH 083/234] alacritty: 0.4.3 -> 0.5.0 --- pkgs/applications/misc/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index a1f45fc7ed179..72e00cb15a708 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl"; + sha256 = "1948j57xhqvc5y876s929x9rhd6j0xnw5c91g1zqw2rfncn602g2"; }; - cargoSha256 = "1zadnwjqk9kklj0p43azd78kgbva2zihh9wh81w4c5y0kypbchyd"; + cargoSha256 = "17lyzcj07f0vyki3091vgjd0w8ki11sw5m8gb3bxdph1dl04rria"; nativeBuildInputs = [ cmake From 117dbdd7cb79e9baa3408de735de9fb4db40cc42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 05:38:21 -0700 Subject: [PATCH 084/234] abcmidi: 2020.06.30 -> 2020.07.28 (#94349) --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 63ca4dc5e7c28..f075f503ae5ac 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.06.30"; + version = "2020.07.28"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0pdaf9y4ag2cdpygypf11aqa52hhj1y5f7gc8lv3aa1lplxyhi9m"; + sha256 = "05nsakvnx1jz2k9bvabpw5v3js28ng9z7n6ch58brd3qxc2p76zv"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 8005a6aa257dcc430d8172450a7c6be954cf36c8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sat, 1 Aug 2020 01:18:22 +0200 Subject: [PATCH 085/234] perlPackages.CPANMini: init at 1.111016 --- pkgs/top-level/perl-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 597d5c6acdaf7..20c23c766e2ab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3535,6 +3535,27 @@ let }; }; + CPANMini = buildPerlPackage { + pname = "CPAN-Mini"; + version = "1.111016"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; + sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657"; + }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ FileHomeDir LWP LWPProtocolHttps URI ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/minicpan + ''; + + meta = { + homepage = "https://github.com/rjbs/CPAN-Mini"; + description = "Create a minimal mirror of CPAN"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; version = "4.17"; From 66c3d11f43fee2ec4b1978e340042ed29455ee50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 1 Aug 2020 16:27:12 +0200 Subject: [PATCH 086/234] ghc 8.8.4/8.10.1: fix PEBKAC --- pkgs/development/compilers/ghc/8.10.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.8.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index bd7f17b53be3d..9da80fa5c207e 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -68,6 +68,8 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC @@ -131,8 +133,6 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' - GhcLibWays = "v dyn" '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + stdenv.lib.optionalString targetPlatform.isMusl '' diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 02f1f85839ba9..515ff2d646b88 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -68,6 +68,8 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC @@ -131,8 +133,6 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' - GhcLibWays = "v dyn" '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + stdenv.lib.optionalString targetPlatform.isMusl '' From 62150c78eeede0de6a4e410a1e998dd874f55497 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 13:29:55 +0000 Subject: [PATCH 087/234] jamulus: 3.5.8 -> 3.5.9 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 3984305f4bc86..b8763f07b45b2 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0mkrlfaw85pxlacrxfhb45731i4jnn67v411lzx5kb42ncar1586"; + sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; }; nativeBuildInputs = [ pkg-config qmake ]; From 57d31f191bedfa190253beae818a82ed13d63e22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 09:15:00 +0000 Subject: [PATCH 088/234] flow: 0.128.0 -> 0.130.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ce60cf1392a7c..81618be7cf9a3 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.128.0"; + version = "0.130.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss"; + sha256 = "1wgf6dib6f1iwkndr2glq8zi2ssg7xvppkm9awic114i4pr88bfa"; }; installPhase = '' From 026d02c3af05f6e729e21f2b06aafbe97568a6e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 08:37:09 -0700 Subject: [PATCH 089/234] hashcat: 6.0.0 -> 6.1.1 (#94449) --- pkgs/tools/security/hashcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 2456f9ca18f28..b156cda99ac74 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "118jxk4xh55m1vhaz5h2j2385mp4p397m16g9hi4x2k0b8m0zrz8"; + sha256 = "104z63m7lqbb0sdrxhf9yi15l4a9zwf9m6zs9dbb3gf0nfxl1h9r"; }; nativeBuildInputs = [ makeWrapper ]; From 423c031df79f90f8033e5e5ddb4529c25a66645c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 31 Jul 2020 20:34:37 +0200 Subject: [PATCH 090/234] liblinear: 2.40 -> 2.41 According the website: Version 2.41 released on July 29, 2020 (some bug fixes of version 2.40). --- pkgs/development/libraries/liblinear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index 09f3aacca63eb..86d306d0a07fe 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -4,13 +4,13 @@ let soVersion = "4"; in stdenv.mkDerivation rec { pname = "liblinear"; - version = "2.40"; + version = "2.41"; src = fetchFromGitHub { owner = "cjlin1"; repo = "liblinear"; rev = "v${builtins.replaceStrings ["."] [""] version}"; - sha256 = "041fby9vc7nvj0gls5zd9mhw7yqazm530bmln38mfz7wd06z1d6b"; + sha256 = "1mykrzka2wxnvvjh21hisabs5fsxqzdhkxw9m08h24c58vfiwsd8"; }; outputs = [ "bin" "dev" "out" ]; From 3294dd90e05fc4c49fdf414a5fd54f5394923ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 29 Jul 2020 11:45:08 +0200 Subject: [PATCH 091/234] istioctl: bundle charts Fixes #94163 --- .../applications/networking/cluster/istioctl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 90ce1d82f4906..60dc2119ac505 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata }: buildGoModule rec { pname = "istioctl"; @@ -12,6 +12,13 @@ buildGoModule rec { }; vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij"; + nativeBuildInputs = [ go-bindata ]; + + preBuild = '' + patchShebangs operator/scripts + operator/scripts/create_assets_gen.sh + ''; + subPackages = [ "istioctl/cmd/istioctl" ]; meta = with lib; { From e2bbc0d325fd3112122979b0549baeee03b4c303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Wed, 29 Jul 2020 13:50:59 +0200 Subject: [PATCH 092/234] istioctl: bundle release metadata This is required for `istioctl version` to return the correct info, and for `istioctl install` to default to the correct Docker images. --- .../networking/cluster/istioctl/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 60dc2119ac505..e4197a50ef154 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -14,11 +14,22 @@ buildGoModule rec { nativeBuildInputs = [ go-bindata ]; + # Bundle charts preBuild = '' patchShebangs operator/scripts operator/scripts/create_assets_gen.sh ''; + # Bundle release metadata + buildFlagsArray = let + attrs = [ + "istio.io/pkg/version.buildVersion=${version}" + "istio.io/pkg/version.buildStatus=Nix" + "istio.io/pkg/version.buildTag=${version}" + "istio.io/pkg/version.buildHub=docker.io/istio" + ]; + in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + subPackages = [ "istioctl/cmd/istioctl" ]; meta = with lib; { From 670615c3ab68f6ba7c68b28f36b5e050c4a3ae5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 14:02:25 +0000 Subject: [PATCH 093/234] batsignal: 1.0.0 -> 1.1.2 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 6243498296844..56c508eaca925 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = "${version}"; - sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY="; + sha256 = "0ss5dw7wpqsf96dig6r7x4fhf6brmjdy54jyyf5nk1h9kzw4d69r"; }; buildInputs = [ libnotify glib ]; From 3cb42d06a7d1856457d6ac8e22df464d4902b37f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Jul 2020 14:29:19 +0200 Subject: [PATCH 094/234] coqPackages.bignums: init at 8.12.0 for Coq 8.12 --- pkgs/development/coq-modules/bignums/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0e8cead0b31ef..88d7e461a3172 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -25,6 +25,10 @@ let params = { rev = "V8.11.0"; sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; }; + "8.12" = { + rev = "V8.12.0"; + sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; + }; }; param = params.${coq.coq-version}; in From cf5674209481e96db7b71243bd01fed5a0e37961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 1 Aug 2020 18:54:43 +0100 Subject: [PATCH 095/234] opengrm-ngram: init at 1.3.11 --- .../libraries/opengrm-ngram/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/opengrm-ngram/default.nix diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix new file mode 100644 index 0000000000000..ab546c6d0d459 --- /dev/null +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -0,0 +1,25 @@ +{ stdenv, autoreconfHook, fetchurl, openfst }: + +stdenv.mkDerivation rec { + pname = "opengrm-ngram"; + version = "1.3.11"; + + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; + sha256 = "0wwpcj8qncdr9f2pmi0vhlw277dyxr85ygdi8g57xp2ifysigm05"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ openfst ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Library to make and modify n-gram language models encoded as weighted finite-state transducers"; + homepage = "http://www.openfst.org/twiki/bin/view/GRM/NGramLibrary"; + license = licenses.asl20; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6666377f7674d..3175b800db658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27140,6 +27140,8 @@ in openfst = callPackage ../development/libraries/openfst {}; + opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { From ed1c70ba0ca156c588d386a1a1a3b9ba64f2f836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 1 Aug 2020 18:51:41 +0100 Subject: [PATCH 096/234] phonetisaurus: init at 2020-07-31 Co-authored-by: Martin Weinelt --- .../libraries/phonetisaurus/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/phonetisaurus/default.nix diff --git a/pkgs/development/libraries/phonetisaurus/default.nix b/pkgs/development/libraries/phonetisaurus/default.nix new file mode 100644 index 0000000000000..126a91fe29005 --- /dev/null +++ b/pkgs/development/libraries/phonetisaurus/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchFromGitHub +, openfst +, pkg-config +, python3 +}: + +stdenv.mkDerivation rec { + pname = "phonetisaurus"; + version = "2020-07-31"; + + src = fetchFromGitHub { + owner = "AdolfVonKleist"; + repo = pname; + rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb"; + sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ python3 openfst ]; + + meta = with stdenv.lib; { + description = "Framework for Grapheme-to-phoneme models for speech recognition using the OpenFst framework"; + inherit (src.meta) homepage; + license = licenses.bsd3; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3175b800db658..d49d0568734c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27142,6 +27142,8 @@ in opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {}; + phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; + duti = callPackage ../os-specific/darwin/duti {}; dnstracer = callPackage ../tools/networking/dnstracer { From f1785f2b1ab2280fc831a757c92525e34a8cbce3 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 1 Aug 2020 20:43:24 +0200 Subject: [PATCH 097/234] mautrix-telegram: add postgresql database driver PostgreSQL is listed as an officially supported database backend. --- pkgs/servers/mautrix-telegram/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 8d5349dbf3665..c39d4fc0d861d 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -2,7 +2,14 @@ with python3.pkgs; -buildPythonPackage rec { +let + # officially supported database drivers + dbDrivers = [ + psycopg2 + # sqlite driver is already shipped with python by default + ]; + +in buildPythonPackage rec { pname = "mautrix-telegram"; version = "0.8.2"; disabled = pythonOlder "3.6"; @@ -32,7 +39,7 @@ buildPythonPackage rec { pillow lxml setuptools - ]; + ] ++ dbDrivers; # `alembic` (a database migration tool) is only needed for the initial setup, # and not needed during the actual runtime. However `alembic` requires `mautrix-telegram` @@ -41,7 +48,7 @@ buildPythonPackage rec { # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic` # which has `mautrix-telegram` in its environment. passthru.alembic = alembic.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ + propagatedBuildInputs = old.propagatedBuildInputs ++ dbDrivers ++ [ mautrix-telegram ]; }); From 1f221860a7ad9cd45d819188e90fd1c9f1c65fad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 25 Jul 2020 15:59:29 +0200 Subject: [PATCH 098/234] python3Packages.pyfritzhome: init at 0.4.2 --- .../python-modules/pyfritzhome/default.nix | 34 +++++++++++++++++++ .../home-assistant/component-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pyfritzhome/default.nix diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix new file mode 100644 index 0000000000000..7c5dfecd269b2 --- /dev/null +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, requests +, nose, mock }: + +buildPythonPackage rec { + pname = "pyfritzhome"; + version = "0.4.2"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ncyv8svw0fhs01ijjkb1gcinb3jpyjvv9xw1bhnf4ri7b27g6ww"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + nose + ]; + + checkPhase = '' + nosetests --with-coverage + ''; + + meta = with lib; { + description = "Python Library to access AVM FRITZ!Box homeautomation"; + homepage = "https://github.com/hthiery/python-fritzhome"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a3a14af16af9f..b1f5ddcbb8150 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -268,7 +268,7 @@ "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; "fritz" = ps: with ps; [ fritzconnection]; - "fritzbox" = ps: with ps; [ ]; # missing inputs: pyfritzhome + "fritzbox" = ps: with ps; [ pyfritzhome]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 494155180731d..3f06af874b919 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3845,6 +3845,8 @@ in { pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; From d5763187406b4476b2f4bc80d35e4e4946f6e86d Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 21:12:34 +0900 Subject: [PATCH 099/234] firefox-bin: 78.0.2 -> 79.0 --- .../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 972349a96f52f..618a6fc519db5 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 = "78.0.2"; + version = "79.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ach/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5aad5e0c356b6efc6abe23c7f1b38a0ecfaf6af8c968c322b9a934fa26047f4e"; + sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/af/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6ed9ee81d9c0dd58fc809bb2ac01c8c90a043d839e1e269e6d878bdacf6c61db"; + sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/an/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8304f82030b794ceab1ba16d3008ddeb4f9e388aaedd6f886c82f9e1e7c35211"; + sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ar/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0bbdabc0af5b019acce60f3e52ea63885d6ab9ff3fe68152d7b97f44f39f44f9"; + sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ast/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a625f09a48d8124b0f4a7519864ffedde91998ae54c8ce76d4b1238ecbea4508"; + sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/az/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fcd60944d39bf8b8ea962381910556a868ad26608f87de1c3cf2e46db698b2c6"; + sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/be/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9ef44215fe4242f1c5eb609b7adcdbc9718dcc7743f25157d91427388b64fb25"; + sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bg/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6f89fb6d6520a1ebd493579a072b620fb9e6bf202d12e99b30b28ba2c7e98584"; + sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c37062eb04923935c5b13a76a3334d26b76c57b2f587b75e3a5d2f9bd7e38700"; + sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/br/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "39375e3b6eb87f73fcba1bb5249499e510b52cbe0e395a6dcf150ec0a478f711"; + sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/bs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "88ae4e89793a0888f1bc204443bc82aaa38fc7fbee10b43f3dfab0907e5d8d65"; + sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ca-valencia/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "3e66b6ee68025fed584b554dc96ee8c1cdce903834b5f2c1ceef2de90ff36e3e"; + sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ca/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "99333eab1c65a83e4f24db638ec72325e66b3787338c7e331195745acc596de0"; + sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cak/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f2e34487c829092156c6adf3f41e68d6e2fb9adcae48b7f3fd1fd71254246f66"; + sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3099d37be06f428c5d1633b675ae15b7c80f6637d1d2e24a7bcf7faa649b1456"; + sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/cy/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b6f9e6f4df07355cd03b26e15273b9bfeb25e4ff6fe05c3702fb1b8786258064"; + sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/da/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e32ee0e47f07d69f8fa2fab9287d74d1a047200f760cdb0402c7e9dcbd7a062b"; + sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/de/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "97fb2da328de58011358c5c3b25b156c56a4eec313599f5b527f1223158ed44b"; + sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/dsb/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0cd8573516b0cbca2162cd91b001a8264ac7162ac194ffbd0af8771f8f9dbf2c"; + sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/el/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "55fcfe3914c5a8a465ea3274b697b3b724aa22ba65ac3de51ea90cd0d4963cf6"; + sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-CA/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f7263b5d399298aa7db61fdaa67964d9fb67870c87a67f6b6a2f4e551e0d9f9a"; + sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-GB/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8aa1309a5584a2fbf4d162de6019501d1d837a11bcc5afe7a2a30e004eaf37ce"; + sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/en-US/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b50d010f2db643bebd3f54d13a079833e25f03e4b163ffe98771596fafe8c487"; + sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/eo/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a89d7d8aa8150ace037471f18c43108c8b2eb90517a8acaa0c5d7ea29cbbca17"; + sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-AR/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "35d7087253e811603b07ff234cd5a86ec42c9f0a2d78d1f95be45e4e70efd507"; + sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-CL/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "37950144b29c8fca29731d8fdcd522fe01d9cd8319ed7a76ab56a438c81e0187"; + sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-ES/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "efdea0c75644dc815294247efe2a226d737f9dec15be7e22fc8cfa63086aed57"; + sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/es-MX/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "beb8cdf6d0cfb8dd24ae5aaf453463d0d7158f0617883f69b1bb93d65152c467"; + sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/et/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8155983b7bbb879cf3e72953b4308fa90ba7f3fea64e18bdd2c58826d984cf5f"; + sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/eu/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7dfda92d871b35a5289380a424bed691a90613454d3da40f1d3bed0b71015116"; + sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fa/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d6c690936403c9bc4855fbd67cd4b1cd0647a625445a61ba4bf35ec08cc50fa7"; + sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ff/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "4deba894e2248b466d20990abdd882272e0a1ebf1ae2aa9f1e1293c16307a0e5"; + sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fi/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d73c08f58f284c4949e46a8ed170aa6440013e8172c25f25d05a65a4c9d46a11"; + sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "10cd4f0ce5d3435108fb3e8d3f09880deffa646f3c2f1d91ca05c4a7455a2712"; + sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/fy-NL/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2e8b78dccaf84bc6799b6ac004a2ee4b2ca22b59c447cfd02de19fd187a1791e"; + sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ga-IE/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ce1c7e26835d41d5bd4c28e17ce3b5e892423fff6a84b2e019f188ecd687a2c3"; + sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gd/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "299101dedb51a7eeb02c0ea20588d453011bf359a3d8247b34a7ab13658443b1"; + sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d69d9d51f7ed5c50dfbc6d39f3dcf5e69f9916e4f97ebee41a8fc5513e42051a"; + sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "afbf120a9ab7aec22783d929fd95b518380239dff24d5dca38ab562bd1522e32"; + sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/gu-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "6cb8a13af293cff3937f8dd3e8e22f10b9d5ee881e1edc9b900554f9964ac6c9"; + sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/he/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "93662462043dd7ba2926c69a121f13429eaa49f9bc08a9b5adaf0f55715fa76f"; + sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hi-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "873874e4906228b134fee0d069324fbe85bfeb1be262dd3d1b5bbc05345feb8b"; + sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a0544483d70126e51571d82bf49c3fa002f329895ce901d7568cef216d118801"; + sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hsb/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "563402e8ce08191fbbc34c121752a9d83dfbc9334fc4b1ffd1cb2af5f07167a3"; + sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hu/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "381ae08bb0fb06104d6886d3c7c98355a6508a2df52da447e3d252380c2ace7d"; + sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/hy-AM/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3706cf7d73d84d9fc86f58f60b9eb196a19f93dc151c3038390077ac2f9278c6"; + sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ia/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ec8571c07f78fd95ac10ab57f06d248f0287971dbfcf00581277df8774d455f6"; + sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/id/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b181d9005f59c8cfc2d7cf3902d9be442701dce47941460792b6f36473efef45"; + sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/is/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4143e19a8e5824031073623ebcc9d0defc4daa11af26d0776d29aa40f9807382"; + sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/it/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "29bd01248dc9ccd879480d455633312c06e5e1851442fcdca3eac526f2fe2649"; + sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ja/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "31ede3dd2c135940b10e25fafe90064fcf006f5378bc83298bfeebfc5084c4df"; + sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ka/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "778187230d455f7776a0fbeed057916c808efc240079c5f0d5c7c18abb05fdae"; + sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kab/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9a2e7efb4678eebbc2b1da6f559d439a1fed1a0ce654418c5cf3fc77e532fcf2"; + sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b30be1cda17eb0df00403dca06840798f9949518a88994015e31177c8197b7c1"; + sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/km/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2027addd64176ffb83195ca72c4c9295f8bb9254a421ce48510eb6a44f083e62"; + sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/kn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "bd0e388c7c75c7457518bb2425fe9c2c5bd96c610627144f308683505111a493"; + sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ko/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1ae0fa8d0a6d0d84d88068f9e66d5ce6502f130a2714344f75e937029357bbf3"; + sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lij/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "dcf622e68696e832ffec3f4e0017a391364c1519f4fe4bb71f2e895a87ed2922"; + sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lt/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fb15def9bfa73a98f55a9f32b545c45587a1e130e1bcb3e891ec461426f0cb92"; + sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/lv/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b5e4f678445a7279a1a41f75c5e8ea2189b622d4089ce63d80294f4fd22191b9"; + sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/mk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c93d014fb127e777e7bd15ab8f4da7667f20614025adea8800fa5677eb5de120"; + sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/mr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9ca0f0f682afd0fe01fea717589c9ea75d6b48b8473a72bc6b8d6c7fc86bbe45"; + sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ms/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1fc671c5e591aad4916625a30b6f544f01e2b3c58fad3c4bacc94de10a34df6a"; + sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/my/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "cd94de7c4c23d1fb824c7c055f049f2a61b0e6707ec4c18797cfaa55728aeed0"; + sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nb-NO/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b61f7c2f291807c2cac621039b5f128f84a32a660e7cb2967ca44633abd4e3a0"; + sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ne-NP/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b3c50744eab38f32356dae4fbe0212b98c92cfb0a8b2996e4732979e5aaf9198"; + sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "540b2e37699b6d9eaa5acdf7ca3bcb5f89b636b73e333a97a15af91805e5ccaf"; + sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/nn-NO/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "462c44b8b569a66daf73e4079d266f91014fc97e5d5319646b84bc3793ccb94d"; + sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/oc/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a616e29cef4c871c76325b671c71b68eb3bf039cfd69c09544feab228058301c"; + sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pa-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ae166632baa40d939d46b951d3d74e0e32154db62ccbe53897d38f0b1d9c91a3"; + sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4c073d6a3f2d8d2b0b4be765312c5e3b0766972e376174f26cc4522644074d42"; + sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pt-BR/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "124c0d726cd7f42e79e02109eb410f229c7ada0a48acb09f98179d34ca47c79c"; + sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/pt-PT/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "58eba625ae060d62578eb942cbd0a4939ab286880dc729b7e3f000f160bb4fbc"; + sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/rm/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "622ef32b6b292648c02b18b08623e7edbc0c00cc93501c1725e4be8af1c109f9"; + sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ro/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ed0f8979494fdc797fe2024f8702852dfab743be6ea08e8f8c77338f3680c4a4"; + sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ru/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6ff91ca25f69bfaf659c799bd7ff58575cfd7b6f8bf1dd77b802aac709c8239f"; + sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/si/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fe2fe584022a2728a7117138abedac24d3f0bdf7448bc20f6d34cea05373f6e7"; + sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3ee13740f47361aaf14f3f35d242a5168495152985552f3fe62ba0afdc4c2075"; + sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "81ce00f5e3d83dc51a93706461c6171efadc5beaad16e49f6abd4fa20a0ca30d"; + sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/son/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "8b3edd3597a380b27fedaa025dec1be25cab6bcda26ca982c3c555fda04c613d"; + sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sq/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4e6ac31130dd0f1880ba191c282e4fa76717c2137f674f7f3a1376eeadde5944"; + sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "81d26236cf54d7f60ec6dedf98e31874bd1fa459e554c3e0a6f4cedb021a65a4"; + sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/sv-SE/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "37fb9ff154227fdefbf67e1e83f9797774b714d8ee752e0a608bd0a66274ef02"; + sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ta/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "cf40e8d62c9a829dcf7848d31ce4986aa62752059f14d39f52acbee1877d738f"; + sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/te/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "7eadfbe6d78ca286ac65ff9f033778c6859ee412c6dd068a1f1ce203cfddd11e"; + sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/th/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b7a4baa22f40eaba2a8fafc307bd17f1ea4bdacd0f8c6d735dbdb97f8c17d905"; + sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/tl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e9cec461fa882a411e7c99b0167ebbd85748644812dc9ef5a280e82e8a65b975"; + sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/tr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "648f8cf98e6f08e430e8f737506b1cccd7c445b499c1170cd0e185be01e2f7d9"; + sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/trs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fa5c302529a10aa7ffdd9a14ac44cdcf3368489b261fe7ac0317a311f61d7ab6"; + sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/uk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b7d31cf904b77098a1a52280d6ff5a407f85ae5a9d81a9b337901e6cd782293a"; + sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/ur/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f4ccf602756892e6191c069858fb9b1350f86a42aa8de8ec95327cf3c2706ecf"; + sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/uz/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b43ef80e02f4f39d87f761bfc46ddc5aef80c702fadad80d229e1e2f2fabe264"; + sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/vi/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "adb9748ee2381ea0d90db9c51e5b5a5cbeed35915dd589b24158892b2ad4f4da"; + sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/xh/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "fa98801bfa8768c867698eb3922213f1998393a52ad30a9a8d697b81869ea2db"; + sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/zh-CN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "985208be2099f0990f854598c063da2592ae4d1c75024202695b1ce87ff06c40"; + sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-x86_64/zh-TW/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6180f8249b5584d83b21928c2486fbfe42fb9d5817d62d3194949d27e54a1dab"; + sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ach/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c89cf2d01f7c9ca6a587a23f07f59eaf79fde24ca8ff014be3f26cd3e3185606"; + sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/af/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1491ea0bccb1e671f26d337d9cba7048e57cf1346854051fb4fcdda23c89810b"; + sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/an/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "16ef600fad5aead2c5ec00cf4b510875d1b4517932fe4ff2bdcea023d0080e93"; + sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ar/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "fa414c361c5b0a60606fb1e5bda4c96e8c9d5e59658edb8f8b6086713cf2add9"; + sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ast/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d002818bd100522da0c861d995ae7a40f586e128e1c880a2ab13ee2d6aab6391"; + sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/az/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5f15e231fe0e6eec4f220c94a14ef6b35b134b27bd43bf7db389ff7c42f41bca"; + sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/be/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0316de461e10d11d5756f4323f2eadc20715e6b10e406c2bd1d9e9111cfec52e"; + sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bg/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4e4b5df75fc249fecdb1d0c15b05b449da1b2729def99c933beeac0677a4088e"; + sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "76e72987d1318f5075b7af623e2448665ce2b6e17e1abe7a8e2e336455db8be0"; + sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/br/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9a44caad51de4d6df551e789e695e9df70e2bb004d4c23017fc26dc9528d7e07"; + sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/bs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "cb03ad4830b8c50a1bb72bb138c27c41d40580c6e7c04bb52cb1c6c4933a463e"; + sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ca-valencia/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "96fce58cfa724aa955a4ca363d175f91568c9b19a9ee5b82cf543705295cc33f"; + sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ca/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "97506abbc549f71a5f8dc1b418e49c34a3a3fcf06b87f488230ba9fd7a5531e2"; + sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cak/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "eb89fffe9719d4cd6e7aa4f8ba131692a25ee8f3e65f5be59c214f61cbad6ff1"; + sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "49fd5a768feb1d18d0870c9acfdec949bd976ec9dd4b3e50d6f66eafc84ffa5b"; + sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/cy/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f7a22c11243f79d1e4c54759c887cbb5017a18b69ac3cecb602b6f0871ab7d6d"; + sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/da/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a5ac75543a1e7fdd8ce0d6c832499897338072e2762d5138b1ad11198810429b"; + sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/de/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "db5a34e13161646c050c6813e1f0e222af5bc589eb010a64488d8cfae479f62b"; + sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/dsb/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ebcf8f4a160024e32d959a71c775b0fdc2e8c53cf658aebd5288badf2fd68503"; + sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/el/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "88126297c43b743a2d317760c83efc81110409320ed396521e434521babcabe4"; + sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-CA/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c46f059c7cf77bfa89da21efa5aa4a5672a5e87de6ae190aff9025881da47df1"; + sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-GB/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "989e7d728bd85e9a82c935f78cc74c54a3c56cafa985abd9510fd2132b86a474"; + sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/en-US/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8e6d63f2ff1c3a2644cc0d392db079b2a1228a9ce587c046245feb7d0a0a53e7"; + sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/eo/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "95f895d076e0b77806fa66978e98cd338f7abc34d4e7713564ab1c574403b622"; + sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-AR/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "933d4c73bae24c4d5b81160c119b14498fb3cd48b370d2d69d88e4ef09d23d6d"; + sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-CL/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a13dfe2687d9772894addb74a9c5c9e06438e6611cc2c4c7bf73a816d69091f3"; + sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-ES/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "21a0454e6d9559a0e6f9a8bcbfe7b4a99d462d5cb5fbdbf10002573385fcef91"; + sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/es-MX/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "273c0354086bd8653d310f06a0d02193791f3f81c00d2c1da5fd15a741fc1d54"; + sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/et/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "589dd668ee1ded914444baa4f85fbf9c6b854052420f8235f658d6e38f82a3de"; + sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/eu/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5e1feb02c1c352fb04f9a3f845a56e3a24f33865521fafa76fbdfd2cb44bc586"; + sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fa/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "88cd28899d3b005ffda854e2c8b1ab04dcefaa31986e93df3eb81062f06afedd"; + sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ff/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2f8d4bd367498d5d71e83c4b26cf707c5ec537e3c9c0fb3782589d1574b71012"; + sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fi/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b20a202fe6deed40dcde94981ae3fa544bea847cb85cce95448e10e4b0432d34"; + sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "111013fc87df1b4a7950fb92c51e58d40a6f422ea625051b154e1da0231b9958"; + sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/fy-NL/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2a52f517b441ab7757f04a650320c71e7bd7ab9d3b0c99d11e2e8fac7b6149d4"; + sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ga-IE/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f666a3b7c966fc29f2d22c66b02175ee41b61b6424860db060fb11a160a629af"; + sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gd/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d89530f83cf6062fc607a483bcb83d15e40b9af4c00b0e7ed395eadfaa5e08e9"; + sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a8a8fae4ee159cbad1df8ed33242bb159ad0dfab4c5541c05e8aa476c06c9b64"; + sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "2f82570a839d818a8831ba53f6355b1d4d7ce2e0ae21e92d56008856763aff01"; + sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/gu-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "2704f9d6c02ac5b45952a07af1c43a501a409ac7ec0781cb1997f848b7236f6c"; + sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/he/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e08f3e7dc6efe0bde863c5d8efcf3af0bcd13a39a706323a8c7518a86a1914cb"; + sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hi-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a78980364cea6c3f37395bf3fbe78be68b26c76a9a7ef29e9a820ab15d31ddf5"; + sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e800b9a6180402a8412b201979a6d75a9e435f517abdef2ce1f512279b28218d"; + sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hsb/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4f833efe2058cde1a6824bdfe065ecef37c3df38984ab4cc2d0be21ecebc0f70"; + sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hu/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3d933b93dfced54e4ebff9702a059078de87b76e8dbffeb1c171c71f4d418faf"; + sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/hy-AM/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2b0fca77dc8a54c0bbf5b7c053f509bba352ee24ddcbac44a9ac20e4e9d14992"; + sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ia/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "4ba45963aad03ddb2fd1f5977296ef198c52616a6ffce00d62874bacdd156a5d"; + sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/id/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8cd8d557276e0c69899d71c78f89294bb00f397b91ec09226e1b7d6ae42c04e7"; + sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/is/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "be2a639ebb6a47695595112dbcc207f93ec3f17556dfa16d0392ee926646f046"; + sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/it/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f69ad6eec0940dacdf5838eea86dbf834b262d392a1407260bf47bae3e1488ac"; + sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ja/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1d58965235f20566ae54b7962f4107df72af023b19f91b166d63ad629ef3cb3f"; + sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ka/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "45fa8441ff7709fc97fb7f3b6e846f8fc8eab90886a74baa82f3bd4608b1630f"; + sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kab/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bef3c739000d41a332b96ce72ea675cc1e795ca5e55d30046a454433f69bcf84"; + sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "57cc17d222211bf4fd2561bd2c8c7fcf2f78b9c70bc8a6a3204df2d8e0225dd1"; + sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/km/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "70394cbd7718f907d269889bc4b8b446b740984e7082d15152436c4736c1afba"; + sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/kn/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f22617316ff43c5c158e0cf7d3f68244d327b5b6506b603b8451d9d95f5feceb"; + sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ko/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ebef054846bb8b085d71846957baa7653b6baac4a7a3b5769c3fe51973fde1f9"; + sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lij/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "d43b61c1ef5049fb222b918716f778ea3cc46e00f5b8ff8170c96f154f9286b1"; + sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lt/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e6c590c5eb7d0cfaf366c8167f442b4fb259cd9b01f8db776e3633115c605849"; + sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/lv/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9486890eb34d7879ce793ac752ffe0640a0730faa9049ca79134f2327cf30acb"; + sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/mk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0c290397ca8c65ba7f4762e5619d7a99a49335cd734ad3e6c5835634771c42d8"; + sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/mr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ad720c374b4b35532db70aec599ee65ee83582476bef856b57b7b8fe01940be2"; + sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ms/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "27f4185cc4c62272b4bb535e4df792d61c16a3056e306c14d48d4c9a682f6075"; + sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/my/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "7da3e0e7fd8490fcecae456fa3590da460e84b00c66578e670cb156e05daf671"; + sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nb-NO/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "8b00a6c3c9d7897f1d5d9f5caa7ba865fdcd3458254136d43eb7bdb1b29681ef"; + sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ne-NP/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8ea41529ada045c1fb1ae6c02b407883a422dbc7b872880f78451989def7ba07"; + sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "602960ba0797076f5de41589251fe31a3782f53b4ada1485c9f5d9b3f14cc190"; + sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/nn-NO/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "334648b97b2fb9fac84cbc84e57a5943a332317a53d4b80b461070a87f3c21e4"; + sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/oc/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9b94d4e24e6d45fa043a1ab4f171c46880ed581fdd14323e9c1f95872de66966"; + sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pa-IN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7cf729c1eec65582dbc6113d52cd9791f3f381a40adce84a0d8bf908f931cbc3"; + sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "60c9e642ecc8deacc54ad5e5e863cbfb415d0ee3df421c4b8aa5d30ae2da5d9f"; + sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pt-BR/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a45e792f37b0d0987191c20b1f4824df3ad848742d965af735914ac86b9634b3"; + sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/pt-PT/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "868cf0e555fccc09b22d257e5eccf3116d7580fb5988ad61b7044b3485f32fc9"; + sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/rm/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "719b76ed84b6edc2ca8f3b5cff8c48ec8424a5902952c235d73bc034bf7bcddc"; + sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ro/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5c335832e7941826d4b8140af4ea57ff774edc1e4efa7d8dea578824556b17e2"; + sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ru/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "72c3296d0586329bcae7e35e7ecb9789f868f5202c298d9d7781236c521628a2"; + sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/si/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "974cb974f6a5e91b85e98cc615c74cd89a4457928299e17799568351e92acbec"; + sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "73fe3359a214f85ceba9081b4464a1ed1ea3a68826ee862474fe37480dda791b"; + sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ae2cae6900d90a2627472156c137ab2e2c53f46831e0fe2b60085e662717e09e"; + sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/son/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "ce62da5619b8d8f4867330f267471c8bcc49255e6d85253ab06bd0278f7fd4f1"; + sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sq/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ee4db0cc3867d2e67349563f477827400a13491bbe09171342ade977792bc496"; + sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "67e71fdad5b24d0a354b3c390c81957a9c495273ee109779fe24c76a55ab4920"; + sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/sv-SE/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cbc069bfe4830e4376894452b6ac663b386936e7c68629428e455bf3ee7a5a15"; + sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ta/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "68c5543c8f7c3cbdc0e41aff3035eb5a179a60ef6e7df6b082e56fa6f7f286aa"; + sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/te/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2936bb8eea12cb582f07cc2f53928372ee318c8e71e7ad3080fbaf351a2b513a"; + sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/th/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "47614e34c16e0bd0054b3ef0e30566e2ba23bf8ac74bdba793395afc80b93d5a"; + sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/tl/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d6787a009449f224b7df2df183bcb06ea7c7cd0c87530688ef311d63e9d8a1bb"; + sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/tr/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "db682a21db0b9bd25f7e1c7af33e1f5c4d9ff1ef63a662e2c7312fb58506a37f"; + sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/trs/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9909d50bfe7f5a9dad3ca1464cd5d7c07040d5928829dcb71b65081b087d670c"; + sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/uk/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8244e8a3ff8e2fd93b9a37442e764ba147488441d541456610dc16ffe1b6512a"; + sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/ur/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "995948932e73b0eaf9d598c4d976d00088ca2950553ccc924e1900806d473ba7"; + sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/uz/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e09c9a3984a7d825b1dad0e4a3ed694151d16deace9f755703a6e95c44205a45"; + sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/vi/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "27517480370afc6a2b420f594a497b2e0aef1235cbe81cd4b5b3355915a805a8"; + sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/xh/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "81553d014accbb50a034d609337635a5afb1cf7f00f3d2c3d78e0bd25b6152e3"; + sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/zh-CN/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "54f1e45e1230ac9e4312150b6d296058a36b08e2f94d01b49a11dfb330770fff"; + sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.2/linux-i686/zh-TW/firefox-78.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3029202fd7761b2df915549d852e6638d716d930507cab8aef8958f51ccadd42"; + sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1"; } ]; } From 1d9792aebf5e08fd8064efdcf9ef0b3c54328277 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 21:13:31 +0900 Subject: [PATCH 100/234] firefox: 78.0.2 -> 79.0 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index eca636863965f..bd11e83acd6bb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "78.0.1"; + ffversion = "79.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "mdO6masIpiZBvYi6kpYUTSnsOda04CUs2CL1LNf1Yad+rfY4ga4aFuLtfKqfgV5IcIIl86XeiC+0grd4irbCYg=="; + sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; }; patches = [ From a685cff19d37ecae55a91a283897964ef8761f33 Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 27 Jul 2020 21:14:14 +0900 Subject: [PATCH 101/234] firefox-esr: 68.10.0esr -> 78.1.0esr --- .../networking/browsers/firefox/packages.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bd11e83acd6bb..20b3a7b1eb6ad 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -33,6 +33,34 @@ rec { }; }; + firefox-esr-78 = common rec { + pname = "firefox-esr"; + ffversion = "78.1.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + }; + + patches = [ + ./no-buildconfig-ffx76.patch + ]; + + meta = { + description = "A web browser built from Firefox Extended Support Release source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ eelco andir ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = lib.licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-78-unwrapped"; + versionKey = "ffversion"; + }; + }; + firefox-esr-68 = (common rec { pname = "firefox-esr"; ffversion = "68.10.0esr"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d49d0568734c7..cb7aac81471ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20087,10 +20087,12 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; + firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; - firefox-esr = firefox-esr-68; + firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; + firefox-esr = firefox-esr-78; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From 1e81d782a80a416eda86d384af1661cf706cc132 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 1 Aug 2020 17:06:20 +0900 Subject: [PATCH 102/234] firefox-esr: 68.10.0.esr -> 68.11.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 20b3a7b1eb6ad..62181321cac9f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -63,10 +63,10 @@ rec { firefox-esr-68 = (common rec { pname = "firefox-esr"; - ffversion = "68.10.0esr"; + ffversion = "68.11.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "xcGDNWA2SFHnz46lFlm8T7YCOblgElzbIP4x90LXV//a748xT4ANyRIU7o41gDPcKvlxwIu7pHTvYVixAYgWUw=="; + sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx"; }; patches = [ From d46d695de32fc4831f726e649c841969e0b37280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 1 Aug 2020 20:16:59 +0200 Subject: [PATCH 103/234] Revert "libreoffice*: fix build after nss update" This reverts commit 34432ad386907186219ef477610847261b36b259. It's apparently not needed after merge a45f68cca (PR #94188) --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7aac81471ef..4c5a2b0886df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21031,7 +21031,6 @@ in harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; - nss = nss_3_44; }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { From a67babd316274425898cff992669d3e261c033bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 23:44:51 +0000 Subject: [PATCH 104/234] eternal-terminal: 6.0.7 -> 6.0.9 --- pkgs/tools/networking/eternal-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index bd39cfba8aeb4..34b03aff3998e 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.7"; + version = "6.0.9"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h"; + sha256 = "16s5m9i9fx370ssqnqxi01isrs9p3k7w8a4kkcgr4lq99vxys915"; }; nativeBuildInputs = [ cmake ]; From 4246ac70317a395061a8f40345875efb03ebe897 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:10:33 +0000 Subject: [PATCH 105/234] checkstyle: 8.34 -> 8.35 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 632d3005e7b5a..8ea63aa155e99 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.34"; + version = "8.35"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "0qgldd0rna5y50vflkjnhl4hb4nhh28d0zwsv32872g6hivl7fzb"; + sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0"; }; nativeBuildInputs = [ makeWrapper ]; From e3c86f13f891448307f8d19ba0c13ae776636fff Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Tue, 16 Jun 2020 11:04:10 +0200 Subject: [PATCH 106/234] elinks: 0.12pre6 -> 0.13.2 (felinks fork) --- .../browsers/elinks/debian-patches.nix | 34 +++++++++++++ .../browsers/elinks/debian-patches.txt | 8 +++ .../networking/browsers/elinks/default.nix | 34 ++++++++----- .../networking/browsers/elinks/gc-init.patch | 17 ------- .../browsers/elinks/openssl-1.1.patch | 51 ------------------- 5 files changed, 62 insertions(+), 82 deletions(-) create mode 100644 pkgs/applications/networking/browsers/elinks/debian-patches.nix create mode 100644 pkgs/applications/networking/browsers/elinks/debian-patches.txt delete mode 100644 pkgs/applications/networking/browsers/elinks/gc-init.patch delete mode 100644 pkgs/applications/networking/browsers/elinks/openssl-1.1.patch diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.nix b/pkgs/applications/networking/browsers/elinks/debian-patches.nix new file mode 100644 index 0000000000000..07df14767aa64 --- /dev/null +++ b/pkgs/applications/networking/browsers/elinks/debian-patches.nix @@ -0,0 +1,34 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "https://sources.debian.org/data/main/e/elinks/0.13.2-1/debian/patches"; +in +[ + { + url = "${prefix}/03_459467_ui.leds.enable_0.diff"; + sha256 = "0l35lglmnvyzz3xyy18nksra14gsp7yc67rskbzmr61szg8b9jqr"; + } + { + url = "${prefix}/04_436817_nostrip.diff"; + sha256 = "0ixvxaba1ww375gpdh7r67srp3xsfb5vyz2sfv1pgj6mczwg8v24"; + } + { + url = "${prefix}/07_617713_cache_control.diff"; + sha256 = "0drn4r33ywvmihr0drsp2jwz7mlf5z5fv8ra7fpkdavx45xqaf15"; + } + { + url = "${prefix}/10-reproducible-build.diff"; + sha256 = "024yp3xsh0hw29l1wikfmk9j3mqval6pdr4xi7rzffrlaknh58h5"; + } + { + url = "${prefix}/14_debug_disable_Werror.diff"; + sha256 = "0s620r88ikfljflb5nd133cww2wc0i85ag8lzpvrsmg0q00hfmax"; + } + { + url = "${prefix}/16_POST_BUFFER_SIZE.diff"; + sha256 = "17vkvy0d0rabmgk8iqwgdsrgjn6dbb9cf6760qbz82zlb37s09nh"; + } + { + url = "${prefix}/11-reproducible-build.diff"; + sha256 = "1z17g9z68lh12fs6fkralfghh8bs1bs5mlq83d15l4bn3za3s0sl"; + } +] diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.txt b/pkgs/applications/networking/browsers/elinks/debian-patches.txt new file mode 100644 index 0000000000000..29efcf2d7a809 --- /dev/null +++ b/pkgs/applications/networking/browsers/elinks/debian-patches.txt @@ -0,0 +1,8 @@ +elinks/0.13.2-1 +03_459467_ui.leds.enable_0.diff +04_436817_nostrip.diff +07_617713_cache_control.diff +10-reproducible-build.diff +14_debug_disable_Werror.diff +16_POST_BUFFER_SIZE.diff +11-reproducible-build.diff diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 79cb5437b3cb6..ccdd591cdb17b 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, openssl +{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, brotli, openssl, autoconf, automake, gettext, pkgconfig, libev , gpm , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -11,18 +11,15 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; stdenv.mkDerivation rec { - pname = "elinks"; - version = "0.12pre6"; + pname = "elinks-0.13.2"; + version = "0.13.2"; src = fetchurl { - url = "http://elinks.or.cz/download/${pname}-${version}.tar.bz2"; - sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; + url = "https://deb.debian.org/debian/pool/main/e/elinks/elinks_${version}.orig.tar.gz"; + sha256 = "0xkpqnqy0x8sizx4snca0pw3q98gkhnw5a05yf144j1x1y2nb14c"; }; - patches = [ - ./gc-init.patch - ./openssl-1.1.patch - ]; + patches = map fetchurl (import ./debian-patches.nix); postPatch = (stdenv.lib.optional stdenv.isDarwin) '' patch -p0 < ${fetchpatch { @@ -31,12 +28,15 @@ stdenv.mkDerivation rec { }} ''; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey ] + buildInputs = [ ncurses xlibsWrapper bzip2 zlib brotli openssl libev ] ++ stdenv.lib.optional stdenv.isLinux gpm ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl + ++ stdenv.lib.optional enableSpidermonkey spidermonkey ; + + nativeBuildInputs = [ autoconf automake gettext pkgconfig ]; configureFlags = [ "--enable-finger" @@ -45,18 +45,24 @@ stdenv.mkDerivation rec { "--enable-cgi" "--enable-bittorrent" "--enable-nntp" - "--with-openssl=${openssl.dev}" - "--with-bzip2=${bzip2.dev}" + "--enable-256-colors" + "--with-libev" ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; + + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; meta = with stdenv.lib; { - description = "Full-featured text-mode web browser"; - homepage = "http://elinks.or.cz"; + description = "Full-featured text-mode web browser (package based on the fork felinks)"; + homepage = "https://github.com/rkd77/felinks"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ iblech ]; }; } diff --git a/pkgs/applications/networking/browsers/elinks/gc-init.patch b/pkgs/applications/networking/browsers/elinks/gc-init.patch deleted file mode 100644 index de06f563d6e6a..0000000000000 --- a/pkgs/applications/networking/browsers/elinks/gc-init.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix libgc initialization in the presence of Guile 2.0. - ---- elinks-0.12pre5/src/main/main.c 2009-07-07 14:23:17.000000000 +0200 -+++ elinks-0.12pre5/src/main/main.c 2011-04-28 23:20:15.000000000 +0200 -@@ -339,6 +339,11 @@ int - main(int argc, char *argv[]) - { - #ifdef CONFIG_GC -+ /* Guile 2.x uses libgc too and it initializes it this way, so we -+ * must make sure to initialize it the same way, or it will just -+ * segfault. */ -+ GC_all_interior_pointers = 0; -+ - GC_INIT(); - GC_set_warn_proc(gc_warning); - #endif - diff --git a/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch b/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch deleted file mode 100644 index 22792b6c0790a..0000000000000 --- a/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c -index 45b4b4a8..0385a431 100644 ---- a/src/network/ssl/socket.c -+++ b/src/network/ssl/socket.c -@@ -67,7 +67,9 @@ static void - ssl_set_no_tls(struct socket *socket) - { - #ifdef CONFIG_OPENSSL -- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1; -+#ifdef SSL_OP_NO_TLSv1 -+ SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1); -+#endif - #elif defined(CONFIG_GNUTLS) - { - /* GnuTLS does not support SSLv2 because it is "insecure". -@@ -145,9 +147,11 @@ ssl_connect(struct socket *socket) - } - - if (client_cert) { -- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx; -+ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl); - -- SSL_CTX_use_certificate_chain_file(ctx, client_cert); -+ SSL_CTX_use_certificate_chain_file( -+ (SSL *) socket->ssl, -+ client_cert); - SSL_CTX_use_PrivateKey_file(ctx, client_cert, - SSL_FILETYPE_PEM); - } -diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c -index c008121d..c06a80a7 100644 ---- a/src/network/ssl/ssl.c -+++ b/src/network/ssl/ssl.c -@@ -50,11 +50,16 @@ init_openssl(struct module *module) - * cannot initialize the PRNG and so every attempt to use SSL fails. - * It's actually an OpenSSL FAQ, and according to them, it's up to the - * application coders to seed the RNG. -- William Yodlowsky */ -- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { -+ RAND_file_name(f_randfile, sizeof(f_randfile)); -+#ifdef HAVE_RAND_EGD -+ if (RAND_egd(f_randfile) < 0) { - /* Not an EGD, so read and write to it */ -+#endif - if (RAND_load_file(f_randfile, -1)) - RAND_write_file(f_randfile); -+#ifdef HAVE_RAND_EGD - } -+#endif - - SSLeay_add_ssl_algorithms(); - context = SSL_CTX_new(SSLv23_client_method()); From 915e809bd50ed04132e42029bcb9b6f32bfd2cfd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 31 Jul 2020 20:44:59 +0200 Subject: [PATCH 107/234] nixos/systemd-networkd-vrf: implement working TCP test on a 5.x kernel By design, VRFs allow route-leaking for forwarded packages, but not for local processes using a socket. While it was possible to leak such TCP traffic through a VRF on a 4.x kernel, this behavior was considered wrong and got fixed in Linux 5.x[1]. From now on, local unix sockets must run in the VRF itself using `ip vrf exec`[2] which basically injects a BPF program into the VRF and drops elevated networking capabilities by default for the specified command. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c82a21f4320c8d54cf6456b27c8d49e5ffb722e [2] https://man7.org/linux/man-pages/man8/ip-vrf.8.html --- nixos/tests/systemd-networkd-vrf.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index af7813a2e604a..123e1f26b511d 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -194,18 +194,16 @@ in { client.succeed("ping -c5 192.168.1.2") client.succeed("ping -c5 192.168.2.3") - # Test whether SSH through a VRF IP is possible. - # (Note: this seems to be an issue on Linux 5.x, so I decided to add this to - # ensure that we catch this when updating the default kernel). - # with subtest("tcp traffic through vrf works"): - # node1.wait_for_open_port(22) - # client.succeed( - # "cat ${snakeOilPrivateKey} > privkey.snakeoil" - # ) - # client.succeed("chmod 600 privkey.snakeoil") - # client.succeed( - # "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true" - # ) + # Test whether TCP through a VRF IP is possible. + with subtest("tcp traffic through vrf works"): + node1.wait_for_open_port(22) + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ulimit -l 2048; ip vrf exec vrf1 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true" + ) # Only configured routes through the VRF from the main routing table should # work. Additional IPs are only reachable when binding to the vrf interface. From 4452b010a4d14c9bb9dc39acde097914df30d8c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 05:45:17 +0000 Subject: [PATCH 108/234] openxr-loader: 1.0.9 -> 1.0.10 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 47f9afe186191..6c5f2af3a52fc 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0xm5bwbsv2qlx1mg9zr98q7rm5hginrff4z0ahv7jrqrzv24acp7"; + sha256 = "1igxyji2ab3gki1hlndvws1b2868mk1n3c4c3y5z0h3g713zw9ap"; }; nativeBuildInputs = [ cmake python3 ]; From 694b194363b5b30a064ff8580dff6ee82dda164a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 1 Aug 2020 23:05:01 +0200 Subject: [PATCH 109/234] wayland-utils: init at 1.0.0 (#94471) Announcement: https://lists.freedesktop.org/archives/wayland-devel/2020-July/041565.html --- pkgs/tools/wayland/wayland-utils/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/wayland/wayland-utils/default.nix diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix new file mode 100644 index 0000000000000..23629309e52e3 --- /dev/null +++ b/pkgs/tools/wayland/wayland-utils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl +, meson, pkg-config, ninja +, wayland, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "wayland-utils"; + version = "1.0.0"; + + src = fetchurl { + url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; + }; + + nativeBuildInputs = [ meson pkg-config ninja wayland ]; + buildInputs = [ wayland wayland-protocols ]; + + meta = with stdenv.lib; { + description = "Wayland utilities (wayland-info)"; + longDescription = '' + A collection of Wayland related utilities: + - wayland-info: A utility for displaying information about the Wayland + protocols supported by a Wayland compositor. + ''; + homepage = "https://gitlab.freedesktop.org/wayland/wayland-utils"; + license = licenses.mit; # Expat version + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c5a2b0886df5..6cb552e7c78ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,6 +3236,8 @@ in wallutils = callPackage ../tools/graphics/wallutils { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + wev = callPackage ../tools/misc/wev { }; wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; From 4f55ce1778fa5b055ea43f019f206c222f8a1d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 10:49:12 -0300 Subject: [PATCH 110/234] enlightenment.efl: do not default to openjpeg 1 It seems there is no reason to choose openjpeg-1. Just use the default openjpeg, which currerntly is openjpeg-2.3.1. --- pkgs/desktops/enlightenment/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2739b9a2517fe..dcaf6260f0c42 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,9 +1,7 @@ { callPackage, pkgs }: { #### CORE EFL - efl = callPackage ./efl.nix { - openjpeg = pkgs.openjpeg_1; - }; + efl = callPackage ./efl.nix { }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; From dc489d53cd3797f29fff126920b7194f707ca144 Mon Sep 17 00:00:00 2001 From: rtreffer Date: Fri, 31 Jul 2020 21:01:56 +0200 Subject: [PATCH 111/234] Backport zfs 5.8 compaitibility patch to zfs 0.8.4 Adding this patch makes zfs compile against 5.8-rc7 kernels. Upstream PR: https://github.com/openzfs/zfs/pull/10422 Modifications: - spl_kvmalloc does not exists in zfs 0.8.4 - related code was dropped. --- .../BACKPORT-Linux-5.8-compat-__vmalloc.patch | 154 ++++++++++++++++++ pkgs/os-specific/linux/zfs/default.nix | 2 +- 2 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch diff --git a/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch b/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch new file mode 100644 index 0000000000000..780ce83d84f35 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/BACKPORT-Linux-5.8-compat-__vmalloc.patch @@ -0,0 +1,154 @@ +From 6cc95288ccea12ad7b67b2b5b3997dfad8e5b5c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= + +Date: Tue, 9 Jun 2020 01:32:02 +0200 +Subject: [PATCH] BACKPORT: Linux 5.8 compat: __vmalloc() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `pgprot` argument has been removed from `__vmalloc` in Linux 5.8, +being `PAGE_KERNEL` always now [1]. + +Detect this during configure and define a wrapper for older kernels. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/vmalloc.c?h=next-20200605&id=88dca4ca5a93d2c09e5bbc6a62fbfc3af83c4fca + +Reviewed-by: Brian Behlendorf +Co-authored-by: Sebastian Gottschall +Co-authored-by: Michael Niewöhner +Signed-off-by: Sebastian Gottschall +Signed-off-by: Michael Niewöhner +Closes #10422 +--- + config/kernel-kmem.m4 | 26 ++++++++++++++++++++++++++ + config/kernel.m4 | 2 ++ + include/spl/sys/kmem.h | 9 +++++++++ + module/spl/spl-kmem-cache.c | 4 ++-- + module/spl/spl-kmem.c | 9 ++++----- + 5 files changed, 43 insertions(+), 7 deletions(-) + +diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4 +index cc055e530..f1c0d2412 100644 +--- a/config/kernel-kmem.m4 ++++ b/config/kernel-kmem.m4 +@@ -56,3 +56,29 @@ AC_DEFUN([SPL_AC_DEBUG_KMEM_TRACKING], [ + AC_MSG_CHECKING([whether detailed kmem tracking is enabled]) + AC_MSG_RESULT([$enable_debug_kmem_tracking]) + ]) ++ ++dnl # ++dnl # 5.8 API, ++dnl # __vmalloc PAGE_KERNEL removal ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL], [ ++ ZFS_LINUX_TEST_SRC([__vmalloc], [ ++ #include ++ #include ++ ],[ ++ void *p __attribute__ ((unused)); ++ ++ p = __vmalloc(0, GFP_KERNEL, PAGE_KERNEL); ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL], [ ++ AC_MSG_CHECKING([whether __vmalloc(ptr, flags, pageflags) is available]) ++ ZFS_LINUX_TEST_RESULT([__vmalloc], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_VMALLOC_PAGE_KERNEL, 1, [__vmalloc page flags exists]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++]) ++- +diff --git a/config/kernel.m4 b/config/kernel.m4 +index b67fcef8c..23edfdcd8 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -45,6 +45,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ + ZFS_AC_KERNEL_SRC_SCHED + ZFS_AC_KERNEL_SRC_USLEEP_RANGE + ZFS_AC_KERNEL_SRC_KMEM_CACHE ++ ZFS_AC_KERNEL_SRC_VMALLOC_PAGE_KERNEL + ZFS_AC_KERNEL_SRC_WAIT + ZFS_AC_KERNEL_SRC_INODE_TIMES + ZFS_AC_KERNEL_SRC_INODE_LOCK +@@ -163,6 +164,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ + ZFS_AC_KERNEL_SCHED + ZFS_AC_KERNEL_USLEEP_RANGE + ZFS_AC_KERNEL_KMEM_CACHE ++ ZFS_AC_KERNEL_VMALLOC_PAGE_KERNEL + ZFS_AC_KERNEL_WAIT + ZFS_AC_KERNEL_INODE_TIMES + ZFS_AC_KERNEL_INODE_LOCK +diff --git a/include/spl/sys/kmem.h b/include/spl/sys/kmem.h +index 72d3a7765..ca15bfe7f 100644 +--- a/include/spl/sys/kmem.h ++++ b/include/spl/sys/kmem.h +@@ -169,6 +169,15 @@ extern void *spl_kmem_alloc(size_t sz, int fl, const char *func, int line); + extern void *spl_kmem_zalloc(size_t sz, int fl, const char *func, int line); + extern void spl_kmem_free(const void *ptr, size_t sz); + ++/* ++ * 5.8 API change, pgprot_t argument removed. ++ */ ++#ifdef HAVE_VMALLOC_PAGE_KERNEL ++#define spl_vmalloc(size, flags) __vmalloc(size, flags, PAGE_KERNEL) ++#else ++#define spl_vmalloc(size, flags) __vmalloc(size, flags) ++#endif ++ + /* + * The following functions are only available for internal use. + */ +diff --git a/module/spl/spl-kmem-cache.c b/module/spl/spl-kmem-cache.c +index d71b4b348..4866b2993 100644 +--- a/module/spl/spl-kmem-cache.c ++++ b/module/spl/spl-kmem-cache.c +@@ -203,7 +203,7 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags) + ASSERT(ISP2(size)); + ptr = (void *)__get_free_pages(lflags, get_order(size)); + } else { +- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, PAGE_KERNEL); ++ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM); + } + + /* Resulting allocated memory will be page aligned */ +@@ -1242,7 +1242,7 @@ spl_cache_grow(spl_kmem_cache_t *skc, int flags, void **obj) + * allocation. + * + * However, this can't be applied to KVM_VMEM due to a bug that +- * __vmalloc() doesn't honor gfp flags in page table allocation. ++ * spl_vmalloc() doesn't honor gfp flags in page table allocation. + */ + if (!(skc->skc_flags & KMC_VMEM)) { + rc = __spl_cache_grow(skc, flags | KM_NOSLEEP); +diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c +index cee69ad43..ca1fc145f 100644 +--- a/module/spl/spl-kmem.c ++++ b/module/spl/spl-kmem.c +@@ -172,16 +172,15 @@ spl_kmem_alloc_impl(size_t size, int flags, int node) + * kmem_zalloc() callers. + * + * For vmem_alloc() and vmem_zalloc() callers it is permissible +- * to use __vmalloc(). However, in general use of __vmalloc() +- * is strongly discouraged because a global lock must be +- * acquired. Contention on this lock can significantly ++ * to use spl_vmalloc(). However, in general use of ++ * spl_vmalloc() is strongly discouraged because a global lock ++ * must be acquired. Contention on this lock can significantly + * impact performance so frequently manipulating the virtual + * address space is strongly discouraged. + */ + if ((size > spl_kmem_alloc_max) || use_vmem) { + if (flags & KM_VMEM) { +- ptr = __vmalloc(size, lflags | __GFP_HIGHMEM, +- PAGE_KERNEL); ++ ptr = spl_vmalloc(size, lflags | __GFP_HIGHMEM); + } else { + return (NULL); + } +-- +2.25.1 + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 581316dc74db5..56b36d4f36855 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,7 +42,7 @@ let inherit rev sha256; }; - patches = [ ] ++ extraPatches; + patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts From f76334362442ecf129cbaf237b258f84116a51eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 08:02:05 +0000 Subject: [PATCH 112/234] gloox: 1.0.23 -> 1.0.24 --- pkgs/development/libraries/gloox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 7e5d7e9fa9a35..ef731b3c35a60 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -11,7 +11,7 @@ assert idnSupport -> libidn != null; with stdenv.lib; let - version = "1.0.23"; + version = "1.0.24"; in stdenv.mkDerivation { pname = "gloox"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "12jz8glg9zmyk0iyv1ywf5i0hq93dfq8lvn6lyjgy8730w66mjwp"; + sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f"; }; buildInputs = [ ] From 3f95b83125201e3751e53c30d70b0ad242b460a4 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 25 Apr 2020 22:04:15 +0200 Subject: [PATCH 113/234] nixos/tinc: allow configuration of RSA key file This is necessary for VPNs where some of the nodes run pre-1.1 versions. Most of Linux distros [0] and even the nixpkgs.tinc attribute run on that version, so it might be useful to have that option. [0] https://repology.org/project/tinc/versions --- nixos/modules/services/networking/tinc.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index e98aafc209372..725bd9bf9403b 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -48,6 +48,14 @@ in ''; }; + rsaPrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path of the private RSA keyfile. + ''; + }; + debugLevel = mkOption { default = 0; type = types.addCheck types.int (l: l >= 0 && l <= 5); @@ -139,6 +147,7 @@ in Name = ${if data.name == null then "$HOST" else data.name} DeviceType = ${data.interfaceType} ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"} + ${optionalString (data.rsaPrivateKeyFile != null) "PrivateKeyFile = ${data.rsaPrivateKeyFile}"} ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"} ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"} Interface = tinc.${network} @@ -170,12 +179,15 @@ in # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then # Tinc 1.1+ uses the tinc helper application for key generation - ${if data.ed25519PrivateKeyFile != null then " # Keyfile managed by nix" else '' + ${if data.ed25519PrivateKeyFile != null then " # ed25519 Keyfile managed by nix" else '' # Prefer ED25519 keys (only in 1.1+) [ -f "/etc/tinc/${network}/ed25519_key.priv" ] || tinc -n ${network} generate-ed25519-keys ''} - # Otherwise use RSA keys + ${if data.rsaPrivateKeyFile != null then " # RSA Keyfile managed by nix" else '' [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tinc -n ${network} generate-rsa-keys 4096 + ''} + # In case there isn't anything to do + true else # Tinc 1.0 uses the tincd application [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096 From c0c7bf397175a00cf3f82a5fb7fc6ccdc79690ff Mon Sep 17 00:00:00 2001 From: Karsten Heymann Date: Sat, 1 Aug 2020 08:34:21 +0200 Subject: [PATCH 114/234] Fix typo in linkerd package name --- pkgs/applications/networking/cluster/linkerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index ac3143ae66886..c8cc0246cd18b 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoModule }: buildGoModule { - pname = "linkerd-unstablle"; + pname = "linkerd-unstable"; version = "2020-05-01"; src = fetchFromGitHub { From 6da0a52e0497cc30227afce2001282c90335b420 Mon Sep 17 00:00:00 2001 From: Matthew Mazzanti Date: Sat, 1 Aug 2020 13:56:47 -0400 Subject: [PATCH 115/234] doc: Fix missing callout in go.xml Pull #89453 introduced a bug in the documentation that is preventing the hydra build for nixpkgs-unstable from finishing. I have added the additional option indroduced in that patch (runVend for go modules) and added the callout tag so that the documenation can build again. --- doc/languages-frameworks/go.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 06901449fa298..eee4706e5519c 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -40,6 +40,8 @@ pet = buildGoModule rec { subPackages = [ "." ]; + runVend = true; + meta = with lib; { description = "Simple command-line snippet manager, written in Go"; homepage = "https://github.com/knqyf263/pet"; @@ -66,7 +68,7 @@ pet = buildGoModule rec { - runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. + runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. From 228d9ce88fd7396185ff1a3ec5c1c9580d0d4515 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 02:16:05 +0000 Subject: [PATCH 116/234] elementary-planner: 2.4.5 -> 2.4.6 --- pkgs/applications/office/elementary-planner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index ff284da3ce856..c1d459a2df584 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.4.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "0jj901b2v4vfgv0i7d02xhhylfh6rcanaybk52i7ci92ff2gzgcb"; + sha256 = "0z0997yq809wbsk3w21xv4fcrgqcb958qdlksf4rhzhfnwbiii6y"; }; nativeBuildInputs = [ From e7562f24ef1fae70232b3247bd8f6162b441c800 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 22 Jul 2020 00:13:14 -0400 Subject: [PATCH 117/234] atom: Fix #92487 We rewrote the expression to use phases from genericBuilder. https://github.com/NixOS/nixpkgs/issues/92487#issuecomment-654552010 --- pkgs/applications/editors/atom/default.nix | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index dec3c79550114..5f26fa23bc2ed 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -35,23 +35,30 @@ let gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]; + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + ar p $src data.tar.xz | tar xJ ./usr/ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv usr/bin usr/share $out + rm -rf $out/share/lintian + + runHook postInstall + ''; + preFixup = '' gappsWrapperArgs+=( - --prefix "PATH" : "${gvfs}/bin" \ + --prefix "PATH" : "${gvfs}/bin" ) ''; - buildCommand = '' - mkdir -p $out/usr/ - ar p $src data.tar.xz | tar -C $out -xJ ./usr - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop - mv $out/usr/* $out/ - rm -r $out/share/lintian - rm -r $out/usr/ - sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - - fixupPhase - + postFixup = '' share=$out/share/${pname} patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -70,6 +77,8 @@ let ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; + + sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop ''; meta = with stdenv.lib; { From 08b567445e518d234775afbfef2e0e4e1c37874c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 Aug 2020 17:41:01 -0300 Subject: [PATCH 118/234] xfce.xfce4-whiskermenu-plugin: 2.4.4 -> 2.4.6 --- .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 859a580bb70ba..ac9f22a9a0cc3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.4"; + version = "2.4.6"; rev-prefix = "v"; - sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw"; + sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; nativeBuildInputs = [ cmake ]; From acbf7a37453335de8a9502e2c947848bb1269e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 Aug 2020 17:17:30 -0300 Subject: [PATCH 119/234] xfce.xfce4-timer-plugin: 1.7.0 -> 1.7.1 --- pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 00b497c918d8f..e9cfbd50f9120 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-timer-plugin"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; + sha256 = "1qr4m3n2l3rvsizsr3h7fyfajszfalqm7rhvjx2yjj8r3f8x4ljb"; }; nativeBuildInputs = [ From 573374cb965fabf3ef9a4a8800f5e90dcc58f657 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 00:26:47 +0200 Subject: [PATCH 120/234] pythonPackages.vcver: init at 0.2.10 --- .../python-modules/vcver/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/vcver/default.nix diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix new file mode 100644 index 0000000000000..74b44cddc464b --- /dev/null +++ b/pkgs/development/python-modules/vcver/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, packaging +, fetchurl, python }: + +buildPythonPackage rec { + pname = "vcver"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "toumorokoshi"; + repo = "vcver-python"; + rev = "c5d8a6f1f0e49bb25f5dbb07312e42cb4da096d6"; + sha256 = "1cvgs70jf7ki78338zaglaw2dkvyndmx15ybd6k4zqwwsfgk490b"; + }; + + propagatedBuildInputs = [ + packaging + ]; + + # circular dependency on test tool uranium https://pypi.org/project/uranium/ + doCheck = false; + + pythonImportTests = [ "vcver" ]; + + meta = with lib; { + description = "Reference Implementation of vcver"; + homepage = "https://github.com/toumorokoshi/vcver-python"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f06af874b919..4ec115c852ba9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4004,6 +4004,8 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; + vcver = callPackage ../development/python-modules/vcver { }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; falcon = callPackage ../development/python-modules/falcon { }; From 7cb0038a608be610b89820b6e85dc888b2240ee3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 00:28:10 +0200 Subject: [PATCH 121/234] python3Packages.deepmerge: init at 0.1.0 --- .../python-modules/deepmerge/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/deepmerge/default.nix diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix new file mode 100644 index 0000000000000..1cdf0449c68c2 --- /dev/null +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, vcver }: + +buildPythonPackage rec { + pname = "deepmerge"; + version = "0.1.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0d1ab9lxwymqxxd58j50id1wib48xym3ss5xw172i2jfwwwzfdrx"; + }; + + propagatedBuildInputs = [ + vcver + ]; + + # depends on https://pypi.org/project/uranium/ + doCheck = false; + + pythonImportsCheck = [ "deepmerge" ]; + + meta = with lib; { + description = "A toolset to deeply merge python dictionaries."; + homepage = "http://deepmerge.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ec115c852ba9..e2daa4e36eaba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -549,6 +549,8 @@ in { deepdiff = callPackage ../development/python-modules/deepdiff { }; + deepmerge = callPackage ../development/python-modules/deepmerge { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; bravado-core = callPackage ../development/python-modules/bravado-core { }; From b5911b3155df1cfdd94f2944eefdca6df5b221d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 00:29:54 +0200 Subject: [PATCH 122/234] python3Packages.pyipp: init at 0.10.1 Also regenerate home-assistant component packages. --- .../python-modules/pyipp/default.nix | 40 +++++++++++++++++++ .../home-assistant/component-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pyipp/default.nix diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix new file mode 100644 index 0000000000000..cf6b67c548b61 --- /dev/null +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, aiohttp, deepmerge, yarl +, aresponses, pytest, pytest-asyncio, pytestcov }: + +buildPythonPackage rec { + pname = "pyipp"; + version = "0.10.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "ctalkington"; + repo = "python-ipp"; + rev = version; + sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + }; + + propagatedBuildInputs = [ + aiohttp + deepmerge + yarl + ]; + + checkInputs = [ + aresponses + pytest + pytest-asyncio + pytestcov + ]; + + checkPhase = '' + pytest -q . + ''; + + meta = with lib; { + description = "Asynchronous Python client for Internet Printing Protocol (IPP)"; + homepage = "https://github.com/ctalkington/python-ipp"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b1f5ddcbb8150..1c7bdd9a2775a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -386,7 +386,7 @@ "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ ]; # missing inputs: pyipp + "ipp" = ps: with ps; [ pyipp]; "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2daa4e36eaba..48a9aece0c704 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5543,6 +5543,8 @@ in { pyinotify = callPackage ../development/python-modules/pyinotify { }; + pyipp = callPackage ../development/python-modules/pyipp { }; + pyjwt = callPackage ../development/python-modules/pyjwt { }; pykickstart = callPackage ../development/python-modules/pykickstart { }; From 359e4a8e089c2913ba62d7973fe870c3accbe66f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 18:46:30 -0700 Subject: [PATCH 123/234] bazel-kazel: 0.0.7 -> 0.0.10 (#94470) --- pkgs/development/tools/bazel-kazel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 9f1ab778ac8d3..a91c642029b09 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.0.7"; + version = "0.0.10"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0g4lgz5xgmxabaa8pygmdnrnslfrcb84vgr6bninl9v5zz4wajbm"; + sha256 = "1l3dz77h58v1sr7k8cabq5bbdif5w96zdcapax69cv1frr9jbrcb"; }; - vendorSha256 = "1lizvg9r7cck1cgk20np2syv4ljbc0zj1kydiiajf7y5x7d3lwha"; + vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; subPackages = [ "cmd/kazel" ]; From a0d66874aef67bc62064ecfe4cb100fc3ed686a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 1 Aug 2020 18:15:33 +0200 Subject: [PATCH 124/234] postfix: 3.5.4 -> 3.5.6 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index c895147875d21..ac5b9475028e2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.4"; + version = "3.5.6"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "10b8g6xv90shhfx17cjw7p40gphwi02az1y2dd8a4sjm4z6b2bzw"; + sha256 = "0shyxk83adv4pbfilmskyrgjpb57vyhmvqbmfqawxbc22mksmh4f"; }; nativeBuildInputs = [ makeWrapper m4 ]; From 885a9d14ce12dfbabf618e6a2af81f52da09bc83 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Aug 2020 23:50:48 +0200 Subject: [PATCH 125/234] python3Packages.python-didl-lite: init at 1.2.4 --- .../python-didl-lite/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/python-didl-lite/default.nix diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix new file mode 100644 index 0000000000000..e160c1aa623f7 --- /dev/null +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, defusedxml +, pytest }: + +buildPythonPackage rec { + pname = "python-didl-lite"; + version = "1.2.4"; + disabled = pythonOlder "3.5.3"; + + src = fetchFromGitHub { + owner = "StevenLooman"; + repo = pname; + rev = version; + sha256 = "0jf1d5m4r8qd3pn0hh1xqbkblkx9wzrrcmk7qa7q8lzfysp4z217"; + }; + + propagatedBuildInputs = [ + defusedxml + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + py.test + ''; + + meta = with lib; { + description = "DIDL-Lite (Digital Item Declaration Language) tools for Python"; + homepage = "https://github.com/StevenLooman/python-didl-lite"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48a9aece0c704..805f53941a71a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2562,6 +2562,8 @@ in { pysingleton = callPackage ../development/python-modules/pysingleton { }; + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + python-jose = callPackage ../development/python-modules/python-jose {}; python-json-logger = callPackage ../development/python-modules/python-json-logger { }; From 96eefac56ae0ceab5b4503f118c81c14731e47d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 03:24:27 +0200 Subject: [PATCH 126/234] python3Packages.async-upnp-client: init at 0.14.14 --- .../async-upnp-client/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/async-upnp-client/default.nix diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix new file mode 100644 index 0000000000000..b1ed1c45f85a4 --- /dev/null +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, voluptuous, aiohttp, async-timeout, python-didl-lite, defusedxml +, pytest, pytest-asyncio }: + +buildPythonPackage rec { + pname = "async-upnp-client"; + version = "0.14.14"; + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "StevenLooman"; + repo = "async_upnp_client"; + rev = version; + sha256 = "1ysj72l4z78h427ar95x7af0jw0xq1cbca0k8b34vqyyhgs8wc6y"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + defusedxml + python-didl-lite + voluptuous + ]; + + checkInputs = [ + pytest + pytest-asyncio + ]; + + meta = with lib; { + description = "Asyncio UPnP Client library for Python/asyncio."; + homepage = "https://github.com/StevenLooman/async_upnp_client"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 805f53941a71a..5a27f926515ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1916,6 +1916,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; From 0583005f5849d60ae2674f3cd1b583aa76156301 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 03:25:10 +0200 Subject: [PATCH 127/234] home-assistant: regenerate component packages --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c7bdd9a2775a..39450a988ba42 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -173,7 +173,7 @@ "dlib_face_detect" = ps: with ps; [ face_recognition]; "dlib_face_identify" = ps: with ps; [ face_recognition]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "dlna_dmr" = ps: with ps; [ async-upnp-client]; "dnsip" = ps: with ps; [ aiodns]; "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods @@ -855,7 +855,7 @@ "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ ]; # missing inputs: async-upnp-client + "upnp" = ps: with ps; [ async-upnp-client]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus From 4ced2335107e580710357be9a947dbcfd5a47280 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 03:29:10 +0200 Subject: [PATCH 128/234] python3Packages.openwebifpy: init at 3.1.1 --- .../python-modules/openwebifpy/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/openwebifpy/default.nix diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix new file mode 100644 index 0000000000000..5cf070d610fbc --- /dev/null +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, requests, zeroconf, wakeonlan +, python }: + +buildPythonPackage rec { + pname = "openwebifpy"; + version = "3.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zqa74i54ww9qjciiv8s58mxbs6vxq06cq5k4pxfarc0l75l4gh2"; + }; + + propagatedBuildInputs = [ + requests + zeroconf + wakeonlan + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with lib; { + description = "Provides a python interface to interact with a device running OpenWebIf"; + homepage = "https://openwebifpy.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a27f926515ff..7fb72bc87801b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2506,6 +2506,8 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client {}; + openwebifpy = callPackage ../development/python-modules/openwebifpy {}; + optuna = callPackage ../development/python-modules/optuna { }; idna = callPackage ../development/python-modules/idna { }; From eac9ed6d2c717dc6d55f2f7e33d0f56ead85d4dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Aug 2020 03:29:19 +0200 Subject: [PATCH 129/234] home-assistant: regenerate component packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 39450a988ba42..44087bae18876 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -212,7 +212,7 @@ "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ ]; # missing inputs: openwebifpy + "enigma2" = ps: with ps; [ openwebifpy]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient From 43077e5cf42c474781d9dd9ffe2745146a67c9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 Aug 2020 17:02:46 -0300 Subject: [PATCH 130/234] xfce.xfwm4: 4.14.2 -> 4.14.4 --- pkgs/desktops/xfce/core/xfwm4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 1d119014cab61..43d729b9e0956 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.2"; + version = "4.14.4"; - sha256 = "1zzc4q1j55hjljksmlyghk58bx7kxyq3scihsr9zgyqc24ww1ks3"; + sha256 = "0nk3qw1accvxrzy00qs06nnlpxjv6p1srkvjn2ad4xrw9ix9ywkb"; nativeBuildInputs = [ exo librsvg ]; From 6ad0747df6d569f9eb477507c98c39ff70fde4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 5 Jul 2020 05:16:25 +0200 Subject: [PATCH 131/234] boot.loader.grub: add theme option Co-authored-by: Eelco Dolstra Co-authored-by: Samuel Dionne-Riel --- .../modules/system/boot/loader/grub/grub.nix | 16 +++++++++++- .../system/boot/loader/grub/install-grub.pl | 25 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 49e73588ed6e6..20e39628eabbc 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -56,6 +56,7 @@ let bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; + theme = f cfg.theme; inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; @@ -426,6 +427,19 @@ in ''; }; + theme = mkOption { + type = types.nullOr types.path; + example = literalExample "pkgs.nixos-grub2-theme"; + default = null; + description = '' + Grub theme to be used. + + + This options has no effect for GRUB 1. + + ''; + }; + splashMode = mkOption { type = types.enum [ "normal" "stretch" ]; default = "stretch"; @@ -697,7 +711,7 @@ in in pkgs.writeScript "install-grub.sh" ('' #!${pkgs.runtimeShell} set -e - export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare JSON ]} + export PERL5LIB=${with pkgs.perlPackages; makePerlPath [ FileSlurp FileCopyRecursive XMLLibXML XMLSAX XMLSAXBase ListCompare JSON ]} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 5d7f58e7c73e9..59f5638044fe9 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -6,9 +6,11 @@ use File::Path; use File::stat; use File::Copy; +use File::Copy::Recursive qw(rcopy pathrm); use File::Slurp; use File::Temp; use JSON; +use File::Find; require List::Compare; use POSIX; use Cwd; @@ -82,6 +84,7 @@ sub runCommand { my $bootloaderId = get("bootloaderId"); my $forceInstall = get("forceInstall"); my $font = get("font"); +my $theme = get("theme"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -370,6 +373,28 @@ sub GrubFs { fi "; } + + rmtree("$bootPath/theme") or die "cannot clean up theme folder in $bootPath\n" if -e "$bootPath/theme"; + + if ($theme) { + # Copy theme + rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; + $conf .= " + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; + + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; From a983911985523afadb91c9c45df549262f8f4e45 Mon Sep 17 00:00:00 2001 From: "David Muto (pseudomuto)" Date: Wed, 22 Jul 2020 21:28:58 -0400 Subject: [PATCH 132/234] Update default branch for tslime.vim --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fe323e6f8f653..ee982026398cd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -172,7 +172,7 @@ jeetsukumaran/vim-indentwise jeffkreeftmeijer/neovim-sensible jeffkreeftmeijer/vim-numbertoggle jelera/vim-javascript-syntax -jgdavey/tslime.vim +jgdavey/tslime.vim@main jhradilek/vim-docbk jhradilek/vim-snippets as vim-docbk-snippets jiangmiao/auto-pairs From 224ff92fdbde76f89c5d1a4e454c4fdca1510fa4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 15:44:27 +0000 Subject: [PATCH 133/234] aws-okta: 1.0.2 -> 1.0.4 --- pkgs/tools/security/aws-okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 909c822374f4c..d5c1f7ec6fded 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "1.0.2"; + version = "1.0.4"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww"; + sha256 = "0a7xccnv0x0a6sydif0rvkdbw4jy9gjijajip1ac6m70l20dhl1v"; }; buildFlags = [ "--tags" "release" ]; From 29da7fe4cc29b2c29c5771587769931ab775517b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 16:18:15 +0000 Subject: [PATCH 134/234] bmake: 20200629 -> 20200710 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 45fb791f3a69a..219bd6e30e3b2 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200629"; + version = "20200710"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5"; + sha256 = "0v5paqdc0wnqlw4dy45mnydkmabsky33nvd7viwd2ygg351zqf35"; }; nativeBuildInputs = [ getopt ]; From 4d2302144052e9e05e53aec3d4692d57e710c882 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 12:15:26 +0000 Subject: [PATCH 135/234] traefik: 2.2.4 -> 2.2.8 --- pkgs/servers/traefik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 29804065c31b5..e585a4e97957e 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.4"; + version = "2.2.8"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1zxifwbrhxaj2pl6kwyk1ivr4in0wd0q01x9ynxzbf6w2yx4xkw2"; + sha256 = "1p2qv8vrjxn5wg41ywxbpaghb8585xmkwr8ih5df4dbdjw2m3k1f"; }; vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn"; From 63c3c8a517e3d669679dd649c4987d87a446e177 Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Sat, 1 Aug 2020 20:26:11 -0700 Subject: [PATCH 136/234] maintainers: add mcwitt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2c8ff1f49544..acce135aa2e33 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5193,6 +5193,12 @@ githubId = 13689192; name = "Nguyễn Gia Phong"; }; + mcwitt = { + email = "mcwitt@gmail.com"; + github = "mcwitt"; + githubId = 319411; + name = "Matt Wittmann"; + }; mdaiter = { email = "mdaiter8121@gmail.com"; github = "mdaiter"; From 6285240bfff9890306bf0b0b3783424c79e51cdd Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Sat, 1 Aug 2020 20:26:38 -0700 Subject: [PATCH 137/234] pythonPackages.vulture: init at 1.6 --- .../python-modules/vulture/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/vulture/default.nix diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix new file mode 100644 index 0000000000000..06f3265d42489 --- /dev/null +++ b/pkgs/development/python-modules/vulture/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "vulture"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sbwbwkpk3s7iwnwsdrvj1ydw9lgbn3xqhji7f8y5y6vvr77i53v"; + }; + + checkInputs = [ coverage pytest pytestcov ]; + checkPhase = "pytest"; + + meta = with stdenv.lib; { + description = "Finds unused code in Python programs"; + homepage = "https://github.com/jendrikseipp/vulture"; + license = licenses.mit; + maintainers = with maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7fb72bc87801b..fa0a2d6d8ff13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6714,6 +6714,8 @@ in { vultr = callPackage ../development/python-modules/vultr { }; + vulture = callPackage ../development/python-modules/vulture { }; + wadllib = callPackage ../development/python-modules/wadllib { }; waitress = callPackage ../development/python-modules/waitress { }; From fdb630bc3b8d0c7940344fd13a98ff3e4f628bc8 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 5 Jul 2020 01:21:57 +0300 Subject: [PATCH 138/234] lazpaint: init at 7.1.3 --- .../graphics/lazpaint/default.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/applications/graphics/lazpaint/default.nix diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix new file mode 100644 index 0000000000000..d8ea4924318e7 --- /dev/null +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib +, atk, gtk2, libX11, gdk-pixbuf, busybox, python3, makeWrapper }: + +with stdenv; + +let + bgrabitmap = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgrabitmap"; + rev = "v11.1"; + sha256 = "0bcmiiwly4a7w8p3m5iskzvk8rz87qhc0gcijrdvwg87cafd88gz"; + }; + bgracontrols = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "bgracontrols"; + rev = "v6.7.2"; + sha256 = "0cwxzv0rl6crkf6f67mvga5cn5pyhr6ksm8cqhpxjiqi937dnyxx"; + }; +in stdenv.mkDerivation rec { + pname = "lazpaint"; + version = "7.1.3"; + + src = fetchFromGitHub { + owner = "bgrabitmap"; + repo = "lazpaint"; + rev = "v${version}"; + sha256 = "1sfb5hmhzscz3nv4cmc192jimkg70l4z3q3yxkivhw1hwwsv9cbg"; + }; + + nativeBuildInputs = [ lazarus fpc makeWrapper ]; + + buildInputs = [ pango cairo glib atk gtk2 libX11 gdk-pixbuf ]; + + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + + buildPhase = '' + cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap + cp -r --no-preserve=mode ${bgracontrols} bgracontrols + + lazbuild --lazarusdir=${lazarus}/share/lazarus \ + --build-mode=Release \ + bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ + bgracontrols/bgracontrols.lpk \ + lazpaintcontrols/lazpaintcontrols.lpk \ + lazpaint/lazpaint.lpi + ''; + + installPhase = '' + # Reuse existing install script + cd lazpaint/release/debian + substituteInPlace makedeb.sh --replace "rm -rf" "ls" + patchShebangs ./makedeb.sh + PATH=$PATH:${busybox}/bin ./makedeb.sh + cp -r staging/usr $out + + # Python is needed for scripts + makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ + --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} + + substituteInPlace $out/share/applications/lazpaint.desktop \ + --replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \ + --replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint + ''; + + meta = with stdenv.lib; { + description = "Image editor like PaintBrush or Paint.Net"; + homepage = "https://sourceforge.net/projects/lazpaint/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cb552e7c78ac..d6b3f386eb847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20992,6 +20992,8 @@ in ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; + lazpaint = callPackage ../applications/graphics/lazpaint { }; + caps = callPackage ../applications/audio/caps { }; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; From 9a298553305bc2a71ad50b5d911ac180cbd8a763 Mon Sep 17 00:00:00 2001 From: Tom Saeger Date: Tue, 31 Mar 2020 22:15:17 -0500 Subject: [PATCH 139/234] skim-vim: init at 2019-07-31 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 16 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ec6f38d736ba2..fe91c65e0a318 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3322,6 +3322,17 @@ let meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; + skim-vim = buildVimPluginFrom2Nix { + pname = "skim-vim"; + version = "2019-07-31"; + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim.vim"; + rev = "4e9d9a3deb2060e2e79fede1c213f13ac7866eb5"; + sha256 = "0vpfn2zivk8cf2l841jbd78zl1vzdw1wjf9p0dm6pgr84kj9pkx4"; + }; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e2dfa7b4a0c9a..7f1935f574a4c 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -462,6 +462,10 @@ self: super: { dependencies = [ self.fzfWrapper ]; }); + skim-vim = super.skim-vim.overrideAttrs(old: { + dependencies = [ self.skim ]; + }); + sved = let # we put the script in its own derivation to benefit the magic of wrapGAppsHook svedbackend = stdenv.mkDerivation { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ee982026398cd..9a5b6282b2ee9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -247,6 +247,7 @@ lilydjwg/colorizer liuchengxu/vim-which-key liuchengxu/vista.vim LnL7/vim-nix +lotabout/skim.vim LucHermitte/lh-brackets LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags From d3e439ecbcd051954312172a7234679b3e4b32cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 02:02:28 +0000 Subject: [PATCH 140/234] gortr: 0.14.5 -> 0.14.6 --- pkgs/servers/gortr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 84ecc01eb42fc..3fd126d567062 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "08nbvw5pqd8wdd8vrsr4d50zfqwg175brh7m0pvv4165gnv8k5bf"; + sha256 = "1z1z4xl39qmd7df1zb2wsd2ycxr4aa9g23sfgp3ws4lhy5d6hyxw"; }; vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; From 62ddadd5ae68a7751b5982e2721734326c8be7d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 02:09:48 +0000 Subject: [PATCH 141/234] gotestsum: 0.5.1 -> 0.5.2 --- pkgs/development/tools/gotestsum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 45be855a66135..178a949a63a34 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "079cyk12r662z8njaawdqfjab1giy5xkjhln2rns03j5n67ixhgj"; + sha256 = "08bb865gl1ykqr7wm7a1jikjdlc2dqv1f3hllnwwr630c8y4k806"; }; vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; From 7c74033a6f7bbf4dfe0d2490f960bd759210d25f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 02:23:34 +0000 Subject: [PATCH 142/234] gromit-mpx: 1.3 -> 1.3.1 --- pkgs/tools/graphics/gromit-mpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index ebb50cfad2ee3..2bcaf3c29e16f 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "1dkmp5rhzp56sz9cfxill2pkdz2anwb8kkxkypvk2xhqi64cvkrs"; + sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy"; }; nativeBuildInputs = [ pkgconfig ]; From e4af824f3f0e2caa63873a766fa3ef10249c07b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Aug 2020 07:00:35 +0100 Subject: [PATCH 143/234] gromit-mpx: add wrapGAppsHook --- pkgs/tools/graphics/gromit-mpx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 2bcaf3c29e16f..c7f0beba8fb86 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ cmake gtk glib pcre libappindicator libpthreadstubs From 94a63b75baf82c299f27a25de995418ca1747762 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 02:54:08 +0000 Subject: [PATCH 144/234] helmfile: 0.119.1 -> 0.125.1 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index e4a6f63b01493..02390c081493a 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.119.1"; + version = "0.125.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "1j9b0xw59w5ailwa7dqgbsdigviw8ng5r4jbsk9b80izcig805zz"; + sha256 = "0ym9q1rww3r54czkrckdd1ahlym6n61l2563nmj48hkn5d4qxqbm"; }; - vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; + vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz"; nativeBuildInputs = [ makeWrapper ]; From cef090ccc86ae80f346857cf55af20e87e7d096d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:19:00 +0000 Subject: [PATCH 145/234] kmon: 1.3.0 -> 1.3.5 --- pkgs/tools/system/kmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 2a60283f122ad..e3d84cb213151 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.3.0"; + version = "1.3.5"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0487blp5l82jscpf9m76cq5prvclg5ngvdgi500jh7vrrxxawnh4"; + sha256 = "1jbp1pd1xlbj5jzz7v2zmrzik45z91ddpvaxazjwcbqmw6hn732q"; }; - cargoSha256 = "1dfvkn1sw22csg635kl4mmcxb6c5bvc5aw370iicy9hwlkk7cqpd"; + cargoSha256 = "17srf1krknabqprjilk76mmvjq284zf138gf15vybsbjd9dkpals"; nativeBuildInputs = [ python3 ]; From 22a5a97087d4cfca16e4d6cbc0a1b1d7889cf9aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 22:47:19 +0000 Subject: [PATCH 146/234] dua: 2.8.1 -> 2.10.2 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 91ab681b2a0aa..dd33d0b091545 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.8.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0z0aqasi42wv1np2a6b0qc14a64r2h8xh025411jdxfs6vjr15am"; + sha256 = "0qsk4pa7xywd6fdwd5v4qwj334hyp3xjlayjzgyhks7a87hdwjgs"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "1g9248kqwrc46abwx6fakzfxf745jfvkywi49z7mvd4p99ysh2ir"; + cargoSha256 = "02wd4cw9hd8d96szwx8yxz6bll60f7w1z0xiz7k1h8h12mriaz4w"; doCheck = false; From 723204e9cb18b30a9372f3bb915dd169bc27c39c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 2 Aug 2020 09:22:06 +1000 Subject: [PATCH 147/234] podman: 2.0.3 -> 2.0.4 https://github.com/containers/podman/releases/tag/v2.0.4 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index bae218d1cad74..3ee0193b0892e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1jqdv3kij2q97qn4niqxxgfva9ajr4wjgx40qk5yhs01d3g0qgmd"; + sha256 = "0rnli16nh5m3a8jjkkm1k4f896yk1k1rg48rjiajqhfrr98qwr0f"; }; vendorSha256 = null; From 7b01110a1d4b741ed40f930f33228b4cb84933fd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 2 Aug 2020 09:31:13 +1000 Subject: [PATCH 148/234] buildah: 1.15.0 -> 1.15.1 https://github.com/containers/buildah/releases/tag/v1.15.1 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3b1e0aaa00f64..3def4a05bd730 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0nhqw8s8m819mhb0kpji0if8ji9cmkcb821zab7h65azk0p8qh20"; + sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; }; outputs = [ "out" "man" ]; From dff40330b8ff81b135abd5384b1f069429f03d38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 06:20:58 +0000 Subject: [PATCH 149/234] mdbook: 0.4.0 -> 0.4.1 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 7d5020f63b35b..a36881f36b5a2 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "13m23cky8axi7i4s1bvdjcdfr4v8mbxfvz4fy3q8b8gkd6abm3sf"; + sha256 = "0rfcvcz3cawyzhdxqyasd9dwrb8c2j6annpl9jx2n6y3ysl345ry"; }; - cargoSha256 = "0q1kf810494njd5ai2v4qsaq9w3b7120yaymhgxjpcmig8s86zhr"; + cargoSha256 = "02vfdr1zlagjya5i9wf6ag9k01cf20jlm4yqvgrpjg9zrwv4xr4s"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From 0a9f5ddedb57770ba76ef6b1b8baa4587ff4ece8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 05:57:03 +0000 Subject: [PATCH 150/234] lite: 1.06 -> 1.11 --- pkgs/applications/editors/lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index d938edaa6e9ed..908ecf2bdd711 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.06"; + version = "1.11"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "1lw4a6xv8pdlgwnhh870caij4iyzxdyjw4qmm4fswja9mbqkj32f"; + sha256 = "0wxqfb4ly8g7w5qph76xys95b55ackkags8jgd1nasmiyi8gcd5a"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From f6633398b8bc74c51269636d3116137d55e8fdc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 03:14:18 +0000 Subject: [PATCH 151/234] dune_2: 2.6.1 -> 2.6.2 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 001c424603998..d785302ebb54b 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "184ri2w1n1yvhar1aq3fcxibdxx67728dz6gy5rf33j4hvr5kyay"; + sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg"; }; buildInputs = [ ocaml findlib ]; From bd325a4aeb597c7bcaef70e179f4b4e14ad4d7ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:26:43 +0000 Subject: [PATCH 152/234] kondo: 0.3 -> 0.4 --- pkgs/applications/misc/kondo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 9df4c59717cc0..6b23d1d0437f2 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kondo"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "tbillington"; repo = pname; rev = "v${version}"; - sha256 = "1rrg0xfm3vn5jh861r4ismrga673g7v6qnzl2v1haflgjhvdazwd"; + sha256 = "0kl2zn6ir3w75ny25ksgxl93vlyb13gzx2795zyimqqnsrdpbbrf"; }; - cargoSha256 = "1y7g8gw9hsm997d6i99c3dj2gb8y8cgws5001n85f9bpnlvvmf9y"; + cargoSha256 = "1ax81a2828z3yla1psg5xi8ild65m6zcsvx48ncz902mpzqlj92b"; meta = with stdenv.lib; { description = "Save disk space by cleaning unneeded files from software projects"; From 0a4c0d9b3d21a752e9950b68aa836937b84b3613 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 2 Aug 2020 17:29:39 +1000 Subject: [PATCH 153/234] fzf: 0.21.1 -> 0.22.0 https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0220 --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 2fe4bac88f0c3..f22ffc63f49c8 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; + sha256 = "0n0cy5q2r3dm1a3ivlzrv9c5d11awxlqim5b9x8zc85dlr73n35l"; }; vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; From ff81a0f8081666c192286ee4f8878428cd5a7875 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:49:42 +0000 Subject: [PATCH 154/234] lazygit: 0.20.6 -> 0.20.9 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 9d37dcfd5d23d..7425357536cae 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.6"; + version = "0.20.9"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0zim9ipwh2vkw2g41rw3p35i8fz208hyr71npfn4as8f1nl4gi4i"; + sha256 = "1jmg2z8yza8cy6xcyam4pvk0sp6zvw6b8vbn3b3h0pklfa7wz9pg"; }; meta = with stdenv.lib; { From 53873db7b8c06939d9993d3d31af3887f8dba630 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:55:59 +0000 Subject: [PATCH 155/234] lean: 3.16.5 -> 3.18.4 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 886ecdb76cebc..224795f2a6666 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.16.5"; + version = "3.18.4"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0s1ay6qgpkxhygfbfrl1cw2pd8bpgw2dw71rzhza20ndqwk8nqs5"; + sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; }; nativeBuildInputs = [ cmake ]; From add391f85d77ce4042afd315c4030dff0a22e4d0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 08:30:31 +1000 Subject: [PATCH 156/234] .github/CODEOWNERS: add github actions --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d68adc192e19c..a35e7f6a3f20a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,6 +10,9 @@ # This file /.github/CODEOWNERS @edolstra +# GitHub actions +/.github/workflows @Mic92 @zowoq + # Libraries /lib @edolstra @nbp @infinisil /lib/systems @nbp @ericson2314 @matthewbauer From 6bdd78688e2a8c9de2476def7e82500959c9b902 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 08:30:40 +1000 Subject: [PATCH 157/234] .github/workflows/editorconfig.yml: update --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 70959b42aa16e..c10a0898e1cc0 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -13,7 +13,7 @@ jobs: - uses: technote-space/get-diff-action@v2.0.2 - name: editorconfig check env: - VERSION: "2.0.4" + VERSION: "2.1.0" OS: "linux" ARCH: "amd64" run: | From 915fcd1eba267b091eaacbb1a6b4c279b4fad75c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 10:21:13 +1000 Subject: [PATCH 158/234] .github/workflows/editorconfig.yml: update to match wait-ofborg action --- .github/workflows/editorconfig.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index c10a0898e1cc0..24348f12887aa 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -1,4 +1,4 @@ -name: actions +name: "Checking EditorConfig" on: pull_request: @@ -6,12 +6,12 @@ on: - master jobs: - editorconfig: + tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: technote-space/get-diff-action@v2.0.2 - - name: editorconfig check + - name: Checking EditorConfig env: VERSION: "2.1.0" OS: "linux" From dd1c6f937dad4f129e75a39fb22f02cfca885a4b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:28:35 +1000 Subject: [PATCH 159/234] .github/CODEOWNERS: add editorconfig --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a35e7f6a3f20a..4be9ae506ea1d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,6 +13,9 @@ # GitHub actions /.github/workflows @Mic92 @zowoq +# EditorConfig +/.editorconfig @Mic92 @zowoq + # Libraries /lib @edolstra @nbp @infinisil /lib/systems @nbp @ericson2314 @matthewbauer From 170368845c163fcf721cdfe1b79df935787581a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:04:20 +0000 Subject: [PATCH 160/234] k6: 0.27.0 -> 0.27.1 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 959cfdd5d073b..bf4f83f902107 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "k6"; - version = "0.27.0"; + version = "0.27.1"; goPackagePath = "github.com/loadimpact/k6"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "loadimpact"; repo = pname; rev = "v${version}"; - sha256 = "15p81bv9z1nxixvwnfqynycwxvla3f1ldxnj9invna1sjx7lx3qq"; + sha256 = "0ni7x64al49adzy6kwzxyi56w556qy34888hxsldjrnndlchc0vz"; }; subPackages = [ "./" ]; From 6261aa89b3220e2c6654152dd6049eb211939a69 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 22:40:22 +0000 Subject: [PATCH 161/234] cava: 0.7.1 -> 0.7.2 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index f4028807ffc42..26cc8cd78da3e 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.1"; + version = "0.7.2"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "0p2g3xxl2n425bghs1qnff30jaj9cba94j2gbhgxmwaxhz26vbk7"; + sha256 = "1chc08spjf5i17n8y48aqzdxsj8vvf0r2l62ldw2pqgw60dacvs1"; }; nativeBuildInputs = [ autoreconfHook ]; From d3422c53b60f7d44ed07cb923683335b34e6a63e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 22:32:09 +0000 Subject: [PATCH 162/234] drawio: 13.5.1 -> 13.5.7 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 22a58e81c97bf..f678e50f4d374 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.5.1"; + version = "13.5.7"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "00ggm867c5005qfm35qf8a94d87ln91irb1ir6012am2k5bn8c8p"; + sha256 = "1b2sb44zsa6g5nnsa7drn4fn61jfz3a3g3bisai85fyjff746ipc"; }; nativeBuildInputs = [ From a11a33cc7e247dea1644e5f9f6b060874e65a0b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 05:51:54 +0000 Subject: [PATCH 163/234] liquibase: 3.10.1 -> 3.10.2 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 5049eb07b8717..104b1c46e09d2 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1q20iswakhnrmsmlcsjnhl3glj4p0314gridqyy4wh7s77bcakg5"; + sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; }; buildInputs = [ jre makeWrapper ]; From 545048dcbe1acf7092c851b86b72df811cb1c8bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 07:39:36 +0000 Subject: [PATCH 164/234] nfpm: 1.3.2 -> 1.5.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 7fc87534c1d16..ce8312a9158dd 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.3.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1z6z4ad5id6bcxzd8p76akxwvf5jzr54w81798ri9lysf4hdi6sh"; + sha256 = "075jrarvpvh4hll3zvrf65ar3a2ya63ma343hss11l1mr3gykb9d"; }; - vendorSha256 = "0v14j4vsp7f29xajym2dd2zlfv0sqhb04qfs76bcnn0ys6j1xkny"; + vendorSha256 = "11ab1w89zn3m81swzsnyiw1x10v58phid4y68rralkp6bhisz25b"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 8cabe885c5eabae2505001ee22ac7b87fc40f87e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:44:30 +0000 Subject: [PATCH 165/234] kube-router: 1.0.0 -> 1.0.1 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index c51e62b30b9bf..d967c741fca61 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "1.0.0"; + version = "1.0.1"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x"; + sha256 = "00bypaccv8q9xdcz6vlvl1qxqxqssl21bs4nkd1a6q8b4jpl339z"; }; buildFlagsArray = '' From 50787344ff48d4d0758c60a9f842044ddaad38e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 20:26:41 +0000 Subject: [PATCH 166/234] cargo-tarpaulin: 0.14.0 -> 0.14.2 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index fd1c2c964a223..398ed06b6fb7a 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1ilqynjvvczxdvsfszkmrz1casrbsbklw8nbgh5l1nx8kxsp5lx7"; + sha256 = "1skiaiz3xyi6cf62fkg7i7ahncm7vcg3aq4s4a5lrls30gr0n288"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0jcn1b4v9glh058sfd270b33g988n672q50f8kyhwl8xip7xzj06"; + cargoSha256 = "1klmdwpqk995pdyms40x7gk4l2mf4ncj7cgknl91kmyvpn4j1y4g"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From da149f3fb1bd15b59e767dfe8e2c252afbae7c81 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:11:27 +1000 Subject: [PATCH 167/234] .editorconfig: add deps.nix --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index a32d8056f16fe..954bec9cd04dd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -54,6 +54,9 @@ end_of_line = unset [*.lock] indent_size = unset +[deps.nix] +insert_final_newline = unset + [gemset.nix] insert_final_newline = unset From 685322613e5d6281936a024c82bae24ef4e877da Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 2 Aug 2020 12:46:44 +0200 Subject: [PATCH 168/234] cargo-tarpaulin: disable aarch64 and i686 build Those CPU architectures seem to be unsupported as several constructs[1][2] are only supported for `x86_64`. [1] https://github.com/xd009642/tarpaulin/blob/d7e0deef8c4fae5d6baeac5a0431ea4d0b5600f9/src/breakpoint.rs#L7-L8 [2] https://github.com/xd009642/tarpaulin/blob/d7e0deef8c4fae5d6baeac5a0431ea4d0b5600f9/src/process_handling/linux.rs#L37 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 398ed06b6fb7a..b8797c3dfe24d 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xd009642/tarpaulin"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ hugoreeves ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From 1f3a6cc79427f3be0efa5fd73e88118d11e919f9 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 2 Aug 2020 04:27:05 -0700 Subject: [PATCH 169/234] libplacebo: allow for latest glslang (#94510) --- pkgs/development/libraries/libplacebo/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index e57f279883957..dc3e5e30c7434 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -24,6 +25,18 @@ stdenv.mkDerivation rec { sha256 = "1yhf9xyxdawbihsx89dpjlac800wrmpwx63rphad2nj225y9q40f"; }; + patches = [ + # to work with latest glslang, remove on release >2.72.0 + (fetchpatch { + url = "https://code.videolan.org/videolan/libplacebo/-/commit/523056828ab86c2f17ea65f432424d48b6fdd389.patch"; + sha256 = "051vhd0l3yad1fzn5zayi08kqs9an9j8p7m63kgqyfv1ksnydpcs"; + }) + (fetchpatch { + url = "https://code.videolan.org/videolan/libplacebo/-/commit/82e3be1839379791b58e98eb049415b42888d5b0.patch"; + sha256 = "0nklj9gfiwkbbj6wfm1ck33hphaxrvzb84c4h2nfj88bapnlm90l"; + }) + ]; + nativeBuildInputs = [ meson ninja From a206341466f20542e189c4e37d5a62bc97d0959a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 12:16:57 +0000 Subject: [PATCH 170/234] i3: 4.18.1 -> 4.18.2 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3888e10f25856..b37a83648ae55 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.1"; + version = "4.18.2"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; + sha256 = "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj"; }; nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; From 47ef6afcd4bbcf98debccb0dbdbbb09afca7ea5a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Jul 2020 14:09:09 +0200 Subject: [PATCH 171/234] =?UTF-8?q?ocamlPackages.mdx:=201.6.0=20=E2=86=92?= =?UTF-8?q?=201.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mdx/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 1331c10d426b9..f384704a1c4ac 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,25 +1,24 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: +, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, odoc, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.6.0"; + version = "1.7.0"; + useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "18m4ay226dwbgnwp3ia6bfcm033dvp9yby0lbddqn8ak374m2k3b"; + sha256 = "0vpc30sngl3vpychrfvjwyi93mk311x3f2azlkxasgcj69fq03i7"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; + propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version odoc re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; - dontStrip = lib.versions.majorMinor ocaml.version == "4.04"; - outputs = [ "bin" "lib" "out" ]; installPhase = '' From 0e5f4ff69b2dc0c59e30beba6a84e4ba612d3f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 7 Apr 2020 05:23:00 +0200 Subject: [PATCH 172/234] timezonemap: init at 0.4.5 --- .../libraries/timezonemap/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/timezonemap/default.nix diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix new file mode 100644 index 0000000000000..131d66e45cce8 --- /dev/null +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, autoreconfHook +, fetchbzr +, pkgconfig +, gtk3 +, glib +, file +, gobject-introspection +, json-glib +, libsoup +}: + +stdenv.mkDerivation rec { + pname = "timezonemap"; + version = "0.4.5"; + + src = fetchbzr { + url = "lp:timezonemap"; + rev = "58"; + sha256 = "1qdp5f9zd8c02bf0mq4w15rlhz2g51phml5qg9asdyfd1715f8n0"; + }; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gobject-introspection + ]; + + buildInputs = [ + gtk3 + glib + json-glib + libsoup + ]; + + configureFlags = [ + "CFLAGS=-Wno-error" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + "localstatedir=\${TMPDIR}" + ]; + + preConfigure = '' + for f in {configure,m4/libtool.m4}; do + substituteInPlace $f\ + --replace /usr/bin/file ${file}/bin/file + done + ''; + + postPatch = '' + sed "s|/usr/share/libtimezonemap|$out/share/libtimezonemap|g" -i ./src/tz.h + ''; + + meta = with stdenv.lib; { + homepage = "https://launchpad.net/timezonemap"; + description = "A GTK+3 Timezone Map Widget"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6b3f386eb847..197dc70c43900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7152,6 +7152,8 @@ in timetable = callPackage ../applications/office/timetable { }; + timezonemap = callPackage ../development/libraries/timezonemap { }; + tzupdate = callPackage ../applications/misc/tzupdate { }; tinc = callPackage ../tools/networking/tinc { }; From 93d29b9ff5f24b160cf459dbe65cd5ab82f47d2e Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 2 Aug 2020 08:57:10 +0200 Subject: [PATCH 173/234] openjdk: 11.0.7 -> 11.0.8 Also added `minor` variable to reflect naming scheme introduced in java 9: https://bugs.openjdk.java.net/browse/JDK-8061493 --- pkgs/development/compilers/openjdk/11.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index b2f86343d0a99..5011fd39e2f01 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -10,16 +10,17 @@ let major = "11"; - update = ".0.7"; - build = "ga"; + minor = "0"; + update = "8"; + build = "10"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; - version = "${major}${update}-${build}"; + version = "${major}.${minor}.${update}+${build}"; src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p"; + sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz"; }; nativeBuildInputs = [ pkgconfig autoconf ]; From e0fe9a6063aeb6bb3ebcd066c1c700688f91aa6f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 15 Jul 2020 10:33:27 +0200 Subject: [PATCH 174/234] =?UTF-8?q?dune-release:=201.3.3=20=E2=86=92=201.4?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/dune-release/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index ba8fa4bba6fca..c267b2757a436 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchurl, makeWrapper , curly, fmt, bos, cmdliner, re, rresult, logs -, odoc, opam-format, opam-core, opam-state +, odoc, opam-format, opam-core, opam-state, yojson , opam, git, findlib, mercurial, bzip2, gnutar, coreutils , alcotest, mdx }: @@ -10,27 +10,33 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.3.3"; + version = "1.4.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "04qmgvjh1233ri878wi5kifdd1070w5pbfkd8yk3nnqnslz35zlb"; + sha256 = "1frinv1rsrm30q6jclicsswpshkdwwdgxx7sp6q9w4c2p211n1ln"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core - rresult logs odoc bos ]; - checkInputs = [ alcotest mdx ]; + rresult logs odoc bos yojson ]; + checkInputs = [ alcotest mdx ] ++ runtimeInputs; doCheck = true; useDune2 = true; - # remove check for curl in PATH, since curly is patched - # to have a fixed path to the binary in nix store postPatch = '' + # remove check for curl in PATH, since curly is patched + # to have a fixed path to the binary in nix store sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml + + # set bogus user info in git so git commit doesn't fail + sed -i '/git init/ a \ $ git config user.name test; git config user.email "pseudo@pseudo.invalid"' \ + tests/bin/{delegate_info,errors,tag,no_doc,x-commit-hash}/run.t + # ignore weird yes error message + sed -i 's/yes |/yes 2>\/dev\/null |/' tests/bin/no_doc/run.t ''; # tool specific env vars have been deprecated, use PATH From 737e9f415cd8c7fdf6ab1341a6bdfe4150316f0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Jul 2020 08:11:27 +0000 Subject: [PATCH 175/234] quilter: 2.2.4 -> 2.5.0 --- pkgs/applications/editors/quilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index c5062ab725a81..4d1cf5dafb762 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.2.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0xmnfqqdn7p84aksb8yzs14ikgy5driylr6m4p5ffsb6i9aa0i9h"; + sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps"; }; nativeBuildInputs = [ From 981f8db576230d6976c4da0789c3787e63e96b26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 13:17:57 +0000 Subject: [PATCH 176/234] sd: 0.7.5 -> 0.7.6 --- pkgs/tools/text/sd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a540918e56d23..a6af316e121c2 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; + sha256 = "0c5bsqs6c55x4j640vhzlmbiylhp5agr7lx0jrwcjazfyvxihc01"; }; - cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; + cargoSha256 = "1mksmdp1wnsjd8gw1g3l16a24fk05xa9mxygc0qklr41bqf8kw8b"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; From e8c662ef908c81ec65b2b2d22535b67cb32b6bb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 04:33:20 +0000 Subject: [PATCH 177/234] kpt: 0.31.0 -> 0.32.0 --- pkgs/applications/networking/cluster/kpt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index 46fc928b2054e..c92b98d813948 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "1l5mpml6pf37b76wdq6il00k5q6rvw9ds7807m103k27p7pcqgdx"; + sha256 = "1pgv15zgv30dpv148bn6x0anv9q6x78y6ldmzarb9fbjpk6j0wxl"; }; - vendorSha256 = "1yb6dwbnimqfamdg57vq68q853fq04qfnh3sfbjg82sd8pz8069g"; + vendorSha256 = "0l8xdnv2m6byd5dwvs3zgcj1lsci7ax4xvx178a8a78sgkqalvmq"; postInstall = '' rm $out/bin/{mdtogo,formula} From 7299b7867d0ab22d39a7bfc4979e6bf2dd3e9a98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 08:16:53 +0000 Subject: [PATCH 178/234] openbazaar-client: 2.4.6 -> 2.4.7 --- pkgs/applications/networking/openbazaar/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 07f374097f245..f011f9aef4ea9 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "1p190az8llqh3089aygwash10wqqqfnjl2wvksn6bvx5wm5dpg1p"; + sha256 = "04wwljaiqm8rsdrzngqrzrjzfrjsrfsaa60c904zhbhmsqc7y4f1"; }; dontBuild = true; From a89322ccdbb5c7a1599ac828ef45a92c76f76e4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 09:57:27 +0000 Subject: [PATCH 179/234] pgmetrics: 1.9.2 -> 1.9.3 --- pkgs/tools/misc/pgmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 44194314d77b2..bd4493db705f7 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "1prhzmxrvypqdbxjr9c3207w1c88z3kwsrr2rcbh1y7fx5rrspxv"; + sha256 = "1g0kdvc93ij155r3g7cd9f5p1x33vdi9p40403waanq5wiavjnzq"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; From 14fd29dae8727704d89f490214bc0bedd43d526b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 2 Aug 2020 13:11:40 +0000 Subject: [PATCH 180/234] deno: 1.2.1 -> 1.2.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 33d93650605d2..e418bd1ed6e71 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0dxagp4gyn7057zcp78bhhr9qfbblvsynds2b0f4b3di8kg65m7f"; + sha256 = "03s22sx8yp5z69nqgyng5nbqy1qy8wdlrh5h9ghk1j249lig21fz"; fetchSubmodules = true; }; - cargoSha256 = "1fgi6hbziky7szw18wma87bx8i74ax9dc90yyldvjikn4hjc8ipc"; + cargoSha256 = "1lg7rclhm0jz7hiyzq2ff73zkyg24ndys78q830w30zx4lh4y50d"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From f2bdf4400ccc92a5f1b8801225cc6890ca26cbaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 09:06:33 +0000 Subject: [PATCH 181/234] osm2pgsql: 1.2.2 -> 1.3.0 --- pkgs/tools/misc/osm2pgsql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index b2b665151686b..ebe99eca8cf95 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn"; + sha256 = "1dsyhcifixmcw05qxjald02pml0zfdij81pgy9yh8p00v0rqq57x"; }; nativeBuildInputs = [ cmake ]; From d4daee2f3dd53d842644609caf49453a27b917f3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 1 Aug 2020 15:11:35 +0200 Subject: [PATCH 182/234] bjumblr: 0.2 -> 1.4.0 --- pkgs/applications/audio/bjumblr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index de0cae7a21a3a..458fe20937a63 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "0.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; - rev = "v${version}"; - sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + rev = version; + sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; }; nativeBuildInputs = [ pkgconfig ]; From 87230c0a6acda63886a9e55e05c4ddc222a20ac7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 23:23:39 +0000 Subject: [PATCH 183/234] ettercap: 0.8.3 -> 0.8.3.1 --- pkgs/applications/networking/sniffers/ettercap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 4af8e526cd2c5..8489b414cbc59 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ettercap"; - version = "0.8.3"; + version = "0.8.3.1"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz"; + sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c"; }; strictDeps = true; From a1120be68b3b93c9b8e034c29192e1bbb21faf1f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 7 Mar 2020 02:44:56 +0100 Subject: [PATCH 184/234] lib/strings: Add floatToString --- lib/strings.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/strings.nix b/lib/strings.nix index 74e3eaa0722de..0baa942355c0e 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -612,6 +612,22 @@ rec { */ fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); + /* Convert a float to a string, but emit a warning when precision is lost + during the conversion + + Example: + floatToString 0.000001 + => "0.000001" + floatToString 0.0000001 + => trace: warning: Imprecise conversion from float to string 0.000000 + "0.000000" + */ + floatToString = float: let + result = toString float; + precise = float == builtins.fromJSON result; + in if precise then result + else lib.warn "Imprecise conversion from float to string ${result}" result; + /* Check whether a value can be coerced to a string */ isCoercibleToString = x: builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || From 1d4b603f17556d7d6ddaf524d6e78f062046e036 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 13 Dec 2019 00:24:30 +0100 Subject: [PATCH 185/234] lib/generators: Extend mkValueStringDefault with float support --- lib/generators.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index efe6ea6031d33..abd237eb7d377 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -48,8 +48,10 @@ rec { else if isAttrs v then err "attrsets" v # functions can’t be printed of course else if isFunction v then err "functions" v - # let’s not talk about floats. There is no sensible `toString` for them. - else if isFloat v then err "floats" v + # Floats currently can't be converted to precise strings, + # condition warning on nix version once this isn't a problem anymore + # See https://github.com/NixOS/nix/pull/3480 + else if isFloat v then libStr.floatToString v else err "this value is" (toString v); From 86b5ab3360dd44e10d78b3adb79d4d745d0bf534 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 26 Mar 2020 02:54:23 +0100 Subject: [PATCH 186/234] pkgs: Add pkgs-lib structure --- pkgs/pkgs-lib/default.nix | 7 +++++++ pkgs/pkgs-lib/tests/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 +++ pkgs/top-level/release.nix | 2 ++ 4 files changed, 17 insertions(+) create mode 100644 pkgs/pkgs-lib/default.nix create mode 100644 pkgs/pkgs-lib/tests/default.nix diff --git a/pkgs/pkgs-lib/default.nix b/pkgs/pkgs-lib/default.nix new file mode 100644 index 0000000000000..1f74747d3113b --- /dev/null +++ b/pkgs/pkgs-lib/default.nix @@ -0,0 +1,7 @@ +# pkgs-lib is for functions and values that can't be in lib because +# they depend on some packages. This notably is *not* for supporting package +# building, instead pkgs/build-support is the place for that. +{ lib, pkgs }: { + +} + diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix new file mode 100644 index 0000000000000..ee71596a14562 --- /dev/null +++ b/pkgs/pkgs-lib/tests/default.nix @@ -0,0 +1,5 @@ +# Call nix-build on this file to run all tests in this directory +{ pkgs ? import ../../.. {} }: +let +in pkgs.linkFarm "nixpkgs-pkgs-lib-tests" [ +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 197dc70c43900..d6c589e538c8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,6 +525,9 @@ in #package writers writers = callPackage ../build-support/writers {}; + # lib functions depending on pkgs + inherit (import ../pkgs-lib { inherit lib pkgs; }); + ### TOOLS _0x0 = callPackage ../tools/misc/0x0 { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c11858f09c8f5..5fc6e91b31181 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -34,6 +34,7 @@ let manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; + pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -91,6 +92,7 @@ let [ jobs.tarball jobs.manual jobs.lib-tests + jobs.pkgs-lib-tests jobs.stdenv.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux From c1dad87774aefb37abdfc07d2f735f806543054b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 26 Mar 2020 02:55:16 +0100 Subject: [PATCH 187/234] pkgs-lib: Implement settings formats for JSON, INI, YAML and TOML --- pkgs/pkgs-lib/default.nix | 6 +- pkgs/pkgs-lib/formats.nix | 109 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 pkgs/pkgs-lib/formats.nix diff --git a/pkgs/pkgs-lib/default.nix b/pkgs/pkgs-lib/default.nix index 1f74747d3113b..113dcebf8c68b 100644 --- a/pkgs/pkgs-lib/default.nix +++ b/pkgs/pkgs-lib/default.nix @@ -2,6 +2,10 @@ # they depend on some packages. This notably is *not* for supporting package # building, instead pkgs/build-support is the place for that. { lib, pkgs }: { - + # setting format types and generators. These do not fit in lib/types.nix, + # because they depend on pkgs for rendering some formats + formats = import ./formats.nix { + inherit lib pkgs; + }; } diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix new file mode 100644 index 0000000000000..14589f8ecdc3a --- /dev/null +++ b/pkgs/pkgs-lib/formats.nix @@ -0,0 +1,109 @@ +{ lib, pkgs }: +rec { + + /* + + Every following entry represents a format for program configuration files + used for `settings`-style options (see https://github.com/NixOS/rfcs/pull/42). + Each entry should look as follows: + + = : { + # ^^ Parameters for controlling the format + + # The module system type most suitable for representing such a format + # The description needs to be overwritten for recursive types + type = ...; + + # generate :: Name -> Value -> Path + # A function for generating a file with a value of such a type + generate = ...; + + }); + */ + + + json = {}: { + + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "JSON value"; + }; + in valueType; + + generate = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.jq ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + jq . "$valuePath"> $out + ''; + + }; + + # YAML has been a strict superset of JSON since 1.2 + yaml = {}: + let jsonSet = json {}; + in jsonSet // { + type = jsonSet.type // { + description = "YAML value"; + }; + }; + + ini = { listsAsDuplicateKeys ? false, ... }@args: { + + type = with lib.types; let + + singleIniAtom = nullOr (oneOf [ + bool + int + float + str + ]) // { + description = "INI atom (null, bool, int, float or string)"; + }; + + iniAtom = + if listsAsDuplicateKeys then + coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { + description = singleIniAtom.description + " or a list of them for duplicate keys"; + } + else + singleIniAtom; + + in attrsOf (attrsOf iniAtom); + + generate = name: value: pkgs.writeText name (lib.generators.toINI args value); + + }; + + toml = {}: json {} // { + type = with lib.types; let + valueType = oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ] // { + description = "TOML value"; + }; + in valueType; + + generate = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2toml "$valuePath" "$out" + ''; + + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6c589e538c8f..14338cc2951f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,7 +526,7 @@ in writers = callPackage ../build-support/writers {}; # lib functions depending on pkgs - inherit (import ../pkgs-lib { inherit lib pkgs; }); + inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; ### TOOLS From f1bcbf14a2e7d2b56d3502fa168c6659fd4a491e Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 26 Mar 2020 02:56:07 +0100 Subject: [PATCH 188/234] pkgs-lib: Add tests for formats --- pkgs/pkgs-lib/tests/default.nix | 2 + pkgs/pkgs-lib/tests/formats.nix | 157 ++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 pkgs/pkgs-lib/tests/formats.nix diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix index ee71596a14562..f3549ea9b0f2c 100644 --- a/pkgs/pkgs-lib/tests/default.nix +++ b/pkgs/pkgs-lib/tests/default.nix @@ -1,5 +1,7 @@ # Call nix-build on this file to run all tests in this directory { pkgs ? import ../../.. {} }: let + formats = import ./formats.nix { inherit pkgs; }; in pkgs.linkFarm "nixpkgs-pkgs-lib-tests" [ + { name = "formats"; path = import ./formats.nix { inherit pkgs; }; } ] diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix new file mode 100644 index 0000000000000..bf6be8595e1ba --- /dev/null +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -0,0 +1,157 @@ +{ pkgs }: +let + inherit (pkgs) lib formats; +in +with lib; +let + + evalFormat = format: args: def: + let + formatSet = format args; + config = formatSet.type.merge [] (imap1 (n: def: { + value = def; + file = "def${toString n}"; + }) [ def ]); + in formatSet.generate "test-format-file" config; + + runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' + if diff ${drv} ${builtins.toFile "expected" expected}; then + touch $out + else + echo "Got: $(cat ${drv})" + echo "Should be: ${expected}" + exit 1 + fi + ''; + + runBuildTests = tests: pkgs.linkFarm "nixpkgs-pkgs-lib-format-tests" (mapAttrsToList (name: value: { inherit name; path = runBuildTest name value; }) (filterAttrs (name: value: value != null) tests)); + +in runBuildTests { + + testJsonAtoms = { + drv = evalFormat formats.json {} { + null = null; + false = false; + true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ null null ]; + }; + expected = '' + { + "attrs": { + "foo": null + }, + "false": false, + "float": 3.141, + "int": 10, + "list": [ + null, + null + ], + "null": null, + "str": "foo", + "true": true + } + ''; + }; + + testYamlAtoms = { + drv = evalFormat formats.yaml {} { + null = null; + false = false; + true = true; + float = 3.141; + str = "foo"; + attrs.foo = null; + list = [ null null ]; + }; + expected = '' + { + "attrs": { + "foo": null + }, + "false": false, + "float": 3.141, + "list": [ + null, + null + ], + "null": null, + "str": "foo", + "true": true + } + ''; + }; + + testIniAtoms = { + drv = evalFormat formats.ini {} { + foo = { + bool = true; + int = 10; + float = 3.141; + str = "string"; + }; + }; + expected = '' + [foo] + bool=true + float=3.141000 + int=10 + str=string + ''; + }; + + testIniDuplicateKeys = { + drv = evalFormat formats.ini { listsAsDuplicateKeys = true; } { + foo = { + bar = [ null true "test" 1.2 10 ]; + baz = false; + qux = "qux"; + }; + }; + expected = '' + [foo] + bar=null + bar=true + bar=test + bar=1.200000 + bar=10 + baz=false + qux=qux + ''; + }; + + testTomlAtoms = { + drv = evalFormat formats.toml {} { + false = false; + true = true; + int = 10; + float = 3.141; + str = "foo"; + attrs.foo = "foo"; + list = [ 1 2 ]; + level1.level2.level3.level4 = "deep"; + }; + expected = '' + false = false + float = 3.141 + int = 10 + list = [1, 2] + str = "foo" + true = true + + [attrs] + foo = "foo" + + [level1] + + [level1.level2] + + [level1.level2.level3] + level4 = "deep" + ''; + }; +} From e141f62c2c8334ae6ced99d76e09f02a54aa1e75 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 6 Mar 2020 15:02:07 +0100 Subject: [PATCH 189/234] nixos/docs: Add documentation for settings options --- .../manual/development/settings-options.xml | 179 ++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 2 files changed, 180 insertions(+) create mode 100644 nixos/doc/manual/development/settings-options.xml diff --git a/nixos/doc/manual/development/settings-options.xml b/nixos/doc/manual/development/settings-options.xml new file mode 100644 index 0000000000000..84895adb444d3 --- /dev/null +++ b/nixos/doc/manual/development/settings-options.xml @@ -0,0 +1,179 @@ +
+ Options for Program Settings + + + Many programs have configuration files where program-specific settings can be declared. File formats can be separated into two categories: + + + + Nix-representable ones: These can trivially be mapped to a subset of Nix syntax. E.g. JSON is an example, since its values like {"foo":{"bar":10}} can be mapped directly to Nix: { foo = { bar = 10; }; }. Other examples are INI, YAML and TOML. The following section explains the convention for these settings. + + + + + Non-nix-representable ones: These can't be trivially mapped to a subset of Nix syntax. Most generic programming languages are in this group, e.g. bash, since the statement if true; then echo hi; fi doesn't have a trivial representation in Nix. + + + Currently there are no fixed conventions for these, but it is common to have a configFile option for setting the configuration file path directly. The default value of configFile can be an auto-generated file, with convenient options for controlling the contents. For example an option of type attrsOf str can be used for representing environment variables which generates a section like export FOO="foo". Often it can also be useful to also include an extraConfig option of type lines to allow arbitrary text after the autogenerated part of the file. + + + + +
+ Nix-representable Formats (JSON, YAML, TOML, INI, ...) + + By convention, formats like this are handled with a generic settings option, representing the full program configuration as a Nix value. The type of this option should represent the format. The most common formats have a predefined type and string generator already declared under pkgs.formats: + + + + pkgs.formats.json { } + + + + A function taking an empty attribute set (for future extensibility) and returning a set with JSON-specific attributes type and generate as specified below. + + + + + + pkgs.formats.yaml { } + + + + A function taking an empty attribute set (for future extensibility) and returning a set with YAML-specific attributes type and generate as specified below. + + + + + + pkgs.formats.ini { listsAsDuplicateKeys ? false, ... } + + + + A function taking an attribute set with values + + + + listsAsDuplicateKeys + + + + A boolean for controlling whether list values can be used to represent duplicate INI keys + + + + + It returns a set with INI-specific attributes type and generate as specified below. + + + + + + pkgs.formats.toml { } + + + + A function taking an empty attribute set (for future extensibility) and returning a set with TOML-specific attributes type and generate as specified below. + + + + + + + + These functions all return an attribute set with these values: + + + + type + + + + A module system type representing a value of the format + + + + + + generate filename jsonValue + + + + A function that can render a value of the format to a file. Returns a file path. + + + This function puts the value contents in the Nix store. So this should be avoided for secrets. + + + + + + + + + Module with conventional <literal>settings</literal> option + + The following shows a module for an example program that uses a JSON configuration file. It demonstrates how above values can be used, along with some other related best practices. See the comments for explanations. + + +{ options, config, lib, pkgs, ... }: +let + cfg = config.services.foo; + # Define the settings format used for this program + settingsFormat = pkgs.formats.json {}; +in { + + options.services.foo = { + enable = lib.mkEnableOption "foo service"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = {}; + description = '' + Configuration for foo, see + <link xlink:href="https://example.com/docs/foo"/> + for supported values. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + # We can assign some default settings here to make the service work by just + # enabling it. We use `mkDefault` for values that can be changed without + # problems + services.foo.settings = { + # Fails at runtime without any value set + log_level = lib.mkDefault "WARN"; + + # We assume systemd's `StateDirectory` is used, so we require this value, + # therefore no mkDefault + data_path = "/var/lib/foo"; + + # Since we use this to create a user we need to know the default value at + # eval time + user = lib.mkDefault "foo"; + }; + + environment.etc."foo.json".source = + # The formats generator function takes a filename and the Nix value + # representing the format value and produces a filepath with that value + # rendered in the format + settingsFormat.generate "foo-config.json" cfg.settings; + + # We know that the `user` attribute exists because we set a default value + # for it above, allowing us to use it without worries here + users.users.${cfg.settings.user} = {} + + # ... + }; +} + + +
+ +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index bbf793bb0be98..602f134f9cbfa 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -183,4 +183,5 @@ in { + From c08a97d15cfb9ba1d910b29c3daf4e01b59bad09 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 15:43:39 +0000 Subject: [PATCH 190/234] amfora: 1.3.0 -> 1.4.0 --- pkgs/applications/networking/browsers/amfora/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index bbfef294ccaa4..d2d8de375a745 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "0bnjwsyi6l9p27rajwh0nq53zi4km7qpgyb08q17j0vd87gpdhka"; + sha256 = "1z4r1yqy5nkfa7yqcsqpqfdcghw8idryzb3s6d6ibca47r0qlcvw"; }; - vendorSha256 = "1rj2m3rg8ixclj5jr0nmp266vwj1mg5ampxn04i3wgaayy49dbdi"; + vendorSha256 = "0xj2s14dq10fwqqxjn4d8x6zljd5d15gjbja2gb75rfv09s4fdgv"; meta = with lib; { description = "A fancy terminal browser for the Gemini protocol"; From 9c4bf9edca27303e4fd67a75bac4484c9725002c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 10:16:24 +0000 Subject: [PATCH 191/234] fluent-bit: 1.5.0 -> 1.5.2 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index cc40c89bc6f46..9150e04fc14f4 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "15nfzs1p6na0n98hpzh4lnzcj4g83dg2nfhd4f9lay32qj12cqgj"; + sha256 = "1q413rslsba8pqxlrypx4kpk1a4sp66p0swv3lrnd7k7bf55j3jk"; }; nativeBuildInputs = [ cmake flex bison ]; From 81e8633e8fc5192edca684adeb2ec9b489644946 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 11:32:47 +0000 Subject: [PATCH 192/234] flyway: 6.5.0 -> 6.5.3 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 19d898ce99303..be38e1fdf444b 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.0"; + version = "6.5.3"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0qag8xz347vwwqlwirlz5vnhvfga79ihwqp1y0rbqzhcnwpjzc69"; + sha256 = "1gxa9gg7di79kl6aayryhrkm3nzn3sc7hg2x1ldy1q72x6wz41sc"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 1784cad5461d1bf7d244948e3ecef1bc1db31fc9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jul 2020 13:37:56 +0200 Subject: [PATCH 193/234] nixos/snapserver: update module to work with snapcast 0.20 --- nixos/modules/services/audio/snapserver.nix | 166 ++++++++++++++------ 1 file changed, 121 insertions(+), 45 deletions(-) diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index b0b9264e81666..f614f0ba3e10c 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -31,27 +31,42 @@ let let os = val: optionalString (val != null) "${val}"; - os' = prefixx: val: - optionalString (val != null) (prefixx + "${val}"); + os' = prefix: val: + optionalString (val != null) (prefix + "${val}"); flatten = key: value: "&${key}=${value}"; in - "-s ${opt.type}://" + os opt.location + "?" + os' "name=" name - + concatStrings (mapAttrsToList flatten opt.query); + "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name + + concatStrings (mapAttrsToList flatten opt.query) + "\""; optionalNull = val: ret: optional (val != null) ret; optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams - ++ ["-p ${toString cfg.port}"] - ++ ["--controlPort ${toString cfg.controlPort}"] - ++ optionalNull cfg.sampleFormat "--sampleFormat ${cfg.sampleFormat}" - ++ optionalNull cfg.codec "-c ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--streamBuffer ${cfg.streamBuffer}" - ++ optionalNull cfg.buffer "-b ${cfg.buffer}" - ++ optional cfg.sendToMuted "--sendToMuted"); + # global options + ++ [ "--stream.bind_to_address ${cfg.listenAddress}" ] + ++ [ "--stream.port ${toString cfg.port}" ] + ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" + ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer ${cfg.buffer}" + ++ optional cfg.sendToMuted "--stream.send_to_muted" + # tcp json rpc + ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] + ++ optionals cfg.tcp.enable [ + "--tcp.address ${cfg.tcp.listenAddress}" + "--tcp.port ${toString cfg.tcp.port}" ] + # http json rpc + ++ [ "--http.enabled ${toString cfg.http.enable}" ] + ++ optionals cfg.http.enable [ + "--http.address ${cfg.http.listenAddress}" + "--http.port ${toString cfg.http.port}" + ] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\""); in { + imports = [ + (mkRenamedOptionModule [ "services" "snapserver" "controlPort"] [ "services" "snapserver" "tcp" "port" ]) + ]; ###### interface @@ -67,6 +82,15 @@ in { ''; }; + listenAddress = mkOption { + type = types.str; + default = "::"; + example = "0.0.0.0"; + description = '' + The address where snapclients can connect. + ''; + }; + port = mkOption { type = types.port; default = 1704; @@ -75,24 +99,100 @@ in { ''; }; - controlPort = mkOption { + openFirewall = mkOption { + type = types.bool; + default = true; + description = '' + Whether to automatically open the specified ports in the firewall. + ''; + }; + + inherit sampleFormat; + inherit codec; + + streamBuffer = mkOption { + type = with types; nullOr int; + default = null; + description = '' + Stream read (input) buffer in ms. + ''; + example = 20; + }; + + buffer = mkOption { + type = with types; nullOr int; + default = null; + description = '' + Network buffer in ms. + ''; + example = 1000; + }; + + sendToMuted = mkOption { + type = types.bool; + default = false; + description = '' + Send audio to muted clients. + ''; + }; + + tcp.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the JSON-RPC via TCP. + ''; + }; + + tcp.listenAddress = mkOption { + type = types.str; + default = "::"; + example = "0.0.0.0"; + description = '' + The address where the TCP JSON-RPC listens on. + ''; + }; + + tcp.port = mkOption { type = types.port; default = 1705; description = '' - The port for control connections (JSON-RPC). + The port where the TCP JSON-RPC listens on. ''; }; - openFirewall = mkOption { + http.enable = mkOption { type = types.bool; default = true; description = '' - Whether to automatically open the specified ports in the firewall. + Whether to enable the JSON-RPC via HTTP. ''; }; - inherit sampleFormat; - inherit codec; + http.listenAddress = mkOption { + type = types.str; + default = "::"; + example = "0.0.0.0"; + description = '' + The address where the HTTP JSON-RPC listens on. + ''; + }; + + http.port = mkOption { + type = types.port; + default = 1780; + description = '' + The port where the HTTP JSON-RPC listens on. + ''; + }; + + http.docRoot = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to serve from the HTTP servers root. + ''; + }; streams = mkOption { type = with types; attrsOf (submodule { @@ -147,34 +247,7 @@ in { }; ''; }; - - streamBuffer = mkOption { - type = with types; nullOr int; - default = null; - description = '' - Stream read (input) buffer in ms. - ''; - example = 20; - }; - - buffer = mkOption { - type = with types; nullOr int; - default = null; - description = '' - Network buffer in ms. - ''; - example = 1000; - }; - - sendToMuted = mkOption { - type = types.bool; - default = false; - description = '' - Send audio to muted clients. - ''; - }; }; - }; @@ -206,7 +279,10 @@ in { }; }; - networking.firewall.allowedTCPPorts = optionals cfg.openFirewall [ cfg.port cfg.controlPort ]; + networking.firewall.allowedTCPPorts = + optionals cfg.openFirewall [ cfg.port ] + ++ optional cfg.tcp.enable cfg.tcp.port + ++ optional cfg.http.enable cfg.http.port; }; meta = { From 69ae035603d509a73ae85b8622372fb260818927 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Jul 2020 14:47:36 +0200 Subject: [PATCH 194/234] nixos/tests: add snapcast Checks - if all configured ports are listened on - if all pipes for multiple streams get set up - if rpc interaction is possible --- nixos/tests/all-tests.nix | 1 + nixos/tests/snapcast.nix | 58 ++++++++++++++++++++ pkgs/applications/audio/snapcast/default.nix | 5 +- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/snapcast.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 19397427b2aba..c030faf15cd29 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -310,6 +310,7 @@ in simple = handleTest ./simple.nix {}; slurm = handleTest ./slurm.nix {}; smokeping = handleTest ./smokeping.nix {}; + snapcast = handleTest ./snapcast.nix {}; snapper = handleTest ./snapper.nix {}; sogo = handleTest ./sogo.nix {}; solr = handleTest ./solr.nix {}; diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix new file mode 100644 index 0000000000000..92534f1028190 --- /dev/null +++ b/nixos/tests/snapcast.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +let + port = 10004; + tcpPort = 10005; + httpPort = 10080; +in { + name = "snapcast"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hexa ]; + }; + + nodes = { + server = { + services.snapserver = { + enable = true; + port = port; + tcp.port = tcpPort; + http.port = httpPort; + streams = { + mpd = { + type = "pipe"; + location = "/run/snapserver/mpd"; + }; + bluetooth = { + type = "pipe"; + location = "/run/snapserver/bluetooth"; + }; + }; + }; + }; + }; + + testScript = '' + import json + + get_rpc_version = {"id": "1", "jsonrpc": "2.0", "method": "Server.GetRPCVersion"} + + start_all() + + server.wait_for_unit("snapserver.service") + server.wait_until_succeeds("ss -ntl | grep -q ${toString port}") + server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}") + server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}") + + with subtest("check that pipes are created"): + server.succeed("test -p /run/snapserver/mpd") + server.succeed("test -p /run/snapserver/bluetooth") + + with subtest("test tcp json-rpc"): + server.succeed(f"echo '{json.dumps(get_rpc_version)}' | nc -w 1 localhost ${toString tcpPort}") + + with subtest("test http json-rpc"): + server.succeed( + "curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'" + ) + ''; +}) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 25b8f9456a072..5eff8f82e89d0 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr }: +, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr +, nixosTests }: let @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { cp -r ../doc/* ../*.md $out/share/doc/snapcast ''; + passthru.tests.snapcast = nixosTests.snapcast; + meta = with lib; { description = "Synchronous multi-room audio player"; homepage = "https://github.com/badaix/snapcast"; From 1fcc25cc6503ed21285d264dc27093d5e1d6846e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 03:59:22 +0000 Subject: [PATCH 195/234] jx: 2.1.90 -> 2.1.121 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 2f93d566d3571..5ae6ddf906f56 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.90"; + version = "2.1.121"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1m2gq1hh8fjgxwx2sipq56q5mlz0m3npnbsw103n2kq4xv1qf3f6"; + sha256 = "0bjpnh962w5wz4gj5my9g52dawxj8zccvpkxlxy1n7c3dkzjxx5j"; }; - vendorSha256 = "0kj6x7323fx1qhrlg789a21mh1fvhil7ng2fhmbmlwq0fcrngdnj"; + vendorSha256 = "0l9djgvnrgdnw7nsf05yq7qpzzzm3gasgh9a7dyc16pp2kxvza6k"; subPackages = [ "cmd/jx" ]; From 43114bc9ad202b874b7b2ee9f89267fcb34b5d45 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 196/234] jx: install completions --- pkgs/applications/networking/cluster/jx/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 5ae6ddf906f56..320c9c7d98ece 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "jx"; @@ -15,12 +15,21 @@ buildGoModule rec { subPackages = [ "cmd/jx" ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = '' -ldflags= -X github.com/jenkins-x/jx/pkg/version.Version=${version} -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; + postInstall = '' + for shell in bash zsh; do + $out/bin/jx completion $shell > jx.$shell + installShellCompletion jx.$shell + done + ''; + meta = with lib; { description = "JX is a command line tool for installing and using Jenkins X."; homepage = "https://jenkins-x.io"; From 17d6a77a78ae9f5a4cabdeffa222056ba01dc833 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 197/234] jx: update ldflags --- pkgs/applications/networking/cluster/jx/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 320c9c7d98ece..c9b63b49d4240 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -19,8 +19,10 @@ buildGoModule rec { buildFlagsArray = '' -ldflags= + -s -w -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${version} + -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} + -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean ''; postInstall = '' From d766be1ca098e4b162c263cc3482b3aa00e87908 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 09:02:19 +0000 Subject: [PATCH 198/234] gosec: 2.3.0 -> 2.4.0 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index f11a7fc35d690..c0c4bf89d50e9 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gosec"; - version = "2.3.0"; + version = "2.4.0"; goPackagePath = "github.com/securego/gosec"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0z782rr4z0nhlj6cmjd17pbi65zabpmb83mv4y93wi4qa7kkpm2g"; + sha256 = "0mqijzr3vj4wycykqpjz9xw9fhpbnzz988z2q3nldb5ax0pyrxca"; }; - vendorSha256 = "0zrmhqcid8xr6i1xxg3s8sll8a667w2vmn5asdw0b43k6k3h941p"; + vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; meta = with stdenv.lib; { homepage = "https://github.com/securego/gosec"; From ef802ff9a05fce8e8d57196052ae2cea72c21439 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 199/234] gosec: add ldflags --- pkgs/development/tools/gosec/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index c0c4bf89d50e9..0915f3e966afa 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -17,6 +17,8 @@ buildGoModule rec { vendorSha256 = "063dpq1k5lykp18gshlgg098yvppicv3cz8gjn1mvfhac2rl9yqr"; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; + meta = with stdenv.lib; { homepage = "https://github.com/securego/gosec"; description = "Golang security checker"; From 47be64be217d1e866df5feb651bb0a267b25ccbd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 2 Aug 2020 13:46:20 +0200 Subject: [PATCH 200/234] openjdk14: 14.0.1 -> 14.0.2 --- pkgs/development/compilers/openjdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 063976d8765fc..e51e554026756 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -10,7 +10,7 @@ let major = "14"; - update = ".0.1"; + update = ".0.2"; build = "-ga"; openjdk = stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip"; + sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3"; }; nativeBuildInputs = [ pkgconfig autoconf ]; From 39a35c9e5409b315fcc5a9837109bd360229f419 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 1 Aug 2020 13:09:49 +0200 Subject: [PATCH 201/234] ardour: 6.0 -> 6.2 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5090ef6a2ec80..0c38057d56f8f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -55,13 +55,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.0"; + version = "6.2"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "162jd96zahl05fdmjwvpdfjxbhd6ifbav6xqa0vv6rsdl4zk395q"; + sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y"; }; patches = [ From dfaf809f7153f7d46b6f80818b69a4e04841b083 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 2 Aug 2020 09:00:11 +0200 Subject: [PATCH 202/234] initrd-network: fix flushBeforeStage2 --- nixos/modules/system/boot/initrd-network.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 0ab6e626b340e..ec794d6eb014d 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -139,7 +139,7 @@ in boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 '' for iface in $ifaces; do ip address flush "$iface" - ip link down "$iface" + ip link set "$iface" down done ''; From 345130127c099e0fb31f3b7462d6a8e3f3b9968a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 11:58:55 +0000 Subject: [PATCH 203/234] istioctl: 1.6.5 -> 1.6.6 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index e4197a50ef154..d6d92e0569849 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "0xga0vjr2nfbxwbawly8vg9vnpavxbmc1agg2a3cp1ncmzfrgpcx"; + sha256 = "0njchcb58lxk0cixk2rz4qj7b0zpp6zf3i5dda43j4hfsb37mifj"; }; - vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij"; + vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; nativeBuildInputs = [ go-bindata ]; From 7a0a32f8d8e2adb343ddf91626ad93ce9edb00b2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 2 Aug 2020 04:20:00 -0500 Subject: [PATCH 204/234] istioctl: install completions --- .../networking/cluster/istioctl/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index d6d92e0569849..e04d799248ef7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: buildGoModule rec { pname = "istioctl"; @@ -12,7 +12,7 @@ buildGoModule rec { }; vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; # Bundle charts preBuild = '' @@ -28,10 +28,17 @@ buildGoModule rec { "istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildHub=docker.io/istio" ]; - in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; subPackages = [ "istioctl/cmd/istioctl" ]; + postInstall = '' + $out/bin/istioctl collateral --man --bash --zsh + installManPage *.1 + installShellCompletion istioctl.bash + installShellCompletion --zsh _istioctl + ''; + meta = with lib; { description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; From 406038426647a0d1d27efe4f96148c7f38a3577e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 26 Jul 2020 13:10:18 +0200 Subject: [PATCH 205/234] kfloppy: init at 20.04.3 --- pkgs/applications/kde/default.nix | 3 ++- pkgs/applications/kde/kfloppy.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/kde/kfloppy.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 7e33769983d3c..4767ff3c84bfc 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -74,7 +74,7 @@ let akregator = callPackage ./akregator.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; - bovo = callPackage ./bovo.nix {}; + bovo = callPackage ./bovo.nix {}; bomber = callPackage ./bomber.nix {}; calendarsupport = callPackage ./calendarsupport.nix {}; dolphin = callPackage ./dolphin.nix {}; @@ -113,6 +113,7 @@ let kdialog = callPackage ./kdialog.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; + kfloppy = callPackage ./kfloppy.nix {}; kgeography = callPackage ./kgeography.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix new file mode 100644 index 0000000000000..525520c159bdc --- /dev/null +++ b/pkgs/applications/kde/kfloppy.nix @@ -0,0 +1,20 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: + +mkDerivation { + name = "kfloppy"; + meta = with lib; { + homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; + description = "KFloppy is a utility to format 3.5\" and 5.25\" floppy disks"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kdoctools + kcompletion + kxmlgui + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14338cc2951f2..d4bf40bb32c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20854,7 +20854,7 @@ in inherit (kdeApplications) akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight granatier gwenview k3b kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog - keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake + keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular picmi spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From 90111992ecb7ee510c298d4e8b62e7e53c23aa10 Mon Sep 17 00:00:00 2001 From: Divam Date: Tue, 23 Apr 2019 14:11:39 +0900 Subject: [PATCH 206/234] Options to add an extra disk in virtual box VM. --- .../virtualisation/virtualbox-image.nix | 65 +++++++++++++++++-- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 136bbad60a43f..fa580e8b42d6b 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -58,6 +58,35 @@ in { Run VBoxManage modifyvm --help to see more options. ''; }; + extraDisk = mkOption { + description = '' + Optional extra disk/hdd configuration. + The disk will be an 'ext4' partition on a separate VMDK file. + ''; + default = null; + example = { + label = "storage"; + mountPoint = "/home/demo/storage"; + size = 100 * 1024; + }; + type = types.nullOr (types.submodule { + options = { + size = mkOption { + type = types.int; + description = "Size in MiB"; + }; + label = mkOption { + type = types.str; + default = "vm-extra-storage"; + description = "Label for the disk partition"; + }; + mountPoint = mkOption { + type = types.str; + description = "Path where to mount this disk."; + }; + }; + }); + }; }; }; @@ -96,6 +125,20 @@ in { echo "creating VirtualBox pass-through disk wrapper (no copying involved)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage + ${optionalString (cfg.extraDisk != null) '' + echo "creating extra disk: data-disk.raw" + dataDiskImage=data-disk.raw + truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage + + parted --script $dataDiskImage -- \ + mklabel msdos \ + mkpart primary ext4 1MiB -1 + eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) + mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + echo "creating extra disk: data-disk.vmdk" + VBoxManage internalcommands createrawvmdk -filename data-disk.vmdk -rawdisk $dataDiskImage + ''} + echo "creating VirtualBox VM..." vmName="${cfg.vmName}"; VBoxManage createvm --name "$vmName" --register \ @@ -106,6 +149,10 @@ in { VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ --medium disk.vmdk + ${optionalString (cfg.extraDisk != null) '' + VBoxManage storageattach "$vmName" --storagectl SATA --port 1 --device 0 --type hdd \ + --medium data-disk.vmdk + ''} echo "exporting VirtualBox VM..." mkdir -p $out @@ -119,11 +166,19 @@ in { ''; }; - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + } // (lib.optionalAttrs (cfg.extraDisk != null) { + ${cfg.extraDisk.mountPoint} = { + device = "/dev/disk/by-label/" + cfg.extraDisk.label; + autoResize = true; + fsType = "ext4"; + }; + }); boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; From 9b8fce7cccabf06795d33d7e715c295255e889a3 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 20:23:38 -0500 Subject: [PATCH 207/234] vale: 2.0.0 -> 2.2.2 Switch from buildGoPackage to buildGoModule According to documentation, buildGoPackage is designed for legacy Go packages which do not support go.mod, while "vale" do support it. --- pkgs/tools/text/vale/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 6035c2950a962..0e4166a7bd558 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "vale"; - version = "2.0.0"; + version = "2.2.2"; subPackages = [ "." ]; @@ -10,9 +10,13 @@ buildGoPackage rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh"; + sha256 = "11pgszm9cb65liczpnq04l1rx0v68jgmkzrw7ax5kln5hgnrh4kb"; }; + deleteVendor = true; + + vendorSha256 = "150pvy94vfjvn74d63az917szixw1nhl60y1adixg8xqpcjnv9hj"; + goPackagePath = "github.com/errata-ai/vale"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From f17537c5ed257b99d5224917c4b3cb1e5d14e04f Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 20:33:33 -0500 Subject: [PATCH 208/234] vale: install documentation into $doc output --- pkgs/tools/text/vale/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 0e4166a7bd558..c7b06b7e0f6f5 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -5,6 +5,7 @@ buildGoModule rec { version = "2.2.2"; subPackages = [ "." ]; + outputs = ["out" "doc"]; src = fetchFromGitHub { owner = "errata-ai"; @@ -18,6 +19,10 @@ buildGoModule rec { vendorSha256 = "150pvy94vfjvn74d63az917szixw1nhl60y1adixg8xqpcjnv9hj"; goPackagePath = "github.com/errata-ai/vale"; + postInstall = '' + mkdir -p $doc/share/doc/vale + cp -r docs/* $doc/share/doc/vale + ''; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 25c56c44253c6750664d3425e8781bdb7e830090 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 25 Feb 2020 21:33:10 -0500 Subject: [PATCH 209/234] vale: install styles provided by upstream --- pkgs/tools/text/vale/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index c7b06b7e0f6f5..96969b0a310ab 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "2.2.2"; subPackages = [ "." ]; - outputs = ["out" "doc"]; + outputs = ["out" "doc" "data"]; src = fetchFromGitHub { owner = "errata-ai"; @@ -21,7 +21,9 @@ buildGoModule rec { goPackagePath = "github.com/errata-ai/vale"; postInstall = '' mkdir -p $doc/share/doc/vale + mkdir -p $data/share/vale cp -r docs/* $doc/share/doc/vale + cp -r styles $data/share/vale ''; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 0c4f067abc664801200ebc7b332508595b0b57b8 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 23 Feb 2020 21:12:37 -0800 Subject: [PATCH 210/234] acl2, acl2-minimal: build standard library, init Before this commit, we only built the main ACL2 executable. Most users will also want the standard library (the "Community Books"), so after this commit, we build the entire `make everything` suite, which includes essentially everything provided in the ACL2 repository. There's also a new top-level package called `acl2-minimal` which has just the core ACL2 executable, for those who really only want that. Future work: modularize the build so that we can support multiple different subsets of the standard library. A lot of the stuff in this complete build is probably superfluous to almost all users. Also, because some of the books have unclear or idiosyncratic licenses, the full build will not be cached on cache.nixos.org, and installing it will mean spending a few hours building it. So it would be good to have a pared down build which excluded non-free books and things that people rarely or never use. --- .../0001-Fix-some-paths-for-Nix-build.patch | 190 ++++++++++++++++++ .../acl2/0002-Restrict-RDTSC-to-x86.patch | 29 +++ .../development/interpreters/acl2/default.nix | 159 ++++++++++----- .../0001-Support-shared-library-build.patch | 46 +++++ .../acl2/libipasirglucose4/default.nix | 36 ++++ pkgs/top-level/all-packages.nix | 1 + 6 files changed, 411 insertions(+), 50 deletions(-) create mode 100644 pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch create mode 100644 pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch create mode 100644 pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch create mode 100644 pkgs/development/interpreters/acl2/libipasirglucose4/default.nix diff --git a/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch new file mode 100644 index 0000000000000..2b7f8b6a53b1e --- /dev/null +++ b/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch @@ -0,0 +1,190 @@ +From 43d23211dd7d22b5264ed06d446f89d632125da8 Mon Sep 17 00:00:00 2001 +From: Keshav Kini +Date: Sat, 30 May 2020 21:27:47 -0700 +Subject: [PATCH 1/2] Fix some paths for Nix build + +--- + books/build/features.sh | 1 + + .../ipasir/load-ipasir-sharedlib-raw.lsp | 16 +++---- + books/projects/smtlink/config.lisp | 2 +- + books/projects/smtlink/examples/examples.lisp | 4 +- + books/projects/smtlink/smtlink-config | 2 +- + .../cl+ssl-20181018-git/src/reload.lisp | 48 ++----------------- + .../shellpool-20150505-git/src/main.lisp | 20 +------- + 7 files changed, 15 insertions(+), 78 deletions(-) + +diff --git a/books/build/features.sh b/books/build/features.sh +index c8493d51a..def853f53 100755 +--- a/books/build/features.sh ++++ b/books/build/features.sh +@@ -84,6 +84,7 @@ fi + + + echo "Determining whether an ipasir shared library is installed" 1>&2 ++IPASIR_SHARED_LIBRARY=${IPASIR_SHARED_LIBRARY:-@libipasirglucose4@/lib/libipasirglucose4.so} + if [[ $IPASIR_SHARED_LIBRARY != '' ]]; + then + if [[ -e $IPASIR_SHARED_LIBRARY ]]; +diff --git a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp +index c6b0b3185..5ac5c675a 100644 +--- a/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp ++++ b/books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp +@@ -28,13 +28,9 @@ + ; + ; Original authors: Sol Swords + +-(er-let* ((libname (acl2::getenv$ "IPASIR_SHARED_LIBRARY" acl2::*the-live-state*))) +- (if libname +- (handler-case +- (cffi::load-foreign-library libname) +- (error () (er hard? 'load-ipasir-shardlib-raw +- "Couldn't load the specified ipasir shared library, ~s0." +- libname))) +- (er hard? 'load-ipasir-shardlib-raw +- "Couldn't load an ipasir library because the ~ +- IPASIR_SHARED_LIBRARY environment variable was unset."))) ++(let ((libname "@libipasirglucose4@/lib/libipasirglucose4.so")) ++ (handler-case ++ (cffi::load-foreign-library libname) ++ (error () (er hard? 'load-ipasir-shardlib-raw ++ "Couldn't load the specified ipasir shared library, ~s0." ++ libname)))) +diff --git a/books/projects/smtlink/config.lisp b/books/projects/smtlink/config.lisp +index c74073174..8d92355f7 100644 +--- a/books/projects/smtlink/config.lisp ++++ b/books/projects/smtlink/config.lisp +@@ -51,7 +51,7 @@ where the system books are.")) + (make-smtlink-config :interface-dir interface-dir + :smt-module "ACL2_to_Z3" + :smt-class "ACL22SMT" +- :smt-cmd "/usr/bin/env python" ++ :smt-cmd "python" + :pythonpath ""))) + + ;; ----------------------------------------------------------------- +diff --git a/books/projects/smtlink/examples/examples.lisp b/books/projects/smtlink/examples/examples.lisp +index bc66e0165..24f0d639c 100644 +--- a/books/projects/smtlink/examples/examples.lisp ++++ b/books/projects/smtlink/examples/examples.lisp +@@ -75,7 +75,7 @@ Subgoal 2 + Subgoal 2.2 + Subgoal 2.2' + Using default SMT-trusted-cp... +-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes ++; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes + Proved! + Subgoal 2.2'' + Subgoal 2.1 +@@ -139,7 +139,7 @@ read back into ACL2. Below are the outputs from this clause processor called + + @({ + Using default SMT-trusted-cp... +-; SMT solver: `/usr/bin/env python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes ++; SMT solver: `python /tmp/py_file/smtlink.w59zR`: 0.52 sec, 7,904 bytes + Proved! + }) + +diff --git a/books/projects/smtlink/smtlink-config b/books/projects/smtlink/smtlink-config +index 0d2703545..0f58904ea 100644 +--- a/books/projects/smtlink/smtlink-config ++++ b/books/projects/smtlink/smtlink-config +@@ -1 +1 @@ +-smt-cmd=/usr/bin/env python ++smt-cmd=python +diff --git a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp +index 3f6aa35d0..ac4012363 100644 +--- a/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp ++++ b/books/quicklisp/bundle/software/cl+ssl-20181018-git/src/reload.lisp +@@ -20,54 +20,12 @@ + (in-package :cl+ssl) + + (cffi:define-foreign-library libcrypto +- (:openbsd "libcrypto.so") +- (:darwin (:or "/opt/local/lib/libcrypto.dylib" ;; MacPorts +- "/sw/lib/libcrypto.dylib" ;; Fink +- "/usr/local/opt/openssl/lib/libcrypto.dylib" ;; Homebrew +- "/usr/local/lib/libcrypto.dylib" ;; personalized install +- "libcrypto.dylib" ;; default system libcrypto, which may have insufficient crypto +- "/usr/lib/libcrypto.dylib"))) ++ (t "@openssl@/lib/libcrypto.so")) + + (cffi:define-foreign-library libssl +- (:windows (:or "libssl32.dll" "ssleay32.dll")) +- ;; The default OS-X libssl seems have had insufficient crypto algos +- ;; (missing TLSv1_[1,2]_XXX methods, +- ;; see https://github.com/cl-plus-ssl/cl-plus-ssl/issues/56) +- ;; so first try to load possible custom installations of libssl +- (:darwin (:or "/opt/local/lib/libssl.dylib" ;; MacPorts +- "/sw/lib/libssl.dylib" ;; Fink +- "/usr/local/opt/openssl/lib/libssl.dylib" ;; Homebrew +- "/usr/local/lib/libssl.dylib" ;; personalized install +- "libssl.dylib" ;; default system libssl, which may have insufficient crypto +- "/usr/lib/libssl.dylib")) +- (:solaris (:or "/lib/64/libssl.so" +- "libssl.so.0.9.8" "libssl.so" "libssl.so.4")) +- ;; Unlike some other systems, OpenBSD linker, +- ;; when passed library name without versions at the end, +- ;; will locate the library with highest macro.minor version, +- ;; so we can just use just "libssl.so". +- ;; More info at https://github.com/cl-plus-ssl/cl-plus-ssl/pull/2. +- (:openbsd "libssl.so") +- ((and :unix (not :cygwin)) (:or "libssl.so.1.0.2m" +- "libssl.so.1.0.2k" +- "libssl.so.1.0.2" +- "libssl.so.1.0.1l" +- "libssl.so.1.0.1j" +- "libssl.so.1.0.1e" +- "libssl.so.1.0.1" +- "libssl.so.1.0.0q" +- "libssl.so.1.0.0" +- "libssl.so.0.9.8ze" +- "libssl.so.0.9.8" +- "libssl.so.10" +- "libssl.so.4" +- "libssl.so")) +- (:cygwin "cygssl-1.0.0.dll") +- (t (:default "libssl3"))) +- +-(cffi:define-foreign-library libeay32 +- (:windows "libeay32.dll")) ++ (t "@openssl@/lib/libssl.so")) + ++(cffi:define-foreign-library libeay32) + + (unless (member :cl+ssl-foreign-libs-already-loaded + *features*) +diff --git a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp +index cda8dc94c..11035ea09 100644 +--- a/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp ++++ b/books/quicklisp/bundle/software/shellpool-20150505-git/src/main.lisp +@@ -106,26 +106,8 @@ + ; Glue + + +-#-sbcl + (defun find-bash () +- #+windows "bash.exe" +- #-windows "bash") +- +-#+sbcl +-;; SBCL (on Linux, at least) won't successfully run "bash" all by itself. So, +-;; on SBCL, try to find a likely bash. BOZO this probably isn't great. It +-;; would be better to search the user's PATH for which bash to use. +-(let ((found-bash)) +- (defun find-bash () +- (or found-bash +- (let ((paths-to-try '("/bin/bash" +- "/usr/bin/bash" +- "/usr/local/bin/bash"))) +- (loop for path in paths-to-try do +- (when (cl-fad::file-exists-p path) +- (setq found-bash path) +- (return-from find-bash path))) +- (error "Bash not found among ~s" paths-to-try))))) ++ "@bash@/bin/bash") + + #+(or allegro lispworks) + (defstruct bashprocess +-- +2.25.4 + diff --git a/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch b/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch new file mode 100644 index 0000000000000..74af5adef6493 --- /dev/null +++ b/pkgs/development/interpreters/acl2/0002-Restrict-RDTSC-to-x86.patch @@ -0,0 +1,29 @@ +From b0ccf68f277d0bd5e6fc9d41742f31ddda99a955 Mon Sep 17 00:00:00 2001 +From: Keshav Kini +Date: Mon, 1 Jun 2020 21:42:24 -0700 +Subject: [PATCH 2/2] Restrict RDTSC to x86 + +Backported from [1]. According to Curtis Dunham, this should fix the ACL2 base +system build on ARM. + +[1]: https://github.com/acl2/acl2/commit/292fa2ccc6217e6307d7bb8373eb90f5d258ea5e +--- + memoize-raw.lisp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memoize-raw.lisp b/memoize-raw.lisp +index 205e78653..478198dee 100644 +--- a/memoize-raw.lisp ++++ b/memoize-raw.lisp +@@ -189,7 +189,7 @@ + ;; RDTSC nonsense, but we still can report mysterious results since we have no + ;; clue about which core we are running on in CCL (or, presumably, SBCL). + +-#+(or ccl sbcl) ++#+(and (or ccl sbcl) x86-64) + (eval-when + (:execute :compile-toplevel :load-toplevel) + (when #+ccl (fboundp 'ccl::rdtsc) +-- +2.25.4 + diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 39b243a0ce6a9..e3c62aae98337 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchFromGitHub, - # perl, which, nettools, - sbcl }: - -let hashes = { - "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.3" = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; -}; -revs = { - "8.0" = "8.0"; - "8.3" = "8.3"; -}; +{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll +, sbcl, bash, which, perl, nettools +, openssl, glucose, minisat, abc-verifier, z3, python2 +, certifyBooks ? true +} @ args: + +let + # Disable immobile space so we don't run out of memory on large books; see + # http://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL + sbcl = args.sbcl.override { disableImmobileSpace = true; }; + + # Wrap to add `-model` argument because some of the books in 8.3 need this. + # Fixed upstream (https://github.com/acl2/acl2/commit/0359538a), so this can + # be removed in ACL2 8.4. + glucose = writeShellScriptBin "glucose" ''exec ${args.glucose}/bin/glucose -model "$@"''; + in stdenv.mkDerivation rec { pname = "acl2"; version = "8.3"; @@ -17,62 +21,117 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = revs.${version}; - sha256 = hashes.${version}; + rev = "${version}"; + sha256 = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; - buildInputs = [ sbcl - # which perl nettools + libipasirglucose4 = callPackage ./libipasirglucose4 { }; + + patches = [ + (substituteAll { + src = ./0001-Fix-some-paths-for-Nix-build.patch; + inherit bash libipasirglucose4; + openssl = openssl.out; + }) + ./0002-Restrict-RDTSC-to-x86.patch ]; + buildInputs = [ + # ACL2 itself only needs a Common Lisp compiler/interpreter: + sbcl + ] ++ stdenv.lib.optionals certifyBooks [ + # To build community books, we need Perl and a couple of utilities: + which perl nettools + # Some of the books require one or more of these external tools: + openssl.out glucose minisat abc-verifier libipasirglucose4 + z3 (python2.withPackages (ps: [ ps.z3 ])) + ]; + + # NOTE: Parallel building can be memory-intensive depending on the number of + # concurrent jobs. For example, this build has been seen to use >120GB of + # RAM on an 85 core machine. enableParallelBuilding = true; - phases = "unpackPhase installPhase"; + preConfigure = '' + # When certifying books, ACL2 doesn't like $HOME not existing. + export HOME=$(pwd)/fake-home + '' + stdenv.lib.optionalString certifyBooks '' + # Some books also care about $USER being nonempty. + export USER=nobody + ''; - installSuffix = "acl2"; + postConfigure = '' + # ACL2 and its books need to be built in place in the out directory because + # the proof artifacts are not relocatable. Since ACL2 mostly expects + # everything to exist in the original source tree layout, we put it in + # $out/share/${pname} and create symlinks in $out/bin as necessary. + mkdir -p $out/share/${pname} + cp -pR . $out/share/${pname} + cd $out/share/${pname} + ''; + + preBuild = "mkdir -p $HOME"; + makeFlags="LISP=${sbcl}/bin/sbcl"; + + doCheck = true; + checkTarget = "mini-proveall"; installPhase = '' - mkdir -p $out/share/${installSuffix} mkdir -p $out/bin - cp -R . $out/share/${installSuffix} - cd $out/share/${installSuffix} + ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname} + '' + stdenv.lib.optionalString certifyBooks '' + ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert + ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean + ''; - # make ACL2 image - make LISP=${sbcl}/bin/sbcl + preDistPhases = [ (if certifyBooks then "certifyBooksPhase" else "removeBooksPhase") ]; - # The community books don't build properly under Nix yet. - rm -rf books - #make ACL2=$out/share/saved_acl2 USE_QUICKLISP=1 regression-everything + certifyBooksPhase = '' + # Certify the community books + pushd $out/share/${pname}/books + makeFlags="ACL2=$out/share/${pname}/saved_acl2" + buildFlags="everything" + buildPhase + popd + ''; - cp saved_acl2 $out/bin/acl2 + removeBooksPhase = '' + # Delete the community books + rm -rf $out/share/${pname}/books ''; - meta = { + meta = with stdenv.lib; { description = "An interpreter and a prover for a Lisp dialect"; longDescription = '' - ACL2 is a logic and programming language in which you can model - computer systems, together with a tool to help you prove - properties of those models. "ACL2" denotes "A Computational - Logic for Applicative Common Lisp". - - ACL2 is part of the Boyer-Moore family of provers, for which its - authors have received the 2005 ACM Software System Award. - - NOTE: In nixpkgs, the community books that usually ship with - ACL2 have been removed because it is not currently possible to - build them with Nix. - ''; + ACL2 is a logic and programming language in which you can model computer + systems, together with a tool to help you prove properties of those + models. "ACL2" denotes "A Computational Logic for Applicative Common + Lisp". + + ACL2 is part of the Boyer-Moore family of provers, for which its authors + have received the 2005 ACM Software System Award. + + This package installs the main ACL2 executable ${pname}, as well as the + build tools cert.pl and clean.pl, renamed to ${pname}-cert and + ${pname}-clean. + + '' + (if certifyBooks then '' + The community books are also included and certified with the `make + everything` target. + '' else '' + The community books are not included in this package. + ''); homepage = "http://www.cs.utexas.edu/users/moore/acl2/"; downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; - # There are a bunch of licenses in the community books, but since - # they currently get deleted during the build, we don't mention - # their licenses here. ACL2 proper is released under a BSD - # 3-clause license. - #license = with stdenv.lib.licenses; - #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ kini raskin ]; - platforms = stdenv.lib.platforms.all; - broken = stdenv.isAarch64 && stdenv.isLinux; + license = with licenses; [ + # ACL2 itself is bsd3 + bsd3 + ] ++ optionals certifyBooks [ + # The community books are mostly bsd3 or mit but with a few + # other things thrown in. + mit gpl2 llgpl21 cc0 publicDomain unfreeRedistributable + ]; + maintainers = with maintainers; [ kini raskin ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch b/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch new file mode 100644 index 0000000000000..c78fa1ab925a3 --- /dev/null +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/0001-Support-shared-library-build.patch @@ -0,0 +1,46 @@ +From 0f48e046f44624f4d4d8255ac5bd26397a38f16c Mon Sep 17 00:00:00 2001 +From: Keshav Kini +Date: Sun, 23 Feb 2020 14:09:30 -0800 +Subject: [PATCH] Support shared library build + +Patch taken from [the ACL2 Books documentation][1]. + +- Add " -fPIC" to the CXXFLAGS to build position-independent code, + required for shared libraries. + +- Add the line "export CXXFLAGS" below the setting of CXXFLAGS, so that + those flags apply to the recursive make of the core solver library. + +- Fix a typo: replace the occurrence of "CXXLAGS" with "CXXFLAGS". + +[1]: http://www.cs.utexas.edu/users/moore/acl2/v8-2/combined-manual/index.html?topic=IPASIR____BUILDING-AN-IPASIR-SOLVER-LIBRARY +--- + makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/makefile b/makefile +index 07121de..4e85c4b 100755 +--- a/makefile ++++ b/makefile +@@ -29,7 +29,8 @@ TARGET=libipasir$(SIG).a + + CXX=g++ + +-CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3 ++CXXFLAGS= -g -std=c++11 -Wall -DNDEBUG -O3 -fPIC ++export CXXFLAGS + + #-----------------------------------------------------------------------# + #- REQUIRED TOP RULES --------------------------------------------------# +@@ -67,7 +68,7 @@ libipasir$(SIG).a: .FORCE + #-----------------------------------------------------------------------# + + ipasir$(NAME)glue.o: ipasir$(NAME)glue.cc ipasir.h makefile +- $(CXX) -g -std=c++11 $(CXXLAGS) \ ++ $(CXX) -g -std=c++11 $(CXXFLAGS) \ + -DVERSION=\"$(VERSION)\" \ + -I$(DIR) -I$(DIR)/core -c ipasir$(NAME)glue.cc + +-- +2.23.1 + diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix new file mode 100644 index 0000000000000..5186cd69584e1 --- /dev/null +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, zlib, unzip }: + +stdenv.mkDerivation rec { + pname = "libipasirglucose4"; + # This library has no version number AFAICT (beyond generally being based on + # Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use + # that as the version number, I guess. + version = "2017"; + + src = fetchurl { + url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; + sha256 = "0xchgady9vwdh8frmc8swz6va53igp2wj1y9sshd0g7549n87wdj"; + }; + nativeBuildInputs = [ unzip ]; + + buildInputs = [ zlib ]; + + sourceRoot = "sat/glucose4"; + patches = [ ./0001-Support-shared-library-build.patch ]; + + postBuild = '' + g++ -shared -Wl,-soname,libipasirglucose4.so -o libipasirglucose4.so \ + ipasirglucoseglue.o libipasirglucose4.a + ''; + + installPhase = '' + install -D libipasirglucose4.so $out/lib/libipasirglucose4.so + ''; + + meta = with stdenv.lib; { + description = "Shared library providing IPASIR interface to the Glucose SAT solver"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ kini ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4bf40bb32c9e..c6d406907ac65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9625,6 +9625,7 @@ in ### DEVELOPMENT / INTERPRETERS acl2 = callPackage ../development/interpreters/acl2 { }; + acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; }; angelscript = callPackage ../development/interpreters/angelscript {}; From 84f68b7991e0e76799bdd4a4c7d25ec516fd7495 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 21 May 2020 22:13:08 -0400 Subject: [PATCH 211/234] gambit-unstable: 2020-05-15 -> 2020-07-29 --- pkgs/development/compilers/gambit/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 3ac4f5363195e..7284e5b531d81 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-05-15"; - git-version = "4.9.3-1109-g3c4d40de"; + version = "unstable-2020-07-29"; + git-version = "4.9.3-1232-gbba388b8"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; - sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; + rev = "bba388b80ca62a77883a8936d64b03316808696a"; + sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; }; gambit-params = gambit-support.unstable-params; } From e7c8679090ef7107511a4a92ada57284397533f8 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 21 May 2020 22:14:03 -0400 Subject: [PATCH 212/234] gerbil-unstable: 2020-05-17 -> 2020-08-02 --- pkgs/development/compilers/gerbil/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 9de6dc42907a6..7b54438b5c9a2 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-05-17"; - git-version = "0.16-1-g36a31050"; + version = "unstable-2020-08-02"; + git-version = "0.16-120-g3f248e13"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; - sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; + rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; + sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; }; inherit gambit-support; gambit = gambit-unstable; From 6efa2a708eef2f05e3abfb696a195a76e1e50c31 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 3 Jun 2020 16:04:51 -0400 Subject: [PATCH 213/234] gerbilPackages-unstable.gerbil-utils: 2020-05-17 -> 2020-08-02 Better version support for Gerbil packages. Use passthru for meta-information used by other packages. --- .../compilers/gerbil/gerbil-support.nix | 15 ++++++++++----- .../development/compilers/gerbil/gerbil-utils.nix | 13 +++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 4e94b6e65de14..54d0c6690292e 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -13,21 +13,26 @@ rec { # Use this function to create a Gerbil library. See gerbil-utils as an example. gerbilPackage = { - pname, version, src, meta, package, - git-version ? "", version-path ? "config/version.ss", + pname, version, src, meta, gerbil-package, + git-version ? "", version-path ? "", gerbil ? pkgs.gerbil-unstable, gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], - softwareName ? "" } : + softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { inherit src meta pname version; + passthru = { inherit gerbil-package version-path ;}; buildInputs = [ gerbil ] ++ gerbilInputs ++ buildInputs_; postPatch = '' set -e ; - if [ -n "${version-path}" ] ; then - echo '(import :clan/utils/version)\n(register-software "${softwareName}" "${git-version}")\n' > "${version-path}" + if [ -n "${version-path}.ss" ] ; then + echo -e '(import :clan/versioning${builtins.concatStringsSep "" + (map (x : if x.passthru.version-path != "" + then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + gerbilInputs) + })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi patchShebangs . ; ''; diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 075a63d7bf4c3..7e1a9bf05574a 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,17 +2,18 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-05-17"; - git-version = "33ef720"; - package = "clan"; + version = "unstable-2020-08-02"; + git-version = "0.2-21-g7e7d053"; + gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; - version-path = ""; + version-path = "version"; + softwareName = "Gerbil-utils"; src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "33ef720799ba98dc9eec773c662f070af4bac016"; - sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; + sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; From f448a7b31f21f06e51e62e241734e24112e05c4d Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 16 Jun 2020 19:35:42 -0400 Subject: [PATCH 214/234] gerbilPackages-unstable.gerbil-crypto: init at 2020-08-01 --- .../compilers/gerbil/gerbil-crypto.nix | 27 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-crypto.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix new file mode 100644 index 0000000000000..12f4726f1c62e --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-crypto"; + version = "unstable-2020-08-01"; + git-version = "0.0-6-ga228862"; + gerbil-package = "clan/crypto"; + gerbil = gerbil-unstable; + gerbilInputs = [gerbil-support.gerbilPackages-unstable.gerbil-utils]; + buildInputs = [pkgs.secp256k1 pkgs.pkg-config]; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-crypto"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-crypto"; + rev = "a22886260849ec92c3a34bfeedc1574e41e49e33"; + sha256 = "0qbanw2vnw2ymmr4pr1jap29cyc3icbhyq0apibpfnj2znns7w47"; + }; + meta = { + description = "Gerbil Crypto: Extra Cryptographic Primitives for Gerbil"; + homepage = "https://github.com/fare/gerbil-crypto"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 54d0c6690292e..7f57ea460ac93 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -5,6 +5,7 @@ rec { # Gerbil libraries gerbilPackages-unstable = { gerbil-utils = callPackage ./gerbil-utils.nix { }; + gerbil-crypto = callPackage ./gerbil-crypto.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. From 94ca3bf9b486071a81cb7afa447fec5d27c18182 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 14 Jul 2020 12:36:47 -0400 Subject: [PATCH 215/234] gerbilPackages-unstable.gerbil-poo: init at 2020-08-02 --- .../compilers/gerbil/gerbil-poo.nix | 27 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-poo.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix new file mode 100644 index 0000000000000..55673368eead1 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-ethereum"; + version = "unstable-2020-08-02"; + git-version = "0.0-13-g1014154"; + gerbil-package = "clan/poo"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-POO"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-poo"; + rev = "1014154fe4943dfbec7524666c831b601ba88559"; + sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + }; + meta = { + description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; + homepage = "https://github.com/fare/gerbil-poo"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 7f57ea460ac93..09756697f37c3 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -6,6 +6,7 @@ rec { gerbilPackages-unstable = { gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; + gerbil-poo = callPackage ./gerbil-poo.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. From 34cde820015d92537b8568f79b7f3300a9c20637 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 14 Jul 2020 12:38:05 -0400 Subject: [PATCH 216/234] gerbilPackages-unstable.gerbil-persist: init at 2020-08-02 --- .../compilers/gerbil/gerbil-persist.nix | 27 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-persist.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix new file mode 100644 index 0000000000000..1be6684bf440d --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-persist"; + version = "unstable-2020-08-02"; + git-version = "0.0-4-ga3b2bd1"; + gerbil-package = "clan/persist"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-persist"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-persist"; + rev = "a3b2bd104612db0e4492737f09f72adea6684483"; + sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + }; + meta = { + description = "Gerbil Persist: Persistent data and activities"; + homepage = "https://github.com/fare/gerbil-persist"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 09756697f37c3..311dc348b89e7 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -7,6 +7,7 @@ rec { gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; + gerbil-persist = callPackage ./gerbil-persist.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. From 1fbbe564b02356f013a7b4077df0cb70b9d99a1c Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Tue, 7 Jul 2020 09:44:07 -0400 Subject: [PATCH 217/234] gerbilPackages-unstable.gerbil-ethereum: init at 2020-08-02 --- .../compilers/gerbil/gerbil-ethereum.nix | 28 +++++++++++++++++++ .../compilers/gerbil/gerbil-support.nix | 1 + 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-ethereum.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix new file mode 100644 index 0000000000000..9b90cc053e1ec --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -0,0 +1,28 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-ethereum"; + version = "unstable-2020-08-02"; + git-version = "0.0-15-g7cd2dd7"; + gerbil-package = "mukn/ethereum"; + gerbil = gerbil-unstable; + gerbilInputs = with gerbil-support.gerbilPackages-unstable; + [gerbil-utils gerbil-crypto gerbil-poo gerbil-persist]; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-ethereum"; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-ethereum"; + rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; + sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + }; + meta = { + description = "Gerbil Ethereum: a Scheme alternative to web3.js"; + homepage = "https://github.com/fare/gerbil-ethereum"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index 311dc348b89e7..e3f4bb0e0d254 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -8,6 +8,7 @@ rec { gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; gerbil-persist = callPackage ./gerbil-persist.nix { }; + gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. From 72c65ab40d9cf288221f006dd85df819c95d935d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 08:32:28 +0000 Subject: [PATCH 218/234] operator-sdk: 0.18.2 -> 0.19.2 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index a157041cf98ca..7954a50a7e045 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "0.18.2"; + version = "0.19.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "02vzxqbh4yw9yvr9cr43hyi0v4hzii4mdb8am41n5y71bcld73v8"; + sha256 = "1lmnxw6l6lknvbwmw5xh238i0j452sib37fw8ybxp64zwvj2sac0"; }; - vendorSha256 = "0kdbpm6phdcw1rcjggrdvc8hgs3hjc81545qh8jv6zwipmn89i1p"; + vendorSha256 = "1xk3zw8w2fynww0z4d66nlclhjf52bk4cv3bh51yyd1mr808lip5"; subPackages = [ "cmd/operator-sdk" ]; From 81d8f4e3d08620f04eed0af86a010d3decfdf70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 2 Aug 2020 15:15:09 +0200 Subject: [PATCH 219/234] rss2email: 3.11 -> 3.12 --- .../networking/feedreaders/rss2email/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 18f154d3ff741..719b1fed1675c 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,13 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.11"; + version = "3.12"; - propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; + propagatedBuildInputs = [ feedparser html2text ]; + checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "1vk5slp2mhmc1qj30igqkyq3z5h2bl1ayhafqrjapa6cg6rbvhrn"; + sha256 = "0nlqglvqc7jcx3dj84nlg014aa1a7h9vr3fyzq9ndx2pydacjllk"; }; outputs = [ "out" "man" "doc" ]; @@ -39,7 +40,7 @@ buildPythonApplication rec { description = "A tool that converts RSS/Atom newsfeeds to email."; homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; - maintainers = with maintainers; [ jb55 Profpatsch ]; + maintainers = with maintainers; [ jb55 Profpatsch ekleog ]; }; passthru.tests = { smoke-test = nixosTests.rss2email; From 56ca6068602b6ba9defcde237cf0470133384dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 2 Aug 2020 18:47:54 +0200 Subject: [PATCH 220/234] rss2email: 3.12 -> 3.12.1 --- .../applications/networking/feedreaders/rss2email/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 719b1fed1675c..b852eb02feca1 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12"; + version = "3.12.1"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "0nlqglvqc7jcx3dj84nlg014aa1a7h9vr3fyzq9ndx2pydacjllk"; + sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; }; outputs = [ "out" "man" "doc" ]; From 1298115260d02b1d40b0b7052e5e79113669e6a1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 2 Aug 2020 23:32:35 +0200 Subject: [PATCH 221/234] oraclejdk8: update jce hash See https://github.com/NixOS/nixpkgs/commit/c5dd1fba89b6af14ab8afa5a8bd03fd4117c3d16#commitcomment-41126603 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index 460eaab16199e..fdea10dcd7e46 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -6,5 +6,5 @@ import ./jdk-linux-base.nix { sha256.armv7l-linux = "13dih7zyfgj90bkhnfxhpm88d9kqqrj6w5rzpidmxrjwrsnlndp9"; sha256.aarch64-linux = "0zzhs4pcnjss2561b8zrrnacpkb8p49ca0lpdw7hzgsjjj1y146n"; jceName = "jce_policy-8.zip"; - sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; + sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; } From c018741d2499f722451c16681c4377fd08df7143 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 02:02:43 +0000 Subject: [PATCH 222/234] exoscale-cli: 1.14.0 -> 1.15.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c3c51a5605256..27af9ecf65e2f 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGo114Package rec { pname = "exoscale-cli"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "10sx542m6r6yq99nqn69bjfc6rv4nr9swi74rfccxb7dbifdrqpp"; + sha256 = "00cyxy4lidpdf1vvji1nbdlixqxzzpj91gwf0kkdqpr17v562h9m"; }; goPackagePath = "github.com/exoscale/cli"; From 14e8d7c71e218ea80f927cf70fb322a6dab4fc51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 10:04:36 +0000 Subject: [PATCH 223/234] picard-tools: 2.23.1 -> 2.23.3 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index e6bcb4470bbd1..99bac0c4b7a59 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.1"; + version = "2.23.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1g4539x2081jgrbn207nsimpq9q5izd4z6cx7s8lr8p8ab8spbmk"; + sha256 = "08wgi0hijfbchr2srmndxq3h2fijvyvr8b6zv680fpcjixm5bbhf"; }; nativeBuildInputs = [ makeWrapper ]; From 6fe23339119fdf5a814bb47819aca8206a9356d6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 2 Aug 2020 20:44:46 +0200 Subject: [PATCH 224/234] xscreensaver: fix xscreensaver-demo build --- pkgs/misc/screensavers/xscreensaver/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 1dd09852d27c6..71108c9c68996 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, bc, perl, perlPackages, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU, libGL, gtk2 -, libxml2, libglade, intltool, xorg, makeWrapper, gle +, libxml2, libglade, intltool, xorg, makeWrapper, gle, gdk-pixbuf, gdk-pixbuf-xlib , forceInstallAllHacks ? false }: @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg libGLU libGL gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc intltool xorg.appres makeWrapper gle + libXxf86misc intltool xorg.appres makeWrapper gle gdk-pixbuf + gdk-pixbuf-xlib ]; preConfigure = From 96575837cd9c17cc4581ed5f97a446a9631a7ae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 02:43:34 +0000 Subject: [PATCH 225/234] hcxdumptool: 6.0.7 -> 6.1.0 --- pkgs/tools/security/hcxdumptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index b59cef1394288..a41d925223ac9 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.0.7"; + version = "6.1.0"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "14w4f63nrcwhqj753rjif9cgs1xh1r1619827p69dz0v2x3xdvn1"; + sha256 = "10dhv8lgsciw6w9r328k50pv1ldldf9wikplgh0dq98djlf0l961"; }; buildInputs = [ openssl ]; From 67d638ce0441d35e1f89a6248aa75638aa8721d8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 3 Aug 2020 12:12:20 +1000 Subject: [PATCH 226/234] .editorconfig: add node-packages.nix --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 954bec9cd04dd..2077eff2ca53c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -60,6 +60,9 @@ insert_final_newline = unset [gemset.nix] insert_final_newline = unset +[node-packages.nix] +insert_final_newline = unset + [pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json] indent_size = unset From d20ef07fe316ec8eef0401ca3b8efde216bec223 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sun, 26 Jul 2020 04:46:22 -0700 Subject: [PATCH 227/234] pkgs/top-level: add x86_64-redox --- pkgs/top-level/release-cross.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 5e392ff1b88e2..af4dab5d263c0 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -161,6 +161,10 @@ in i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; + # we test `embedded` instead of `linuxCommon` because very few packages + # successfully cross-compile to Redox so far + x86_64-redox = mapTestOnCross lib.systems.examples.x86_64-unknown-redox embedded; + /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; From 743a232fc1d25746837df81781f2ef15abe4461a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Jul 2020 10:35:18 +0200 Subject: [PATCH 228/234] coq_8_5: fix build (use gnumake 4.2) --- pkgs/applications/science/logic/coq/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a10b34e0a6093..51dc5fffdec8a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,7 +5,7 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ stdenv, fetchFromGitHub, writeText, pkgconfig +{ stdenv, fetchFromGitHub, writeText, pkgconfig, gnumake42 , ocamlPackages, ncurses , buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook @@ -107,7 +107,9 @@ self = stdenv.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optional (!versionAtLeast "8.6") gnumake42 + ; buildInputs = [ ncurses ocamlPackages.ocaml ocamlPackages.findlib ] ++ stdenv.lib.optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ [ ocamlPackages.num ] From acfc79a665fb7ee98475dcbd52ae9e68344f9167 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Tue, 28 Jul 2020 16:01:12 +0200 Subject: [PATCH 229/234] swift: fix cflags for finding C++ headers --- pkgs/development/compilers/swift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index b838aa59177e1..3340d99b6f161 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -260,8 +260,8 @@ stdenv.mkDerivation { ''; buildPhase = '' - # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" + # explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib + export NIX_CFLAGS_COMPILE="$(< ${clang}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" From 7f23f2905e086ee51982847daf073ad0325e4d6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 21:07:32 +0000 Subject: [PATCH 230/234] chibi: 0.8 -> 0.9 --- pkgs/development/interpreters/chibi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index f0de3f6409188..08db1b077a3d7 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.8"; + version = "0.9"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"; + sha256 = "1lnap41gl9vg82h557f4rlr69jgmd2gh0iqs6cxm77d39kv1scb8"; }; buildInputs = [ makeWrapper ]; From 433393db6b1ef7b8e4a1bd5b7fa11e192a785cb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Aug 2020 07:17:56 +0000 Subject: [PATCH 231/234] build(deps): bump technote-space/get-diff-action from v2.0.2 to v2.0.3 Bumps [technote-space/get-diff-action](https://github.com/technote-space/get-diff-action) from v2.0.2 to v2.0.3. - [Release notes](https://github.com/technote-space/get-diff-action/releases) - [Changelog](https://github.com/technote-space/get-diff-action/blob/master/.releasegarc) - [Commits](https://github.com/technote-space/get-diff-action/compare/v2.0.2...b1acdd3017ce344029e1ae6d2b7769c3758799fe) Signed-off-by: dependabot[bot] --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 24348f12887aa..aeb6c65457cb0 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v2.0.2 + - uses: technote-space/get-diff-action@v2.0.3 - name: Checking EditorConfig env: VERSION: "2.1.0" From 9f87778d78d5c05ff0c92b2625f603b44a1035ff Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 3 Aug 2020 18:05:38 +1000 Subject: [PATCH 232/234] .github/workflows/editorconfig.yml: full fetch --- .github/workflows/editorconfig.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index aeb6c65457cb0..86b89a3f558f8 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - uses: technote-space/get-diff-action@v2.0.3 - name: Checking EditorConfig env: From 83628432c6f134b3d13606e2a0397aaa2cfc0b98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 20:18:07 +0000 Subject: [PATCH 233/234] python27Packages.autopep8: 1.5.3 -> 1.5.4 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 2dabb70197b5f..1b40aa9c1408b 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.3"; + version = "1.5.4"; src = fetchPypi { inherit pname version; - sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; + sha256 = "d21d3901cb0da6ebd1e83fc9b0dfbde8b46afc2ede4fe32fbda0c7c6118ca094"; }; propagatedBuildInputs = [ pycodestyle toml ]; From fdd16d0baceb272896d4849b0e5dc8743147db44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:26:21 +0000 Subject: [PATCH 234/234] build(deps): bump technote-space/get-diff-action from v2.0.2 to v4 Bumps [technote-space/get-diff-action](https://github.com/technote-space/get-diff-action) from v2.0.2 to v4. - [Release notes](https://github.com/technote-space/get-diff-action/releases) - [Changelog](https://github.com/technote-space/get-diff-action/blob/master/.releasegarc) - [Commits](https://github.com/technote-space/get-diff-action/compare/v2.0.2...d2dec23ebfc4fa59ffad32c31437e6c867c0d6b0) Signed-off-by: dependabot[bot] --- .github/workflows/editorconfig.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 86b89a3f558f8..030c5aaf7699d 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: technote-space/get-diff-action@v2.0.3 + - uses: technote-space/get-diff-action@v4 - name: Checking EditorConfig env: VERSION: "2.1.0"